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

Sprout from master 2010-06-08 23:05:58 UTC spingel 'bug 316058: [releng] update copyright notices and release 3.4'
Delete:
    org.eclipse.mylyn.commons-feature/.project
    org.eclipse.mylyn.commons-feature/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.commons-feature/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.commons-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.commons-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.commons-feature/about.html
    org.eclipse.mylyn.commons-feature/build.properties
    org.eclipse.mylyn.commons-feature/epl-v10.html
    org.eclipse.mylyn.commons-feature/feature.properties
    org.eclipse.mylyn.commons-feature/feature.xml
    org.eclipse.mylyn.commons-feature/license.html
    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.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/DelegatingProgressMonitor.java
    org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/IDelegatingProgressMonitor.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/ICancellable.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/MonitoredRequest.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/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.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.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/TimeoutInputStreamTest.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/CommonTestUtil.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/ManagedTestSuite.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/TestProxy.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/UiTestUtil.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/ui/CommonUiUtilTest.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcClientTest.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcOperationTest.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcTestServer.java
    org.eclipse.mylyn.commons.ui/.classpath
    org.eclipse.mylyn.commons.ui/.project
    org.eclipse.mylyn.commons.ui/.settings/.api_filters
    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.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/draw16/edit_arrow1.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/edit_arrow2.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/edit_box.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_box.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_oval.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_rbox.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/edit_free.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/edit_line.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/edit_oval.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/edit_rbox.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/line_bold1.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/line_bold2.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/line_bold4.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/line_bold8.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/line_dash.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/line_dash1d.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/line_dash2d.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/line_dot.gif
    org.eclipse.mylyn.commons.ui/icons/draw16/line_sold.gif
    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/clipboard_obj.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/discovery.png
    org.eclipse.mylyn.commons.ui/icons/etool16/edit-small.png
    org.eclipse.mylyn.commons.ui/icons/etool16/edit.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/file_obj.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/find.png
    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/monitor_obj.gif
    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-small.png
    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/redo_edit.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/save.gif
    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/schedule.png
    org.eclipse.mylyn.commons.ui/icons/etool16/select_rect.gif
    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/undo_edit.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/view-filter.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/web.png
    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/notification-preferences-active.png
    org.eclipse.mylyn.commons.ui/icons/eview16/notification-preferences-inactive.png
    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/file-plain.png
    org.eclipse.mylyn.commons.ui/icons/obj16/file-small.png
    org.eclipse.mylyn.commons.ui/icons/obj16/message_info.gif
    org.eclipse.mylyn.commons.ui/icons/obj16/notes-small.png
    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/obj32/priority-critical.png
    org.eclipse.mylyn.commons.ui/icons/obj32/priority-high.png
    org.eclipse.mylyn.commons.ui/icons/obj32/priority-low.png
    org.eclipse.mylyn.commons.ui/icons/obj32/priority-none.png
    org.eclipse.mylyn.commons.ui/icons/obj32/priority-normal.png
    org.eclipse.mylyn.commons.ui/icons/obj32/priority-very-low.png
    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-discovery.png
    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/ControlListItem.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ControlListViewer.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/ScreenshotImages.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/SelectToolAction.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/TaskBarManager.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/EnhancedFilteredTree.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/GradientToolTip.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/Messages.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/SearchHistoryPopUpDialog.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/TableTreePatternFilter.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/TextSearchControl.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/dialogs/AbstractInPlaceDialog.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/IInPlaceDialogListener.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceCheckBoxTreeDialog.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceDateSelectionDialog.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceDialogEvent.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/Messages.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/messages.properties
    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.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/messages.properties
    org.eclipse.mylyn.commons.xmlrpc/.classpath
    org.eclipse.mylyn.commons.xmlrpc/.cvsignore
    org.eclipse.mylyn.commons.xmlrpc/.options
    org.eclipse.mylyn.commons.xmlrpc/.project
    org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF
    org.eclipse.mylyn.commons.xmlrpc/about.html
    org.eclipse.mylyn.commons.xmlrpc/build.properties
    org.eclipse.mylyn.commons.xmlrpc/plugin.properties
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/CommonXmlRpcClient.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpClientTransportFactory.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpMethodInterceptor.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/Multicall.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/MulticallResult.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcClientRequest.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcHttpException.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcIllegalContentTypeException.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcLoginException.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcNoSuchMethodException.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcOperation.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcPermissionDeniedException.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcProxyAuthenticationException.java
    org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcRemoteException.java
    org.eclipse.mylyn.discovery.core/.classpath
    org.eclipse.mylyn.discovery.core/.cvsignore
    org.eclipse.mylyn.discovery.core/.project
    org.eclipse.mylyn.discovery.core/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.discovery.core/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.discovery.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.discovery.core/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.discovery.core/META-INF/MANIFEST.MF
    org.eclipse.mylyn.discovery.core/OSGI-INF/l10n/bundle.properties
    org.eclipse.mylyn.discovery.core/about.html
    org.eclipse.mylyn.discovery.core/build.properties
    org.eclipse.mylyn.discovery.core/plugin.xml
    org.eclipse.mylyn.discovery.core/schema/connectorDiscovery.exsd
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/DiscoveryCore.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/AbstractDiscoverySource.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/AbstractDiscoveryStrategy.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/BundleDiscoverySource.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/BundleDiscoveryStrategy.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Certification.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorCategory.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDescriptor.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDescriptorKind.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscovery.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscoveryExtensionReader.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Directory.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DirectoryParser.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryCategory.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryCertification.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryConnector.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryRegistryStrategy.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/FeatureFilter.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Group.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Icon.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/JarDiscoverySource.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Messages.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Overview.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Policy.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/RemoteBundleDiscoveryStrategy.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ValidationException.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/messages.properties
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DefaultSaxErrorHandler.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryCategoryComparator.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryConnectorComparator.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/HttpClientTransportService.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/IOWithCauseException.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/ITransportService.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/Messages.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/P2TransportService.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/WebUtil.java
    org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/messages.properties
    org.eclipse.mylyn.discovery.core/xsd/directory.xsd
    org.eclipse.mylyn.discovery.tests/.classpath
    org.eclipse.mylyn.discovery.tests/.cvsignore
    org.eclipse.mylyn.discovery.tests/.project
    org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.discovery.tests/META-INF/MANIFEST.MF
    org.eclipse.mylyn.discovery.tests/OSGI-INF/l10n/bundle.properties
    org.eclipse.mylyn.discovery.tests/about.html
    org.eclipse.mylyn.discovery.tests/build.properties
    org.eclipse.mylyn.discovery.tests/images/bugzilla.gif
    org.eclipse.mylyn.discovery.tests/plugin.xml
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/AllDiscoveryTests.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/DiscoveryTestConstants.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/BundleDiscoveryStrategyTest.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryRemoteTest.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryTest.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/DirectoryParserTest.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/RemoteBundleDiscoveryStrategyTest.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/AbstractMockFactory.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/DiscoveryCategoryMockFactory.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/DiscoveryConnectorMockFactory.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockBundleDiscoveryStrategy.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockDiscoverySource.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockDiscoveryStrategy.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryCategoryComparatorTest.java
    org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryConnectorComparatorTest.java
    org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/.project
    org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/build.properties
    org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/feature.xml
    org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/.project
    org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/build.properties
    org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/feature.xml
    org.eclipse.mylyn.discovery.tests/testdata/update/artifacts.jar
    org.eclipse.mylyn.discovery.tests/testdata/update/content.jar
    org.eclipse.mylyn.discovery.tests/testdata/update/features/org.eclipse.mylyn.discovery.test1_1.0.0.201001200403.jar
    org.eclipse.mylyn.discovery.tests/testdata/update/features/org.eclipse.mylyn.discovery.test2_1.0.0.201001200403.jar
    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.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.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/tests/ActivityContextManagerTest.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/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/src/org/eclipse/mylyn/monitor/tests/usage/tests/InteractionEventLoggerTest.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.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/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/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/.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.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-feature/.project b/org.eclipse.mylyn.commons-feature/.project
deleted file mode 100644
index 95e4592..0000000
--- a/org.eclipse.mylyn.commons-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.commons-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.commons-feature/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.commons-feature/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1314ffa..0000000
--- a/org.eclipse.mylyn.commons-feature/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,342 +0,0 @@
-#Tue May 12 20:42:46 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-feature/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.commons-feature/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8d68e73..0000000
--- a/org.eclipse.mylyn.commons-feature/.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) 2010 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-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.commons-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 5e7f2bd..0000000
--- a/org.eclipse.mylyn.commons-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/org.eclipse.mylyn.commons-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.commons-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index a4b9fa9..0000000
--- a/org.eclipse.mylyn.commons-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Dec 20 14:08:45 PST 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.commons-feature/about.html b/org.eclipse.mylyn.commons-feature/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.commons-feature/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-feature/build.properties b/org.eclipse.mylyn.commons-feature/build.properties
deleted file mode 100644
index bf101f8..0000000
--- a/org.eclipse.mylyn.commons-feature/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2010 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 = feature.properties,\
-               feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               about.html
-src.includes = about.html,\
-               epl-v10.html,\
-               license.html
-jre.compilation.profile = J2SE-1.5
diff --git a/org.eclipse.mylyn.commons-feature/epl-v10.html b/org.eclipse.mylyn.commons-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.mylyn.commons-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons-feature/feature.properties b/org.eclipse.mylyn.commons-feature/feature.properties
deleted file mode 100644
index 89acdb2..0000000
--- a/org.eclipse.mylyn.commons-feature/feature.properties
+++ /dev/null
@@ -1,138 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2010 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
-###############################################################################
-featureName=Mylyn Commons
-description=Provides common utilities for task repository connectors. 
-providerName=Eclipse Mylyn
-copyright=Copyright (c) 2010 Tasktop Technologies and others. All rights reserved.
-updateSiteName=Mylyn for Eclipse 3.4, 3.5 and 3.6
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
diff --git a/org.eclipse.mylyn.commons-feature/feature.xml b/org.eclipse.mylyn.commons-feature/feature.xml
deleted file mode 100644
index 5ffe350..0000000
--- a/org.eclipse.mylyn.commons-feature/feature.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2010 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
- -->
-<feature
-      id="org.eclipse.mylyn.commons"
-      label="%featureName"
-      version="3.4.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.mylyn">
-
-   <description url="http://eclipse.org/mylyn">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/mylyn/update/e3.4"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.mylyn.commons.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.commons.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.commons.soap"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.commons.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.commons.xmlrpc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xmlrpc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.ws.commons.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.bind"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.axis"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="javax.wsdl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.rpc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="javax.xml.soap"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.commons.discovery"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.commons.logging"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.activation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.mail"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.codec"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.httpclient"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.lang"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.mylyn.commons-feature/license.html b/org.eclipse.mylyn.commons-feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/org.eclipse.mylyn.commons-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
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 8d68e73..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) 2010 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 5e7f2bd..0000000
--- a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
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 1772263..0000000
--- a/org.eclipse.mylyn.commons.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +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.4.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-internal:=true
-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 e5e8ab8..0000000
--- a/org.eclipse.mylyn.commons.core/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2009 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 02c5e30..0000000
--- a/org.eclipse.mylyn.commons.core/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-#Properties file for org.eclipse.mylyn.commons.core
-Bundle-Vendor = Eclipse Mylyn
-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 80d8745..0000000
--- a/org.eclipse.mylyn.commons.core/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?><!--
-    Copyright (c) 2009 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
- -->
-
-<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 f4c5fdb..0000000
--- a/org.eclipse.mylyn.commons.core/schema/errorReporters.exsd
+++ /dev/null
@@ -1,107 +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>
-         Error reporters process IStatus objects.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <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>
-         3.0
-      </documentation>
-   </annotation>
-
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2009 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
-      </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 660ea64..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/CoreUtil.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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.Map;
-
-/**
- * @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$
-		}
-	}
-
-	/**
-	 * Returns a string representation of <code>object</code>. If object is a map or array the returned string will
-	 * contains a comma separated list of contained elements.
-	 * 
-	 * @since 3.4
-	 */
-	public static String toString(Object object) {
-		StringBuilder sb = new StringBuilder();
-		toString(sb, object);
-		return sb.toString();
-	}
-
-	private static void toString(StringBuilder sb, Object object) {
-		if (object instanceof Object[]) {
-			sb.append("["); //$NON-NLS-1$
-			Object[] entries = (Object[]) object;
-			boolean prependSeparator = false;
-			for (Object entry : entries) {
-				if (prependSeparator) {
-					sb.append(", "); //$NON-NLS-1$
-				}
-				toString(sb, entry);
-				prependSeparator = true;
-			}
-			sb.append("]"); //$NON-NLS-1$
-		} else if (object instanceof Map<?, ?>) {
-			sb.append("{"); //$NON-NLS-1$
-			boolean prependSeparator = false;
-			for (Map.Entry<?, ?> entry : ((Map<?, ?>) object).entrySet()) {
-				if (prependSeparator) {
-					sb.append(", "); //$NON-NLS-1$
-				}
-				toString(sb, entry.getKey());
-				sb.append("="); //$NON-NLS-1$
-				toString(sb, entry.getValue());
-				prependSeparator = true;
-			}
-			sb.append("}"); //$NON-NLS-1$
-		} else {
-			sb.append(object);
-		}
-	}
-
-}
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/DelegatingProgressMonitor.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/DelegatingProgressMonitor.java
deleted file mode 100644
index 9e0871a..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/DelegatingProgressMonitor.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2004, 2009 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.List;

-import java.util.concurrent.CopyOnWriteArrayList;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IProgressMonitor;

-

-/**

- * Delegates to all attached monitors.

- * 

- * @author Steffen Pingel

- * @author Thomas Ehrnhoefer

- * @since 3.2

- */

-public class DelegatingProgressMonitor implements IDelegatingProgressMonitor {

-

-	private boolean calledBeginTask;

-

-	private boolean canceled;

-

-	private boolean done;

-

-	private double internalWorked;

-

-	private final List<IProgressMonitor> monitors;

-

-	private String subTaskName;

-

-	private String taskName;

-

-	private int totalWork;

-

-	private int worked;

-

-	public DelegatingProgressMonitor() {

-		monitors = new CopyOnWriteArrayList<IProgressMonitor>();

-	}

-

-	public void attach(IProgressMonitor monitor) {

-		Assert.isNotNull(monitor);

-		if (calledBeginTask) {

-			monitor.beginTask(taskName, totalWork);

-		}

-		if (taskName != null) {

-			monitor.setTaskName(taskName);

-		}

-		if (subTaskName != null) {

-			monitor.subTask(subTaskName);

-		}

-		if (worked > 0) {

-			monitor.worked(worked);

-		}

-		if (internalWorked > 0) {

-			monitor.internalWorked(internalWorked);

-		}

-		if (canceled) {

-			monitor.setCanceled(canceled);

-		}

-		if (done) {

-			monitor.done();

-		}

-		monitors.add(monitor);

-	}

-

-	public void beginTask(String name, int totalWork) {

-		if (!calledBeginTask) {

-			this.taskName = name;

-			this.totalWork = totalWork;

-			this.calledBeginTask = true;

-		}

-		for (IProgressMonitor monitor : monitors) {

-			monitor.beginTask(name, totalWork);

-		}

-	}

-

-	public void detach(IProgressMonitor monitor) {

-		monitors.remove(monitor);

-	}

-

-	public void done() {

-		this.done = true;

-		for (IProgressMonitor monitor : monitors) {

-			monitor.done();

-		}

-	}

-

-	public void internalWorked(double work) {

-		this.internalWorked += work;

-		for (IProgressMonitor monitor : monitors) {

-			monitor.internalWorked(work);

-		}

-	}

-

-	public boolean isCanceled() {

-		boolean canceled = false;

-		for (IProgressMonitor monitor : monitors) {

-			canceled |= monitor.isCanceled();

-		}

-		if (canceled) {

-			setCanceled(canceled);

-		}

-		return canceled;

-	}

-

-	public void setCanceled(boolean value) {

-		this.canceled = value;

-		for (IProgressMonitor monitor : monitors) {

-			monitor.setCanceled(value);

-		}

-	}

-

-	public void setTaskName(String name) {

-		this.taskName = name;

-		for (IProgressMonitor monitor : monitors) {

-			monitor.setTaskName(name);

-		}

-	}

-

-	public void subTask(String name) {

-		this.subTaskName = name;

-		for (IProgressMonitor monitor : monitors) {

-			monitor.subTask(name);

-		}

-	}

-

-	public void worked(int work) {

-		this.worked += work;

-		for (IProgressMonitor monitor : monitors) {

-			monitor.worked(work);

-		}

-	}

-}

diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/IDelegatingProgressMonitor.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/IDelegatingProgressMonitor.java
deleted file mode 100644
index 50e1b2e..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/IDelegatingProgressMonitor.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2004, 2009 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.IProgressMonitor;

-

-/**

- * Delegates progress reporting to all attached monitors.

- * 

- * @noextend This interface is not intended to be extended by clients.

- * @noimplement This interface is not intended to be implemented by clients.

- * @author Steffen Pingel

- * @since 3.2

- */

-public interface IDelegatingProgressMonitor extends IProgressMonitor {

-

-	/**

-	 * Registers to <code>monitor</code> to receive all progress events. If the operation is already in progress

-	 * <code>monitor</code> will receive all queued events.

-	 * 

-	 * @since 3.2

-	 * @see #detach(IProgressMonitor)

-	 */

-	public void attach(IProgressMonitor monitor);

-

-	/**

-	 * Unregisters <code>monitor</code>. No progress events will be sent to <code>monitor</code>.

-	 * 

-	 * @since 3.2

-	 * @see #attach(IProgressMonitor)

-	 */

-	public void detach(IProgressMonitor monitor);

-

-}

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 134a0d5..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ErrorReporterManager.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.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 (Throwable 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 9853d9f..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, 2009 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 c6cdadc..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ZipFileUtil.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.Assert;
-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)
- */
-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);
-		try {
-			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 = new BufferedInputStream(zipFile.getInputStream(entry));
-				try {
-					OutputStream outStream = new BufferedOutputStream(new FileOutputStream(outputFile));
-					try {
-						copyStream(inputStream, outStream);
-					} finally {
-						outStream.close();
-					}
-				} finally {
-					inputStream.close();
-				}
-
-				outputFiles.add(outputFile);
-				if (monitor != null) {
-					monitor.worked(1);
-				}
-			}
-			return outputFiles;
-		} finally {
-			zipFile.close();
-		}
-	}
-
-	private static void copyStream(InputStream in, OutputStream out) throws IOException {
-		Assert.isNotNull(in);
-		Assert.isNotNull(out);
-
-		byte[] buffer = new byte[4096];
-		int readCount;
-		while ((readCount = in.read(buffer)) != -1) {
-			out.write(buffer, 0, readCount);
-		}
-		out.flush();
-	}
-
-	/**
-	 * @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 (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));
-				InputStream in = new BufferedInputStream(new FileInputStream(file));
-				try {
-					copyStream(in, zipOut);
-				} finally {
-					in.close();
-				}
-
-				// Complete the entry
-				zipOut.closeEntry();
-			}
-		}
-	}
-
-}
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 9754366..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/provisional/commons/core/messages.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-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 8d68e73..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) 2010 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 5e7f2bd..0000000
--- a/org.eclipse.mylyn.commons.net/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
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 413af6b..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.4.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.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
-Import-Package: org.apache.commons.logging;version="[1.0.4,2.0.0)"
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 9d0e182..0000000
--- a/org.eclipse.mylyn.commons.net/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-#Properties file for org.eclipse.mylyn.commons.net
-Bundle-Vendor = Eclipse Mylyn
-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 f890a56..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/HtmlTag.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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<String, String>) 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 2e67288..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebLocation.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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 5015765..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebUtil.java
+++ /dev/null
@@ -1,798 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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.Proxy.Type;
-import java.net.Socket;
-import java.text.ParseException;
-import java.util.concurrent.CancellationException;
-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.core.runtime.SubMonitor;
-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.MonitoredRequest;
-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 {
-
-	// FIXME remove this again
-	private 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$
-		}
-	}
-
-	/**
-	 * 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 = 500;
-
-	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;
-
-	private static ProtocolSocketFactory sslSocketFactory = new PollingSslProtocolSocketFactory();
-
-	private static PollingProtocolSocketFactory socketFactory = new PollingProtocolSocketFactory();
-
-	/**
-	 * @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));
-		client.getParams().setConnectionManagerTimeout(CONNECTION_TIMEOUT_INTERVAL);
-		// 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);
-		// FIXME fix connection leaks
-		if (TEST_MODE) {
-			client.getHttpConnectionManager().getParams().setMaxConnectionsPerHost(
-					HostConfiguration.ANY_HOST_CONFIGURATION, 2);
-		} else {
-			client.getHttpConnectionManager().getParams().setMaxConnectionsPerHost(
-					HostConfiguration.ANY_HOST_CONFIGURATION, 100);
-			client.getHttpConnectionManager().getParams().setMaxTotalConnections(1000);
-		}
-	}
-
-	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 {
-		Assert.isNotNull(socket);
-
-		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)) {
-			Protocol protocol = new Protocol("https", sslSocketFactory, HTTPS_PORT); //$NON-NLS-1$
-			hostConfiguration.setHost(host, port, protocol);
-		} else {
-			Protocol protocol = new Protocol("http", socketFactory, HTTP_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);
-
-		MonitoredRequest<Integer> executor = new MonitoredRequest<Integer>(monitor) {
-			@Override
-			public void abort() {
-				super.abort();
-				method.abort();
-			}
-
-			@Override
-			public Integer execute() 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 {
-		// check for legacy reasons
-		SubMonitor subMonitor = (monitor instanceof SubMonitor) ? (SubMonitor) monitor : SubMonitor.convert(null);
-
-		Future<T> future = CommonsNetPlugin.getExecutorService().submit(request);
-		while (true) {
-			if (monitor.isCanceled()) {
-				request.abort();
-
-				// wait for executor to finish
-				future.cancel(false);
-				try {
-					if (!future.isCancelled()) {
-						future.get();
-					}
-				} catch (CancellationException e) {
-					// ignore
-				} 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) {
-			}
-
-			subMonitor.setWorkRemaining(20);
-			subMonitor.worked(1);
-		}
-	}
-
-	@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 {
-//		return method.getResponseBodyAsStream();
-		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 {
-				WebUtil.releaseConnection(method, monitor);
-			}
-		} 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;
-	}
-
-	/**
-	 * Releases the connection used by <code>method</code>. If <code>monitor</code> is cancelled the connection is
-	 * aborted to avoid blocking.
-	 * 
-	 * @since 3.4
-	 */
-	public static void releaseConnection(HttpMethodBase method, IProgressMonitor monitor) {
-		if (monitor != null && monitor.isCanceled()) {
-			// force a connection close on cancel to avoid blocking to do reading the remainder of the response 
-			method.abort();
-		} else {
-			try {
-				method.releaseConnection();
-			} catch (NullPointerException e) {
-				// ignore, see bug 255417
-			}
-		}
-	}
-
-}
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/ICancellable.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/ICancellable.java
deleted file mode 100644
index a764164..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/ICancellable.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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;
-
-/**
- * @author Steffen Pingel
- */
-public interface ICancellable {
-
-	public abstract void abort();
-	
-}
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 969b953..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, 2009 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/MonitoredRequest.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/MonitoredRequest.java
deleted file mode 100644
index 1415d23..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/MonitoredRequest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.InetSocketAddress;
-import java.net.Socket;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.mylyn.commons.net.WebRequest;
-
-/**
- * @author Steffen Pingel
- */
-public abstract class MonitoredRequest<T> extends WebRequest<T> implements ICancellable {
-
-	private static ThreadLocal<MonitoredRequest<?>> currentRequest = new ThreadLocal<MonitoredRequest<?>>();
-
-	public static MonitoredRequest<?> getCurrentRequest() {
-		return currentRequest.get();
-	}
-
-	public static void setCurrentRequest(MonitoredRequest<?> request) {
-		currentRequest.set(request);
-	}
-
-	private final CopyOnWriteArrayList<ICancellable> listeners = new CopyOnWriteArrayList<ICancellable>();
-
-	private final IProgressMonitor monitor;
-
-	public MonitoredRequest(IProgressMonitor monitor) {
-		Assert.isNotNull(monitor);
-		this.monitor = monitor;
-	}
-
-	public T call() throws Exception {
-		try {
-			assert MonitoredRequest.getCurrentRequest() == null;
-			MonitoredRequest.setCurrentRequest(this);
-			return execute();
-		} finally {
-			MonitoredRequest.setCurrentRequest(null);
-			listeners.clear();
-		}
-	}
-
-	protected abstract T execute() throws Exception;
-
-	@Override
-	public void abort() {
-		for (ICancellable listener : listeners.toArray(new ICancellable[0])) {
-			try {
-				listener.abort();
-			} catch (Exception e) {
-				// ignore
-			}
-		}
-	}
-
-	public void addListener(ICancellable listener) {
-		listeners.add(listener);
-	}
-
-	public IProgressMonitor getMonitor() {
-		return monitor;
-	}
-
-	public void removeListener(ICancellable listener) {
-		listeners.remove(listener);
-	}
-
-	public static void connect(final Socket socket, InetSocketAddress address, int timeout) throws IOException {
-		MonitoredRequest<?> request = MonitoredRequest.getCurrentRequest();
-		if (request != null) {
-			ICancellable listener = new ICancellable() {
-				public void abort() {
-					try {
-						socket.close();
-					} catch (IOException e) {
-						// ignore
-					}
-				}
-			};
-			try {
-				request.addListener(listener);
-				socket.connect(address, timeout);
-			} finally {
-				request.removeListener(listener);
-			}
-		} else {
-			socket.connect(address, timeout);
-		}
-	}
-
-}
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 f27fc92..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingProtocolSocketFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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;
-
-/**
- * @author Steffen Pingel
- */
-public class PollingProtocolSocketFactory implements ProtocolSocketFactory {
-
-	private final static SocketFactory factory = SocketFactory.getDefault();
-
-	public PollingProtocolSocketFactory() {
-	}
-
-	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));
-		MonitoredRequest.connect(socket, new InetSocketAddress(host, port), timeout);
-		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 09ef1af..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingSslProtocolSocketFactory.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Provides support for managing SSL connections.
- * 
- * @author Nathan Hapke
- * @author Rob Elves
- * @author Steffen Pingel
- */
-public class PollingSslProtocolSocketFactory implements SecureProtocolSocketFactory {
-
-	private static final String KEY_STORE = "javax.net.ssl.keyStore"; //$NON-NLS-1$
-
-	private static final String KEY_STORE_PASSWORD = "javax.net.ssl.keyStorePassword"; //$NON-NLS-1$
-
-	private static final String KEY_STORE_TYPE = "javax.net.ssl.keyStoreType"; //$NON-NLS-1$
-
-	private final boolean hasKeyManager;
-
-	private SSLSocketFactory socketFactory;
-
-	public PollingSslProtocolSocketFactory() {
-		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(IStatus.ERROR, "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(IStatus.ERROR, "Could not initialize SSL context", e); //$NON-NLS-1$
-		}
-	}
-
-	public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException,
-			UnknownHostException {
-		return getSocketFactory().createSocket(socket, host, port, autoClose);
-	}
-
-	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 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();
-		final Socket socket = getSocketFactory().createSocket();
-		socket.bind(new InetSocketAddress(localAddress, localPort));
-		MonitoredRequest.connect(socket, new InetSocketAddress(host, port), timeout);
-		return socket;
-	}
-
-	public SSLSocketFactory getSocketFactory() throws IOException {
-		if (socketFactory == null) {
-			throw new IOException("Could not initialize SSL context"); //$NON-NLS-1$
-		}
-		return socketFactory;
-	}
-
-	public boolean hasKeyManager() {
-		return hasKeyManager;
-	}
-
-}
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/TimeoutInputStream.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TimeoutInputStream.java
deleted file mode 100644
index b9621dd..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, 2010 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;
-			// interrupts waitUntilClose and triggers closing of stream 
-			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 {
-		while (!closeRequested) {
-			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 48a7efc..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, 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.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 1f724ca..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, 2009 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 f930cb7..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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 8d68e73..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) 2010 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 5e7f2bd..0000000
--- a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
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 f73d3b7..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.4.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 dd0d6c0..0000000
--- a/org.eclipse.mylyn.commons.soap/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-#Properties file for org.eclipse.mylyn.commons.net
-Bundle-Vendor = Eclipse Mylyn
-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 34fd96c..0000000
--- a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/commons/soap/SoapRequest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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() {
-		// the method gets set at a later point in SoapHttpSender, wait to make sure we close the underlying connection
-		while (method == null) {
-			// safe guard in case the method is never set, e.g. in case of an Exception
-			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 ae913f0..0000000
--- a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/CommonsHttpSender.java
+++ /dev/null
@@ -1,856 +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
- * Pawel Niewiadomski 
- *   - fixed user agent handling (bug 288441)
- */
-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.List;
-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", "rawtypes", "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 if (contentEncoding.getValue().equals("") && msgContext.isPropertyTrue(SoapHttpSender.ALLOW_EMPTY_CONTENT_ENCODING)) { //$NON-NLS-1$
-					// assume no encoding
-				} 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;
-
-		List<String> cookies = new ArrayList<String>();
-		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 {
-					// let plug-ins using SOAP be able to set their own user-agent header (i.e. for tracking purposes)
-					if (HTTPConstants.HEADER_USER_AGENT.equalsIgnoreCase(key)) {
-						method.setRequestHeader(key, value);
-					} 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 cdc8e44..0000000
--- a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/SoapHttpSender.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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$
-
-	/**
-	 * The key for enabling a work-around in case the server responds with an empty content encoding.
-	 */
-	public static final String ALLOW_EMPTY_CONTENT_ENCODING = "org.eclipse.mylyn.commons.soap.allowEmptyContentEncoding"; //$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 2d4bc7c..0000000
--- a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Sun Sep 20 00:06:01 PDT 2009
-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) 2010 Tasktop Technologies 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 * Contributors\:\n *     Tasktop Technologies - initial API and implementation\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 5e7f2bd..0000000
--- a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
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 e48a4c7..0000000
--- a/org.eclipse.mylyn.commons.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Commons Tests
-Bundle-SymbolicName: org.eclipse.mylyn.commons.tests;singleton:=true
-Bundle-Version: 3.4.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.net,
- org.eclipse.osgi,
- org.eclipse.ui,
- org.junit,
- org.eclipse.mylyn.commons.core,
- org.eclipse.mylyn.commons.net,
- org.eclipse.mylyn.commons.ui,
- org.eclipse.mylyn.commons.xmlrpc,
- org.apache.xmlrpc
-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,
- org.eclipse.mylyn.commons.tests.ui;x-internal:=true,
- org.eclipse.mylyn.commons.tests.xmlrpc;x-internal:=true
-Bundle-Vendor: Eclipse Mylyn
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 4002fdb..0000000
--- a/org.eclipse.mylyn.commons.tests/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-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 01348a0..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/AllCommonsTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 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.TimeoutInputStreamTest;
-import org.eclipse.mylyn.commons.tests.net.WebUtilTest;
-import org.eclipse.mylyn.commons.tests.ui.CommonUiUtilTest;
-
-/**
- * @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);
-		suite.addTestSuite(CommonUiUtilTest.class);
-		suite.addTestSuite(TimeoutInputStreamTest.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 edc56c0..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/SslProtocolSocketFactoryTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-import org.eclipse.mylyn.commons.tests.support.TestProxy;
-import org.eclipse.mylyn.internal.commons.net.PollingSslProtocolSocketFactory;
-
-/**
- * @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 {
-		SecureProtocolSocketFactory factory = new PollingSslProtocolSocketFactory();
-		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/TimeoutInputStreamTest.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/TimeoutInputStreamTest.java
deleted file mode 100644
index 69bfca0..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/TimeoutInputStreamTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.io.InputStream;
-import java.io.InterruptedIOException;
-import java.net.ServerSocket;
-import java.net.SocketTimeoutException;
-import java.util.concurrent.ThreadPoolExecutor;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.commons.net.CommonsNetPlugin;
-import org.eclipse.mylyn.internal.commons.net.TimeoutInputStream;
-
-/**
- * @author Steffen Pingel
- */
-public class TimeoutInputStreamTest extends TestCase {
-
-	volatile int value;
-
-	volatile IOException e;
-
-	InputStream stream = new InputStream() {
-		@Override
-		public int read() throws IOException {
-			if (e != null) {
-				throw e;
-			}
-			return value;
-		}
-	};
-
-	private ServerSocket server;
-
-	@Override
-	protected void setUp() throws Exception {
-		assertEquals(0, ((ThreadPoolExecutor) CommonsNetPlugin.getExecutorService()).getActiveCount());
-		server = new ServerSocket();
-		new Thread() {
-			@Override
-			public void run() {
-				try {
-					server.accept();
-				} catch (IOException e) {
-					// ignore
-				}
-			};
-		}.start();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		server.close();
-	}
-
-	public void testClose() throws Exception {
-		TimeoutInputStream in = new TimeoutInputStream(stream, 1, 500, 500);
-		assertEquals(0, in.read());
-		value = -1;
-		// clear buffer
-		in.read();
-		assertEquals(-1, in.read());
-		in.close();
-		Thread.sleep(200);
-		assertEquals(0, ((ThreadPoolExecutor) CommonsNetPlugin.getExecutorService()).getActiveCount());
-	}
-
-	public void testCloseTimeout() throws Exception {
-		e = new SocketTimeoutException();
-		TimeoutInputStream in = new TimeoutInputStream(stream, 1, 500, 500);
-		try {
-			in.read();
-			fail("expected InterruptedIOException");
-		} catch (InterruptedIOException e) {
-			// expected
-		} finally {
-			in.close();
-		}
-		assertEquals(0, ((ThreadPoolExecutor) CommonsNetPlugin.getExecutorService()).getActiveCount());
-	}
-
-}
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 86224dc..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java
+++ /dev/null
@@ -1,640 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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.io.InterruptedIOException;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.Proxy.Type;
-import java.net.Socket;
-import java.net.SocketException;
-import java.util.concurrent.ThreadPoolExecutor;
-
-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.NullProgressMonitor;
-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.CommonsNetPlugin;
-import org.eclipse.mylyn.internal.commons.net.PollingInputStream;
-import org.eclipse.mylyn.internal.commons.net.PollingSslProtocolSocketFactory;
-import org.eclipse.mylyn.internal.commons.net.TimeoutInputStream;
-
-/**
- * @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 {
-			WebUtil.releaseConnection(method, monitor);
-		}
-	}
-
-	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 {
-			WebUtil.releaseConnection(method, monitor);
-		}
-	}
-
-	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 {
-			WebUtil.releaseConnection(method, monitor);
-		}
-	}
-
-	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 testReadTimeout() throws Exception {
-		assertEquals(0, ((ThreadPoolExecutor) CommonsNetPlugin.getExecutorService()).getActiveCount());
-
-		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.TIMEOUT);
-
-		GetMethod method = new GetMethod("/");
-		method.getParams().setSoTimeout(100);
-		int statusCode = client.executeMethod(hostConfiguration, method);
-		assertEquals(200, statusCode);
-
-		PollingInputStream in = new PollingInputStream(new TimeoutInputStream(method.getResponseBodyAsStream(), 8192,
-				500L, -1), 1, new NullProgressMonitor());
-		try {
-			in.read();
-			fail("expected InterruptedIOException");
-		} catch (InterruptedIOException e) {
-			// expected
-		} finally {
-			in.close();
-		}
-		Thread.sleep(200);
-		assertEquals(0, ((ThreadPoolExecutor) CommonsNetPlugin.getExecutorService()).getActiveCount());
-	}
-
-	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 or connection reset, got status: " + statusCode);
-		} catch (SSLHandshakeException e) {
-		} catch (SocketException e) {
-			assertEquals("Connection reset", e.getMessage());
-		}
-
-		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 {
-		String url = "https://mylyn.eclipse.org/secure/";
-		AbstractWebLocation location = new WebLocation(url, null, null, null);
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-
-		if (!((PollingSslProtocolSocketFactory) hostConfiguration.getProtocol().getSocketFactory()).hasKeyManager()) {
-			// skip test if keystore property is not set
-			return;
-		}
-
-		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/CommonTestUtil.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/CommonTestUtil.java
deleted file mode 100644
index 7f3e9a6..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/CommonTestUtil.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 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.tests.support;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import junit.framework.AssertionFailedError;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.osgi.internal.baseadaptor.DefaultClassLoader;
-
-@SuppressWarnings("restriction")
-public class CommonTestUtil {
-
-	private final static int MAX_RETRY = 5;
-
-	/**
-	 * 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 the given source file to the given destination file.
-	 */
-	public static void copy(File source, File dest) throws IOException {
-		InputStream in = new FileInputStream(source);
-		try {
-			OutputStream out = new FileOutputStream(dest);
-			try {
-				transferData(in, out);
-			} finally {
-				out.close();
-			}
-		} 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 File createTempFileInPlugin(Plugin plugin, IPath path) {
-		IPath stateLocation = plugin.getStateLocation();
-		stateLocation = stateLocation.append(path);
-		return stateLocation.toFile();
-	}
-
-	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 need to catch this
-					}
-				}
-			}
-		}
-	}
-
-	public static void deleteFolder(File path) {
-		if (path.isDirectory()) {
-			for (File file : path.listFiles()) {
-				file.delete();
-			}
-			path.delete();
-		}
-	}
-
-	public static void deleteFolderRecursively(File path) {
-		File[] files = path.listFiles();
-		if (files != null) {
-			for (File file : files) {
-				if (file.isDirectory()) {
-					deleteFolderRecursively(file);
-				} else {
-					file.delete();
-				}
-			}
-		}
-	}
-
-	public static File getFile(Object source, String filename) throws IOException {
-		Class<?> clazz = (source instanceof Class<?>) ? (Class<?>) source : source.getClass();
-		if (Platform.isRunning()) {
-			ClassLoader classLoader = clazz.getClassLoader();
-			if (classLoader instanceof DefaultClassLoader) {
-				// TODO e3.5 replace with: URL url = ((BundleClassLoader) classLoader).getBundle().getEntry(filename);
-				URL url = ((DefaultClassLoader) classLoader).getClasspathManager().getBaseData().getBundle().getEntry(
-						filename);
-				if (url != null) {
-					URL localURL = FileLocator.toFileURL(url);
-					return new File(localURL.getFile());
-				}
-			}
-		} else {
-			URL localURL = clazz.getResource("");
-			String path = localURL.getFile();
-			int i = path.indexOf("!");
-			if (i != -1) {
-				int j = path.lastIndexOf(File.separatorChar, i);
-				if (j != -1) {
-					path = path.substring(0, j) + File.separator;
-				} else {
-					throw new AssertionFailedError("Unable to determine location for '" + filename + "' at '" + path
-							+ "'");
-				}
-				// class file is nested in jar, use jar path as base
-				if (path.startsWith("file:")) {
-					path = path.substring(5);
-				}
-				return new File(path + filename);
-			} else {
-				// remove all package segments from name
-				String directory = clazz.getName().replaceAll("[^.]", "");
-				directory = directory.replaceAll(".", "../");
-				if (localURL.getFile().contains("/bin/")) {
-					// account for bin/ when running from Eclipse workspace
-					directory += "../";
-				}
-				filename = localURL.getFile() + (directory + filename).replaceAll("/", File.separator);
-				return new File(filename).getCanonicalFile();
-			}
-		}
-		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 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
-	 */
-	private static void transferData(InputStream in, OutputStream out) throws IOException {
-		byte[] buf = new byte[1024];
-		int len;
-		while ((len = in.read(buf)) > 0) {
-			out.write(buf, 0, len);
-		}
-	}
-
-	/**
-	 * 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 need to catch this
-						}
-					}
-					if (src != null) {
-						try {
-							src.close();
-						} catch (IOException e) {
-							// don't need to catch this
-						}
-					}
-				}
-			}
-		} finally {
-			try {
-				zipFile.close();
-			} catch (IOException e) {
-				// don't need to catch this
-			}
-		}
-	}
-
-	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 need to catch this
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/ManagedTestSuite.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/ManagedTestSuite.java
deleted file mode 100644
index c15d003..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/ManagedTestSuite.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.text.MessageFormat;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestFailure;
-import junit.framework.TestListener;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-/**
- * Prints the name of each test to System.err when it started and dumps a stack trace of all thread to System.err if a
- * test takes longer than 10 minutes.
- * 
- * @author Steffen Pingel
- */
-public class ManagedTestSuite extends TestSuite {
-
-	private class DumpThreadTask extends TimerTask {
-
-		private final Test test;
-
-		public DumpThreadTask(Test test) {
-			this.test = test;
-		}
-
-		@Override
-		public void run() {
-			StringBuffer sb = new StringBuffer();
-			sb.append(MessageFormat.format("Test {0} is taking too long:\n", test.toString()));
-			Map<Thread, StackTraceElement[]> traces = Thread.getAllStackTraces();
-			for (Map.Entry<Thread, StackTraceElement[]> entry : traces.entrySet()) {
-				sb.append(entry.getKey().toString());
-				sb.append("\n");
-				for (StackTraceElement element : entry.getValue()) {
-					sb.append("  ");
-					sb.append(element.toString());
-					sb.append("\n");
-				}
-				sb.append("\n");
-			}
-			System.err.println(sb.toString());
-		}
-
-	}
-
-	private class Listener implements TestListener {
-
-		private DumpThreadTask task;
-
-		private final Timer timer = new Timer(true);
-
-		public void addError(Test test, Throwable t) {
-			System.err.println("[ERROR]");
-		}
-
-		public void addFailure(Test test, AssertionFailedError t) {
-			System.err.println("[FAILURE]");
-		}
-
-		private void dumpList(String header, Enumeration<TestFailure> failures) {
-			System.err.println(header);
-			while (failures.hasMoreElements()) {
-				TestFailure failure = failures.nextElement();
-				System.err.print("  ");
-				System.err.println(failure.toString());
-			}
-		}
-
-		public void dumpResults(TestResult result) {
-			System.err.println();
-			dumpList("Failures: ", result.failures());
-
-			System.err.println();
-			dumpList("Errors: ", result.errors());
-
-			int failedCount = result.errorCount() + result.failureCount();
-			System.err.println();
-			System.err.println(MessageFormat.format("{0} out of {1} tests failed", failedCount, result.runCount()));
-		}
-
-		public void endTest(Test test) {
-			if (task != null) {
-				task.cancel();
-				task = null;
-			}
-		}
-
-		public void startTest(Test test) {
-			System.err.println("Running " + test.toString());
-			task = new DumpThreadTask(test);
-			timer.schedule(task, DELAY);
-		}
-
-	}
-
-	public final static long DELAY = 10 * 60 * 1000;
-
-	private final Listener listener = new Listener();
-
-	public ManagedTestSuite() {
-	}
-
-	public ManagedTestSuite(String name) {
-		super(name);
-	}
-
-	@Override
-	public void run(TestResult result) {
-		result.addListener(listener);
-		super.run(result);
-		listener.dumpResults(result);
-
-		// add dummy test to dump threads in case shutdown hangs
-		listener.startTest(new Test() {
-			public int countTestCases() {
-				return 1;
-			}
-
-			public void run(TestResult result) {
-				// do nothing
-			}
-
-			@Override
-			public String toString() {
-				return "ShutdownWatchdog";
-			}
-		});
-	}
-
-}
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 cf726c4..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/TestProxy.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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;
-		}
-
-		public String getStatusLine() {
-			int i = request.indexOf("\n");
-			return (i != -1) ? request.substring(0, i) : request;
-		}
-
-		@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 TIMEOUT = 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);
-		OK.headers.add(HEADER_CONNECTION_CLOSE);
-		SERVICE_UNVAILABLE.headers.add(HEADER_CONNECTION_CLOSE);
-		TIMEOUT.headers.add("Content-Length: 500");
-	}
-
-	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;
-
-	private boolean debugEnabled;
-
-	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) {
-				if (isDebugEnabled()) {
-					System.err.println("< " + line);
-				}
-				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) {
-			// ignore
-		} 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;
-		try {
-			if (serverSocket != null) {
-				serverSocket.close();
-			}
-		} catch (IOException e1) {
-			// ignore
-		}
-		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 {
-		if (isDebugEnabled()) {
-			System.err.println("> " + message.getStatusLine());
-		}
-
-		BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, message.getCharset()));
-		writer.write(message.toString());
-		writer.flush();
-	}
-
-	public boolean isDebugEnabled() {
-		return debugEnabled;
-	}
-
-	public void setDebugEnabled(boolean debugEnabled) {
-		this.debugEnabled = debugEnabled;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/UiTestUtil.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/UiTestUtil.java
deleted file mode 100644
index 78c5979..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/UiTestUtil.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class UiTestUtil {
-
-	public static int countItemsInTree(Tree tree) {
-		List<TreeItem> collectedItems = new ArrayList<TreeItem>();
-		collectTreeItemsInView(tree.getItems(), collectedItems);
-		return collectedItems.size();
-	}
-
-	public static void collectTreeItemsInView(TreeItem[] items, List<TreeItem> collectedItems) {
-		if (items.length > 0) {
-			for (TreeItem childItem : Arrays.asList(items)) {
-				collectedItems.add(childItem);
-				collectTreeItemsInView(childItem.getItems(), collectedItems);
-			}
-		}
-	}
-
-	public static List<Object> getAllData(Tree tree) {
-		List<TreeItem> items = new ArrayList<TreeItem>();
-		collectTreeItemsInView(tree.getItems(), items);
-		List<Object> dataList = new ArrayList<Object>();
-		for (TreeItem item : items) {
-			dataList.add(item.getData());
-		}
-		return dataList;
-	}
-
-	/**
-	 * Ensures that the editor area is visible.
-	 */
-	public static void closeWelcomeView() {
-		IViewReference[] views = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getActivePage()
-				.getViewReferences();
-		for (IViewReference view : views) {
-			if ("org.eclipse.ui.internal.introview".equals(view.getId())) {
-				PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().hideView(view);
-				PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().resetPerspective();
-				return;
-			}
-		}
-	}
-
-	public static IViewPart openView(String id) throws PartInitException {
-		return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(id);
-	}
-
-	public static void closeAllEditors() {
-		PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/ui/CommonUiUtilTest.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/ui/CommonUiUtilTest.java
deleted file mode 100644
index bd1de69..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/ui/CommonUiUtilTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.ui;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonUiUtil;
-
-/**
- * @author Steffen Pingel
- */
-public class CommonUiUtilTest extends TestCase {
-
-	public void testToLabel() {
-		assertNull(CommonUiUtil.toLabel(null));
-		assertEquals("", CommonUiUtil.toLabel(""));
-		assertEquals(" ", CommonUiUtil.toLabel(" "));
-		assertEquals("abc def", CommonUiUtil.toLabel("abc def"));
-		assertEquals("a&&b", CommonUiUtil.toLabel("a&b"));
-		assertEquals("a&&b&&c", CommonUiUtil.toLabel("a&b&c"));
-		assertEquals("&&", CommonUiUtil.toLabel("&"));
-		assertEquals("&&&&", CommonUiUtil.toLabel("&&"));
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcClientTest.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcClientTest.java
deleted file mode 100644
index c460c60..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcClientTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.tests.xmlrpc;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.commons.net.WebLocation;
-import org.eclipse.mylyn.internal.commons.xmlrpc.CommonXmlRpcClient;
-import org.eclipse.mylyn.internal.commons.xmlrpc.XmlRpcNoSuchMethodException;
-
-/**
- * @author Steffen Pingel
- */
-public class XmlRpcClientTest extends TestCase {
-
-	private CommonXmlRpcClient client;
-
-	private int port;
-
-	@Override
-	protected void setUp() throws Exception {
-		port = XmlRpcTestServer.start();
-		client = new CommonXmlRpcClient(new WebLocation("http://localhost:" + port + "/xmlrpc"));
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		//webServer.shutdown();
-	}
-
-	public void testCall() throws Exception {
-		int i = (Integer) client.call(new NullProgressMonitor(), "Test.identity", 5);
-		assertEquals(5, i);
-	}
-
-	public void testNoSuchMethod() throws Exception {
-		try {
-			Object response = client.call(new NullProgressMonitor(), "Test.noSuchMethod", 5);
-			fail("Expected XmlRpcNoSuchMethodExecption, got " + response);
-		} catch (XmlRpcNoSuchMethodException e) {
-			// expected
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcOperationTest.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcOperationTest.java
deleted file mode 100644
index b9e066a..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcOperationTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.xmlrpc;
-
-import junit.framework.TestCase;
-
-import org.apache.xmlrpc.XmlRpcException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.commons.net.WebLocation;
-import org.eclipse.mylyn.internal.commons.xmlrpc.CommonXmlRpcClient;
-import org.eclipse.mylyn.internal.commons.xmlrpc.XmlRpcOperation;
-
-/**
- * @author Steffen Pingel
- */
-public class XmlRpcOperationTest extends TestCase {
-
-	private CommonXmlRpcClient client;
-
-	private int port;
-
-	@Override
-	protected void setUp() throws Exception {
-		port = XmlRpcTestServer.start();
-		client = new CommonXmlRpcClient(new WebLocation("http://localhost:" + port + "/xmlrpc"));
-	}
-
-	public void testExecute() throws Exception {
-		Integer response = (new XmlRpcOperation<Integer>(client) {
-			@Override
-			public Integer execute() throws XmlRpcException {
-				return (Integer) call(new NullProgressMonitor(), "Test.identity", 5);
-			}
-		}).execute();
-		assertEquals(5, (int) response);
-	}
-
-//	public void testExecuteMulticall() throws Exception {
-//		MulticallResult result = (new XmlRpcOperation<MulticallResult>(client) {
-//			@Override
-//			public MulticallResult execute() throws XmlRpcException {
-//				Multicall call = new Multicall();
-//				call.add("Test.identity", 1);
-//				call.add("Test.identity", 5);
-//				return call(new NullProgressMonitor(), call);
-//			}
-//		}).execute();
-//		List<Integer> response = result.getItems(Integer.class);
-//		assertEquals(Arrays.asList(1, 5), response);
-//	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcTestServer.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcTestServer.java
deleted file mode 100644
index 47bb391..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/xmlrpc/XmlRpcTestServer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.xmlrpc;
-
-import org.apache.xmlrpc.server.PropertyHandlerMapping;
-import org.apache.xmlrpc.server.XmlRpcServer;
-import org.apache.xmlrpc.webserver.WebServer;
-
-public class XmlRpcTestServer {
-
-	private static int port = 8090;
-
-	public static class Server {
-
-		public int identity(int i) {
-			return i;
-		}
-
-	}
-
-	private static WebServer webServer;
-
-	public static int start() throws Exception {
-		if (webServer == null) {
-			webServer = new WebServer(port);
-			XmlRpcServer xmlRpcServer = webServer.getXmlRpcServer();
-
-			PropertyHandlerMapping phm = new PropertyHandlerMapping();
-			phm.addHandler("Test", Server.class);
-			xmlRpcServer.setHandlerMapping(phm);
-
-			webServer.start();
-		}
-		return port;
-	}
-
-}
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 e5f0da4..0000000
--- a/org.eclipse.mylyn.commons.ui/.project
+++ /dev/null
@@ -1,34 +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>
-		<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.ui/.settings/.api_filters b/org.eclipse.mylyn.commons.ui/.settings/.api_filters
deleted file mode 100644
index cbf37e3..0000000
--- a/org.eclipse.mylyn.commons.ui/.settings/.api_filters
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.mylyn.commons.ui" version="2">
-    <resource path="src/org/eclipse/mylyn/internal/provisional/commons/ui/EnhancedFilteredTree.java" type="org.eclipse.mylyn.internal.provisional.commons.ui.EnhancedFilteredTree">
-        <filter comment="Needed to remove the key listener added by filtered tree" id="640712815">
-            <message_arguments>
-                <message_argument value="TypedListener"/>
-                <message_argument value="EnhancedFilteredTree"/>
-                <message_argument value="getEventListener()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/AbstractInPlaceDialog.java" type="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.AbstractInPlaceDialog">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.AbstractInPlaceDialog"/>
-                <message_argument value="org.eclipse.mylyn.commons.ui_3.4.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/IInPlaceDialogListener.java" type="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.IInPlaceDialogListener">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.IInPlaceDialogListener"/>
-                <message_argument value="org.eclipse.mylyn.commons.ui_3.4.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceCheckBoxTreeDialog.java" type="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.InPlaceCheckBoxTreeDialog">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.InPlaceCheckBoxTreeDialog"/>
-                <message_argument value="org.eclipse.mylyn.commons.ui_3.4.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceDateSelectionDialog.java" type="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.InPlaceDateSelectionDialog">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.InPlaceDateSelectionDialog"/>
-                <message_argument value="org.eclipse.mylyn.commons.ui_3.4.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceDialogEvent.java" type="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.InPlaceDialogEvent">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.InPlaceDialogEvent"/>
-                <message_argument value="org.eclipse.mylyn.commons.ui_3.4.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/Messages.java" type="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.Messages">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.Messages"/>
-                <message_argument value="org.eclipse.mylyn.commons.ui_3.4.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
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 8d68e73..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) 2010 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 5e7f2bd..0000000
--- a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
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 45fc98c..0000000
--- a/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,51 +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.4.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-internal:=true;
-  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.dialogs;x-internal:=true;uses:="org.eclipse.swt.graphics,org.eclipse.swt.widgets,org.eclipse.jface.dialogs",
- org.eclipse.mylyn.internal.provisional.commons.ui.editor;x-internal:=true;
-  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 6cc9d1d..0000000
--- a/org.eclipse.mylyn.commons.ui/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-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/draw16/edit_arrow1.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/edit_arrow1.gif
deleted file mode 100644
index 0083160..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_arrow1.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_arrow2.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/edit_arrow2.gif
deleted file mode 100644
index dd97e84..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_arrow2.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_box.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/edit_box.gif
deleted file mode 100644
index f89e65a..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_box.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_box.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_box.gif
deleted file mode 100644
index 731a6bb..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_box.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_oval.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_oval.gif
deleted file mode 100644
index ad0779b..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_oval.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_rbox.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_rbox.gif
deleted file mode 100644
index 2b8f521..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_fill_rbox.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_free.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/edit_free.gif
deleted file mode 100644
index 14583e7..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_free.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_line.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/edit_line.gif
deleted file mode 100644
index 923c116..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_line.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_oval.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/edit_oval.gif
deleted file mode 100644
index f50969b..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_oval.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_rbox.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/edit_rbox.gif
deleted file mode 100644
index 174c41f..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/edit_rbox.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold1.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold1.gif
deleted file mode 100644
index 7c85b32..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold1.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold2.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold2.gif
deleted file mode 100644
index 6158793..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold2.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold4.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold4.gif
deleted file mode 100644
index df5f605..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold4.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold8.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold8.gif
deleted file mode 100644
index 49c6985..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/line_bold8.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/line_dash.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/line_dash.gif
deleted file mode 100644
index db5950a..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/line_dash.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/line_dash1d.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/line_dash1d.gif
deleted file mode 100644
index 62099ba..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/line_dash1d.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/line_dash2d.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/line_dash2d.gif
deleted file mode 100644
index 5e700cd..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/line_dash2d.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/line_dot.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/line_dot.gif
deleted file mode 100644
index 69d00e3..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/line_dot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/draw16/line_sold.gif b/org.eclipse.mylyn.commons.ui/icons/draw16/line_sold.gif
deleted file mode 100644
index ec93950..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/draw16/line_sold.gif
+++ /dev/null
Binary files differ
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/clipboard_obj.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/clipboard_obj.gif
deleted file mode 100644
index b817f8b..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/clipboard_obj.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/discovery.png b/org.eclipse.mylyn.commons.ui/icons/etool16/discovery.png
deleted file mode 100644
index 53a305a..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/discovery.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/edit-small.png b/org.eclipse.mylyn.commons.ui/icons/etool16/edit-small.png
deleted file mode 100644
index aee393c..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/edit-small.png
+++ /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/file_obj.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/file_obj.gif
deleted file mode 100644
index 7ccc6a7..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/file_obj.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 7f32480..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 2d3935a..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/find.png b/org.eclipse.mylyn.commons.ui/icons/etool16/find.png
deleted file mode 100644
index 611189d..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/find.png
+++ /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/monitor_obj.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/monitor_obj.gif
deleted file mode 100644
index e3ecc55..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/monitor_obj.gif
+++ /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-small.png b/org.eclipse.mylyn.commons.ui/icons/etool16/person-me-small.png
deleted file mode 100644
index acdfc72..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/person-me-small.png
+++ /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/redo_edit.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/redo_edit.gif
deleted file mode 100644
index c84e5b1..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/redo_edit.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/save.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/save.gif
deleted file mode 100644
index 7da6455..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/save.gif
+++ /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/schedule.png b/org.eclipse.mylyn.commons.ui/icons/etool16/schedule.png
deleted file mode 100644
index 530b2d9..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/schedule.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/select_rect.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/select_rect.gif
deleted file mode 100644
index 10dd1f0..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/select_rect.gif
+++ /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/undo_edit.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/undo_edit.gif
deleted file mode 100644
index eae118a..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/undo_edit.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/etool16/web.png b/org.eclipse.mylyn.commons.ui/icons/etool16/web.png
deleted file mode 100644
index 94eec2c..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/web.png
+++ /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/notification-preferences-active.png b/org.eclipse.mylyn.commons.ui/icons/eview16/notification-preferences-active.png
deleted file mode 100644
index 5698232..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/notification-preferences-active.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/notification-preferences-inactive.png b/org.eclipse.mylyn.commons.ui/icons/eview16/notification-preferences-inactive.png
deleted file mode 100644
index 1c23d0e..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/notification-preferences-inactive.png
+++ /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 de83ff6..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/file-plain.png b/org.eclipse.mylyn.commons.ui/icons/obj16/file-plain.png
deleted file mode 100644
index 735dd02..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/file-plain.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/file-small.png b/org.eclipse.mylyn.commons.ui/icons/obj16/file-small.png
deleted file mode 100644
index 4afe63d..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/file-small.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/message_info.gif b/org.eclipse.mylyn.commons.ui/icons/obj16/message_info.gif
deleted file mode 100644
index b484d9b..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/message_info.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/notes-small.png b/org.eclipse.mylyn.commons.ui/icons/obj16/notes-small.png
deleted file mode 100644
index f2ae4e5..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/notes-small.png
+++ /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/obj32/priority-critical.png b/org.eclipse.mylyn.commons.ui/icons/obj32/priority-critical.png
deleted file mode 100644
index 37362de..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj32/priority-critical.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj32/priority-high.png b/org.eclipse.mylyn.commons.ui/icons/obj32/priority-high.png
deleted file mode 100644
index cd3889f..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj32/priority-high.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj32/priority-low.png b/org.eclipse.mylyn.commons.ui/icons/obj32/priority-low.png
deleted file mode 100644
index 876e813..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj32/priority-low.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj32/priority-none.png b/org.eclipse.mylyn.commons.ui/icons/obj32/priority-none.png
deleted file mode 100644
index ea9d9a1..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj32/priority-none.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj32/priority-normal.png b/org.eclipse.mylyn.commons.ui/icons/obj32/priority-normal.png
deleted file mode 100644
index 38716d2..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj32/priority-normal.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj32/priority-very-low.png b/org.eclipse.mylyn.commons.ui/icons/obj32/priority-very-low.png
deleted file mode 100644
index 613a422..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj32/priority-very-low.png
+++ /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-discovery.png b/org.eclipse.mylyn.commons.ui/icons/wizban/banner-discovery.png
deleted file mode 100644
index cc4b2cf..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/wizban/banner-discovery.png
+++ /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 e2c89da..0000000
--- a/org.eclipse.mylyn.commons.ui/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-#Properties file for org.eclipse.mylyn.commons.ui
-Bundle-Vendor = Eclipse Mylyn
-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 a707728..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ColorSelectionWindow.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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
- */
-// FIXME 3.5 remove this class
-@Deprecated
-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/ControlListItem.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ControlListItem.java
deleted file mode 100644
index 4f21d32..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ControlListItem.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 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.ui;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseTrackAdapter;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Based on {@link org.eclipse.ui.internal.progress.ProgressInfoItem}.
- * 
- * @author Steffen Pingel
- */
-public abstract class ControlListItem extends Composite {
-
-	static String DARK_COLOR_KEY = "org.eclipse.mylyn.commons.ui.ControlListItem.DARK_COLOR"; //$NON-NLS-1$
-
-	interface IndexListener {
-
-		/**
-		 * Select the item previous to the receiver.
-		 */
-		public void selectPrevious();
-
-		/**
-		 * Select the next previous to the receiver.
-		 */
-		public void selectNext();
-
-		/**
-		 * Select the receiver.
-		 */
-		public void select();
-
-		public void open();
-
-	}
-
-	IndexListener indexListener;
-
-	private int currentIndex;
-
-	private boolean selected;
-
-	private final MouseAdapter mouseListener;
-
-	private boolean isShowing = true;
-
-	private final MouseTrackAdapter mouseTrackListener;
-
-	private boolean hot;
-
-	static {
-		// Mac has different Gamma value
-		int shift = "carbon".equals(SWT.getPlatform()) ? -25 : -10;//$NON-NLS-1$ 
-
-		Color lightColor = PlatformUI.getWorkbench().getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-
-		// Determine a dark color by shifting the list color
-		RGB darkRGB = new RGB(Math.max(0, lightColor.getRed() + shift), Math.max(0, lightColor.getGreen() + shift),
-				Math.max(0, lightColor.getBlue() + shift));
-		JFaceResources.getColorRegistry().put(DARK_COLOR_KEY, darkRGB);
-	}
-
-	/**
-	 * Create a new instance of the receiver with the specified parent, style and info object/
-	 * 
-	 * @param parent
-	 * @param style
-	 * @param progressInfo
-	 */
-	public ControlListItem(Composite parent, int style, Object element) {
-		super(parent, style | SWT.NO_FOCUS);
-		setData(element);
-		setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false));
-		mouseListener = doCreateMouseListener();
-		mouseTrackListener = doCreateMouseTrackListener();
-		createContent();
-		registerChild(this);
-		Control[] children = getChildren();
-		for (Control child : children) {
-			registerChild(child);
-		}
-		setHot(false);
-		refresh();
-	}
-
-	private MouseTrackAdapter doCreateMouseTrackListener() {
-		return new MouseTrackAdapter() {
-			private int enterCount;
-
-			@Override
-			public void mouseEnter(MouseEvent e) {
-				enterCount++;
-				updateHotState();
-			}
-
-			@Override
-			public void mouseExit(MouseEvent e) {
-				enterCount--;
-				getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						if (!isDisposed()) {
-							updateHotState();
-						}
-					}
-				});
-			}
-
-			private void updateHotState() {
-				if (enterCount == 0) {
-					if (isHot()) {
-						setHot(false);
-					}
-				} else {
-					if (!isHot()) {
-						setHot(true);
-					}
-				}
-			}
-		};
-	}
-
-	private MouseAdapter doCreateMouseListener() {
-		return new MouseAdapter() {
-			@Override
-			public void mouseDown(MouseEvent e) {
-				if (indexListener != null) {
-					if (e.count == 2) {
-						indexListener.open();
-					} else {
-						indexListener.select();
-					}
-				}
-			}
-		};
-	}
-
-	/**
-	 * Create the child widgets of the receiver.
-	 */
-	protected abstract void createContent();
-
-	public boolean isHot() {
-		return hot;
-	}
-
-	public void setHot(boolean hot) {
-		this.hot = hot;
-	}
-
-	protected void registerChild(Control child) {
-		child.addMouseListener(mouseListener);
-		child.addMouseTrackListener(mouseTrackListener);
-
-	}
-
-	/**
-	 * Refresh the contents of the receiver.
-	 */
-	protected abstract void refresh();
-
-	/**
-	 * Set the color base on the index
-	 * 
-	 * @param index
-	 */
-	public void updateColors(int index) {
-		currentIndex = index;
-
-		if (selected) {
-			setBackground(getDisplay().getSystemColor(SWT.COLOR_LIST_SELECTION));
-			setForeground(getDisplay().getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT));
-		} else {
-			if (index % 2 == 0) {
-				setBackground(JFaceResources.getColorRegistry().get(DARK_COLOR_KEY));
-			} else {
-				setBackground(getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-			}
-			setForeground(getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND));
-		}
-	}
-
-	@Override
-	public void setForeground(Color color) {
-		super.setForeground(color);
-		Control[] children = getChildren();
-		for (Control child : children) {
-			child.setForeground(color);
-		}
-	}
-
-	@Override
-	public void setBackground(Color color) {
-		super.setBackground(color);
-		Control[] children = getChildren();
-		for (Control child : children) {
-			child.setBackground(color);
-		}
-	}
-
-	/**
-	 * Set the selection colors.
-	 * 
-	 * @param select
-	 *            boolean that indicates whether or not to show selection.
-	 */
-	public void setSelected(boolean select) {
-		selected = select;
-		updateColors(currentIndex);
-	}
-
-	/**
-	 * Set the listener for index changes.
-	 * 
-	 * @param indexListener
-	 */
-	void setIndexListener(IndexListener indexListener) {
-		this.indexListener = indexListener;
-	}
-
-	/**
-	 * Return whether or not the receiver is selected.
-	 * 
-	 * @return boolean
-	 */
-	public boolean isSelected() {
-		return selected;
-	}
-
-	/**
-	 * Set whether or not the receiver is being displayed based on the top and bottom of the currently visible area.
-	 * 
-	 * @param top
-	 * @param bottom
-	 */
-	void setDisplayed(int top, int bottom) {
-		int itemTop = getLocation().y;
-		int itemBottom = itemTop + getBounds().height;
-		setDisplayed(itemTop <= bottom && itemBottom > top);
-
-	}
-
-	/**
-	 * Set whether or not the receiver is being displayed
-	 * 
-	 * @param displayed
-	 */
-	private void setDisplayed(boolean displayed) {
-		// See if this element has been turned off
-		boolean refresh = !isShowing && displayed;
-		isShowing = displayed;
-		if (refresh) {
-			refresh();
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ControlListViewer.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ControlListViewer.java
deleted file mode 100644
index ac7f697..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ControlListViewer.java
+++ /dev/null
@@ -1,501 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 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.ui;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.OpenEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Widget;
-
-/**
- * Based on {@link org.eclipse.ui.internal.progress.DetailedProgressViewer}.
- * 
- * @author Steffen Pingel
- */
-@SuppressWarnings("restriction")
-public abstract class ControlListViewer extends StructuredViewer {
-
-	Composite control;
-
-	private final ScrolledComposite scrolled;
-
-	private final Composite noEntryArea;
-
-	protected boolean hasFocus;
-
-	/**
-	 * Create a new instance of the receiver with a control that is a child of parent with style style.
-	 * 
-	 * @param parent
-	 * @param style
-	 */
-	public ControlListViewer(Composite parent, int style) {
-		scrolled = new ScrolledComposite(parent, style);
-		int height = JFaceResources.getDefaultFont().getFontData()[0].getHeight();
-		scrolled.getVerticalBar().setIncrement(height * 2);
-		scrolled.setExpandHorizontal(true);
-		scrolled.setExpandVertical(true);
-
-		control = new Composite(scrolled, SWT.NONE) {
-			@Override
-			public boolean setFocus() {
-				forceFocus();
-				return true;
-			}
-
-			@Override
-			public void setVisible(boolean visible) {
-				super.setVisible(visible);
-				if (visible) {
-					updateSize(control);
-				}
-			}
-		};
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 1;
-		control.setLayout(layout);
-		control.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-
-		control.addControlListener(new ControlListener() {
-			public void controlMoved(ControlEvent e) {
-				updateVisibleItems();
-
-			}
-
-			public void controlResized(ControlEvent e) {
-				updateVisibleItems();
-			}
-		});
-
-		scrolled.setContent(control);
-		hookControl(control);
-
-		noEntryArea = new Composite(scrolled, SWT.NONE);
-		doCreateNoEntryArea(noEntryArea);
-
-		scrolled.setExpandHorizontal(true);
-		scrolled.setExpandVertical(true);
-		scrolled.addControlListener(new ControlAdapter() {
-			@Override
-			public void controlResized(ControlEvent e) {
-				updateSize(scrolled.getContent());
-			}
-		});
-		control.addTraverseListener(new TraverseListener() {
-			private boolean handleEvent = true;
-
-			public void keyTraversed(TraverseEvent event) {
-				if (!handleEvent) {
-					return;
-				}
-				switch (event.detail) {
-				case SWT.TRAVERSE_ARROW_PREVIOUS: {
-					Control[] children = control.getChildren();
-					if (children.length > 0) {
-						boolean selected = false;
-						for (int i = 0; i < children.length; i++) {
-							ControlListItem item = (ControlListItem) children[i];
-							if (item.isSelected()) {
-								selected = true;
-								if (i > 0) {
-									setSelection(new StructuredSelection(children[i - 1].getData()), true);
-								}
-								break;
-							}
-						}
-						if (!selected) {
-							setSelection(new StructuredSelection(children[children.length - 1].getData()), true);
-						}
-					}
-					break;
-				}
-				case SWT.TRAVERSE_ARROW_NEXT: {
-					Control[] children = control.getChildren();
-					if (children.length > 0) {
-						boolean selected = false;
-						for (int i = 0; i < children.length; i++) {
-							ControlListItem item = (ControlListItem) children[i];
-							if (item.isSelected()) {
-								selected = true;
-								if (i < children.length - 1) {
-									setSelection(new StructuredSelection(children[i + 1].getData()), true);
-								}
-								break;
-							}
-						}
-						if (!selected) {
-							setSelection(new StructuredSelection(children[0].getData()), true);
-						}
-					}
-					break;
-				}
-				default:
-					handleEvent = false;
-					event.doit = true;
-					Control control = ControlListViewer.this.control;
-					Shell shell = control.getShell();
-					while (control != null) {
-						if (control.traverse(event.detail)) {
-							break;
-						}
-						if (!event.doit || control == shell) {
-							break;
-						}
-						control = control.getParent();
-					}
-					handleEvent = true;
-					break;
-				}
-			}
-		});
-	}
-
-	protected void doCreateNoEntryArea(Composite parent) {
-	}
-
-	public void add(Object[] elements) {
-		ViewerComparator sorter = getComparator();
-
-		// Use a Set in case we are getting something added that exists
-		Set<Object> newItems = new HashSet<Object>(elements.length);
-
-		Control[] existingChildren = control.getChildren();
-		for (Control element : existingChildren) {
-			if (element.getData() != null) {
-				newItems.add(element.getData());
-			}
-		}
-
-		for (Object element : elements) {
-			if (element != null) {
-				newItems.add(element);
-			}
-		}
-
-		Object[] infos = new Object[newItems.size()];
-		newItems.toArray(infos);
-
-		if (sorter != null) {
-			sorter.sort(this, infos);
-		}
-
-		// Update with the new elements to prevent flash
-		for (Control element : existingChildren) {
-			((ControlListItem) element).dispose();
-		}
-
-		for (int i = 0; i < infos.length; i++) {
-			ControlListItem item = createNewItem(infos[i]);
-			item.updateColors(i);
-		}
-
-		control.layout(true);
-		doUpdateContent();
-	}
-
-	private void updateSize(Control control) {
-		if (control == null) {
-			return;
-		}
-		// XXX need a small offset in case the list has a scroll bar
-		Point size = control.computeSize(scrolled.getClientArea().width - 20, SWT.DEFAULT, true);
-		control.setSize(size);
-		scrolled.setMinSize(size);
-	}
-
-	protected void doUpdateContent() {
-		if (control.getChildren().length > 0) {
-			updateSize(control);
-			scrolled.setContent(control);
-		} else {
-			updateSize(noEntryArea);
-			scrolled.setContent(noEntryArea);
-		}
-	}
-
-	/**
-	 * Create a new item for info.
-	 * 
-	 * @param element
-	 * @return ControlListItem
-	 */
-	private ControlListItem createNewItem(Object element) {
-		final ControlListItem item = doCreateItem(control, element);
-//		item.getChildren()[0].addPaintListener(new PaintListener() {
-//			public void paintControl(PaintEvent e) {
-//				if (hasFocus && item.isSelected()) {
-//					Point size = item.getSize();
-//					e.gc.setForeground(e.gc.getDevice().getSystemColor(SWT.COLOR_DARK_GRAY));
-//					e.gc.setLineDash(new int[] { 1, 2 });
-//					e.gc.drawRoundRectangle(0, 0, size.x - 1, size.y - 1, 5, 5);
-//				}
-//			}
-//		});
-		item.setIndexListener(new ControlListItem.IndexListener() {
-			public void selectNext() {
-				Control[] children = control.getChildren();
-				for (int i = 0; i < children.length; i++) {
-					if (item == children[i]) {
-						if (i < children.length - 1) {
-							setSelection(new StructuredSelection(children[i + 1].getData()));
-						}
-						break;
-					}
-				}
-			}
-
-			public void selectPrevious() {
-				Control[] children = control.getChildren();
-				for (int i = 0; i < children.length; i++) {
-					if (item == children[i]) {
-						if (i > 0) {
-							setSelection(new StructuredSelection(children[i - 1].getData()));
-						}
-						break;
-					}
-				}
-			}
-
-			public void select() {
-				setSelection(new StructuredSelection(item.getData()));
-				setFocus();
-			}
-
-			public void open() {
-				handleOpen();
-			}
-		});
-
-		// Refresh to populate with the current tasks
-		item.refresh();
-		return item;
-	}
-
-	protected abstract ControlListItem doCreateItem(Composite parent, Object element);
-
-	@Override
-	protected ControlListItem doFindInputItem(Object element) {
-		return null;
-	}
-
-	@Override
-	protected ControlListItem doFindItem(Object element) {
-		Control[] children = control.getChildren();
-		for (Control child : children) {
-			if (child.isDisposed() || child.getData() == null) {
-				continue;
-			}
-			if (child.getData().equals(element)) {
-				return (ControlListItem) child;
-			}
-		}
-		return null;
-	}
-
-	@Override
-	protected void doUpdateItem(Widget item, Object element, boolean fullMap) {
-		if (usingElementMap()) {
-			unmapElement(item);
-		}
-		item.dispose();
-		add(new Object[] { element });
-	}
-
-	@Override
-	public ScrolledComposite getControl() {
-		return scrolled;
-	}
-
-	@Override
-	protected List<?> getSelectionFromWidget() {
-		Control[] children = control.getChildren();
-		ArrayList<Object> selection = new ArrayList<Object>(children.length);
-		for (Control child : children) {
-			ControlListItem item = (ControlListItem) child;
-			if (item.isSelected() && item.getData() != null) {
-				selection.add(item.getData());
-			}
-		}
-		return selection;
-	}
-
-	protected void handleOpen() {
-		Control control = getControl();
-		if (control != null && !control.isDisposed()) {
-			ISelection selection = getSelection();
-			fireOpen(new OpenEvent(this, selection));
-		}
-	}
-
-	@Override
-	protected void inputChanged(Object input, Object oldInput) {
-		super.inputChanged(input, oldInput);
-		refreshAll();
-		doUpdateContent();
-	}
-
-	@Override
-	protected void internalRefresh(Object element) {
-		if (element == null) {
-			return;
-		}
-
-		if (element.equals(getRoot())) {
-			refreshAll();
-			return;
-		}
-		Widget widget = findItem(element);
-		if (widget == null) {
-			add(new Object[] { element });
-			return;
-		}
-		((ControlListItem) widget).refresh();
-
-		updateSize(control);
-	}
-
-	public void remove(Object[] elements) {
-		for (Object element : elements) {
-			Widget item = doFindItem(element);
-			if (item != null) {
-				unmapElement(element);
-				item.dispose();
-			}
-		}
-
-		Control[] existingChildren = control.getChildren();
-		for (int i = 0; i < existingChildren.length; i++) {
-			ControlListItem item = (ControlListItem) existingChildren[i];
-			item.updateColors(i);
-		}
-		control.layout(true);
-		doUpdateContent();
-	}
-
-	@Override
-	public void reveal(Object element) {
-		Control control = doFindItem(element);
-		if (control != null) {
-			revealControl(control);
-		}
-	}
-
-	private void revealControl(Control control) {
-		Rectangle clientArea = scrolled.getClientArea();
-		Point origin = scrolled.getOrigin();
-		Point location = control.getLocation();
-		Point size = control.getSize();
-		if (location.y + size.y > origin.y + clientArea.height) {
-			scrolled.setOrigin(origin.x, location.y + size.y - clientArea.height);
-		}
-		if (location.y < origin.y) {
-			scrolled.setOrigin(origin.x, location.y);
-		}
-	}
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	protected void setSelectionToWidget(List list, boolean reveal) {
-		HashSet<Object> elements = new HashSet<Object>(list);
-		Control[] children = control.getChildren();
-		for (Control control : children) {
-			ControlListItem child = (ControlListItem) control;
-			boolean selected = elements.contains(child.getData());
-			if (selected != child.isSelected()) {
-				child.setSelected(selected);
-			}
-			if (reveal && selected) {
-				revealControl(child);
-				reveal = false;
-			}
-		}
-	}
-
-	/**
-	 * Set focus on the current selection.
-	 */
-	public void setFocus() {
-		Control[] children = control.getChildren();
-		if (children.length > 0) {
-			// causes the item's tool bar to get focus when clicked which is undesirable 
-//			for (Control element : children) {
-//				ControlListItem item = (ControlListItem) element;
-//				if (item.isSelected()) {
-//					if (item.setFocus()) {
-//						return;
-//					}
-//				}
-//			}
-			control.forceFocus();
-		} else {
-			noEntryArea.setFocus();
-		}
-	}
-
-	/**
-	 * Refresh everything as the root is being refreshed.
-	 */
-	private void refreshAll() {
-		Object[] infos = getSortedChildren(getRoot());
-		Control[] existingChildren = control.getChildren();
-
-		for (Control element : existingChildren) {
-			element.dispose();
-		}
-
-		for (int i = 0; i < infos.length; i++) {
-			ControlListItem item = createNewItem(infos[i]);
-			item.updateColors(i);
-		}
-
-		control.layout(true);
-		doUpdateContent();
-	}
-
-	/**
-	 * Set the virtual items to be visible or not depending on the displayed area.
-	 */
-	private void updateVisibleItems() {
-		Control[] children = control.getChildren();
-		int top = scrolled.getOrigin().y;
-		int bottom = top + scrolled.getParent().getBounds().height;
-		for (Control element : children) {
-			ControlListItem item = (ControlListItem) element;
-			item.setDisplayed(top, bottom);
-		}
-	}
-
-}
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 2780a3c..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/Messages.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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_Find;
-
-	public static String AbstractNotificationPopup_Close_Notification_Job;
-
-	public static String AbstractNotificationPopup_Notification;
-
-	public static String DatePicker_Choose_Date;
-
-	public static String DatePicker_Clear;
-
-	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_Clear_all_annotations_made_on_screenshot_image;
-
-	public static String ScreenshotCreationPage_Clear;
-
-	public static String ScreenshotCreationPage_Undo;
-
-	public static String ScreenshotCreationPage_Undo_annotation;
-
-	public static String ScreenshotCreationPage_Redo;
-
-	public static String ScreenshotCreationPage_Redo_annotation;
-
-	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;
-
-	public static String ScreenshotCreationPage_Show_Line_Type_Selector;
-
-	public static String ScreenshotCreationPage_Show_Line_Bold_Selector;
-
-	public static String SelectToolAction_Font_Bold;
-
-	public static String SelectToolAction_Font_Italic;
-
-	public static String SelectToolAction_Font_Name_Size;
-
-	public static String SelectToolAction_1dot;
-
-	public static String SelectToolAction_2dots;
-
-	public static String SelectToolAction_4dots;
-
-	public static String SelectToolAction_8dots;
-
-	public static String SelectToolAction_Clipboard;
-
-	public static String SelectToolAction_Desktop;
-
-	public static String SelectToolAction_File;
-
-	public static String SelectToolAction_Rectangle;
-
-	public static String SelectToolAction_Round_Rectangle;
-
-	public static String SelectToolAction_Oval;
-
-	public static String SelectToolAction_Fill_Rectangle;
-
-	public static String SelectToolAction_Fill_Round_Rectangle;
-
-	public static String SelectToolAction_Fill_Oval;
-
-	public static String SelectToolAction_Free;
-
-	public static String SelectToolAction_Line;
-
-	public static String SelectToolAction_Single_Side_Arrow;
-
-	public static String SelectToolAction_Both_Side_Arrow;
-
-	public static String SelectToolAction_Dashed_Line;
-
-	public static String SelectToolAction_Dashed_Line_1_dot;
-
-	public static String SelectToolAction_Dashed_Line_2_dots;
-
-	public static String SelectToolAction_Dotted_Line;
-
-	public static String SelectToolAction_Solid_Line;
-
-	public static String SelectToolAction_Fit;
-
-	public static String SelectToolAction_ZoomHalf;
-
-	public static String SelectToolAction_Zoom1X;
-
-	public static String SelectToolAction_Zoom2X;
-
-	public static String SelectToolAction_Zoom4X;
-
-	public static String SelectToolAction_Zoom8X;
-
-	public static String SelectToolAction_Selected_Rectangle;
-
-	public static String SelectToolAction_Font_;
-
-	public static String SelectToolAction_Color_;
-}
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 ef62382..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, 2009 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/ScreenshotImages.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ScreenshotImages.java
deleted file mode 100644
index 73da94f..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ScreenshotImages.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Hiroyuki Inaba 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:
- *     Hiroyuki Inaba - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * @author Hiroyuki Inaba
- */
-public class ScreenshotImages {
-
-	private static final URL baseURL = CommonsUiPlugin.getDefault().getBundle().getEntry("/icons/"); //$NON-NLS-1$
-
-	private static final String T_TOOL = "etool16"; //$NON-NLS-1$
-
-	private static final String T_DRAW = "draw16"; //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_FREE = create(T_DRAW, "edit_free.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_LINE = create(T_DRAW, "edit_line.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_BOX = create(T_DRAW, "edit_box.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_RBOX = create(T_DRAW, "edit_rbox.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_OVAL = create(T_DRAW, "edit_oval.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_FILL_BOX = create(T_DRAW, "edit_fill_box.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_FILL_RBOX = create(T_DRAW, "edit_fill_rbox.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_FILL_OVAL = create(T_DRAW, "edit_fill_oval.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_ARROW1 = create(T_DRAW, "edit_arrow1.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_ARROW2 = create(T_DRAW, "edit_arrow2.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_UNDO = create(T_TOOL, "undo_edit.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT_REDO = create(T_TOOL, "redo_edit.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FILE_OBJ = create(T_TOOL, "file_obj.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor CLIPBOARD_OBJ = create(T_TOOL, "clipboard_obj.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor MONITOR_OBJ = create(T_TOOL, "monitor_obj.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor LINE_SOLD = create(T_DRAW, "line_sold.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor LINE_DOT = create(T_DRAW, "line_dot.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor LINE_DASH = create(T_DRAW, "line_dash.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor LINE_DASH1D = create(T_DRAW, "line_dash1d.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor LINE_DASH2D = create(T_DRAW, "line_dash2d.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor LINE_BOLD1 = create(T_DRAW, "line_bold1.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor LINE_BOLD2 = create(T_DRAW, "line_bold2.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor LINE_BOLD4 = create(T_DRAW, "line_bold4.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor LINE_BOLD8 = create(T_DRAW, "line_bold8.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor SEL_RECT = create(T_TOOL, "select_rect.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();
-		}
-	}
-
-	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());
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/SelectToolAction.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/SelectToolAction.java
deleted file mode 100644
index f28f479..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/SelectToolAction.java
+++ /dev/null
@@ -1,906 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Hiroyuki Inaba 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:
- *     Hiroyuki Inaba - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.internal.commons.ui;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.FontDialog;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Widget;
-
-/**
- * @author Hiroyuki Inaba
- */
-public class SelectToolAction extends Action implements IMenuCreator {
-
-	public static final int CAPTURE_DROP_DOWN_MENU = 1;
-
-	public static final int ZOOM_DROP_DOWN_MENU = 2;
-
-	public static final int DRAWLINE_TOOLBAR = 3;
-
-	public static final int DRAWARROW_TOOLBAR = 4;
-
-	public static final int DRAWBOX_TOOLBAR = 5;
-
-	public static final int DRAWTEXT_TOOLBAR = 6;
-
-	public static final int LINETYPE_TOOLBAR = 7;
-
-	public static final int LINEBOLD_TOOLBAR = 8;
-
-	public static final int COLOR_TOOLBAR = 9;
-
-	public SelectToolAction(Composite parent, int tool) {
-		this(parent, "", tool); //$NON-NLS-1$
-	}
-
-	public SelectToolAction(String label, int tool) {
-		this(null, label, tool);
-	}
-
-	public SelectToolAction(Composite parent, String label, int tool) {
-		super(label, AS_DROP_DOWN_MENU);
-		setMenuCreator(this);
-		showMenuAlways = true;
-		this.parent = parent;
-		setToolAction(tool);
-	}
-
-	private void setToolAction(int tool) {
-		if (tool == CAPTURE_DROP_DOWN_MENU) {
-			selectedItemID = CAPTURE_DESKTOP;
-			initMenu(
-					tool,
-					new ToolActionItem[] {
-							new ToolActionItem(CAPTURE_DESKTOP, Messages.SelectToolAction_Desktop,
-									ScreenshotImages.MONITOR_OBJ), //
-							new ToolActionItem(CAPTURE_CLIPBOARD, Messages.SelectToolAction_Clipboard,
-									ScreenshotImages.CLIPBOARD_OBJ), //
-							new ToolActionItem(CAPTURE_FILE, Messages.SelectToolAction_File, ScreenshotImages.FILE_OBJ),
-							new ToolActionItem(CAPTURE_RECTANGLE, Messages.SelectToolAction_Selected_Rectangle,
-									ScreenshotImages.SEL_RECT) });
-			return;
-		}
-
-		if (tool == ZOOM_DROP_DOWN_MENU) {
-			selectedItemID = ZOOM_FIT;
-			initMenu(tool, new ToolActionItem[] { new ToolActionItem(ZOOM_FIT, Messages.SelectToolAction_Fit, null),
-					new ToolActionItem(50, Messages.SelectToolAction_ZoomHalf, null),
-					new ToolActionItem(100, Messages.SelectToolAction_Zoom1X, null),
-					new ToolActionItem(200, Messages.SelectToolAction_Zoom2X, null),
-					new ToolActionItem(400, Messages.SelectToolAction_Zoom4X, null),
-					new ToolActionItem(800, Messages.SelectToolAction_Zoom8X, null) });
-			return;
-		}
-
-		if (tool == LINETYPE_TOOLBAR) {
-			selectedItemID = SWT.LINE_SOLID;
-			initBar(tool,
-					new ToolActionItem[] {
-							new ToolActionItem(SWT.LINE_SOLID, Messages.SelectToolAction_Solid_Line,
-									ScreenshotImages.LINE_SOLD),
-							new ToolActionItem(SWT.LINE_DOT, Messages.SelectToolAction_Dotted_Line,
-									ScreenshotImages.LINE_DOT),
-							new ToolActionItem(SWT.LINE_DASH, Messages.SelectToolAction_Dashed_Line,
-									ScreenshotImages.LINE_DASH),
-							new ToolActionItem(SWT.LINE_DASHDOT, Messages.SelectToolAction_Dashed_Line_1_dot,
-									ScreenshotImages.LINE_DASH1D),
-							new ToolActionItem(SWT.LINE_DASHDOTDOT, Messages.SelectToolAction_Dashed_Line_2_dots,
-									ScreenshotImages.LINE_DASH2D) });
-			return;
-		}
-
-		if (tool == DRAWLINE_TOOLBAR) {
-			showSelection = true;
-			selectedItemID = DRAW_FREE;
-			initBar(tool, new ToolActionItem[] {
-					new ToolActionItem(DRAW_FREE, Messages.SelectToolAction_Free, ScreenshotImages.EDIT_FREE),
-					new ToolActionItem(DRAW_LINE, Messages.SelectToolAction_Line, ScreenshotImages.EDIT_LINE) });
-			return;
-		}
-		if (tool == DRAWARROW_TOOLBAR) {
-			showSelection = true;
-			selectedItemID = DRAW_ARROW1;
-			initBar(tool, new ToolActionItem[] {
-					new ToolActionItem(DRAW_ARROW1, Messages.SelectToolAction_Single_Side_Arrow,
-							ScreenshotImages.EDIT_ARROW1),
-					new ToolActionItem(DRAW_ARROW2, Messages.SelectToolAction_Both_Side_Arrow,
-							ScreenshotImages.EDIT_ARROW2) });
-			selectedItemID = -1;
-			return;
-		}
-		if (tool == DRAWBOX_TOOLBAR) {
-			showSelection = true;
-			selectedItemID = DRAW_RBOX;
-			initBar(
-					tool,
-					new ToolActionItem[] {
-							new ToolActionItem(DRAW_BOX, Messages.SelectToolAction_Rectangle, ScreenshotImages.EDIT_BOX),
-							new ToolActionItem(DRAW_RBOX, Messages.SelectToolAction_Round_Rectangle,
-									ScreenshotImages.EDIT_RBOX),
-							new ToolActionItem(DRAW_OVAL, Messages.SelectToolAction_Oval, ScreenshotImages.EDIT_OVAL),
-							new ToolActionItem(DRAW_FILL_BOX, Messages.SelectToolAction_Fill_Rectangle,
-									ScreenshotImages.EDIT_FILL_BOX),
-							new ToolActionItem(DRAW_FILL_RBOX, Messages.SelectToolAction_Fill_Round_Rectangle,
-									ScreenshotImages.EDIT_FILL_RBOX),
-							new ToolActionItem(DRAW_FILL_OVAL, Messages.SelectToolAction_Fill_Oval,
-									ScreenshotImages.EDIT_FILL_OVAL) });
-			selectedItemID = -1;
-			return;
-		}
-		if (tool == DRAWTEXT_TOOLBAR) {
-			showSelection = true;
-			selectedItemID = DRAW_TEXT;
-			// Bug:266123 Set initial font as HEADER_FONT
-			FontData fontData = JFaceResources.getFont(JFaceResources.HEADER_FONT).getFontData()[0];
-			stringCustom = fontData.toString();
-			intgerCustom = rgb2int(255, 0, 0);
-			selectedItemID = intgerCustom;
-			initFont(tool);
-			selectedItemID = -1;
-			return;
-		}
-
-		if (tool == LINEBOLD_TOOLBAR) {
-			selectedItemID = 4;
-			initBar(tool, new ToolActionItem[] {
-					new ToolActionItem(1, Messages.SelectToolAction_1dot, ScreenshotImages.LINE_BOLD1),
-					new ToolActionItem(2, Messages.SelectToolAction_2dots, ScreenshotImages.LINE_BOLD2),
-					new ToolActionItem(4, Messages.SelectToolAction_4dots, ScreenshotImages.LINE_BOLD4),
-					new ToolActionItem(8, Messages.SelectToolAction_8dots, ScreenshotImages.LINE_BOLD8) });
-			return;
-		}
-
-		if (tool == COLOR_TOOLBAR) {
-			intgerCustom = rgb2int(255, 85, 85);
-			selectedItemID = intgerCustom;
-			initColor(tool);
-			return;
-		}
-	}
-
-	private void initBar(int tool, ToolActionItem[] items) {
-		this.items = items;
-		setId(tool + ""); //$NON-NLS-1$
-		toolButton = new ToolComposite(parent, SWT.CASCADE) {
-
-			@Override
-			public void clickBody() {
-				selectAndRun(getToolTipText(), null);
-			}
-
-			@Override
-			public void clickMenu(int x, int y) {
-				dropDownMenu = new Menu(parent.getShell(), SWT.POP_UP);
-				addActionsToMenu();
-				Point p = parent.toDisplay(x, y);
-				dropDownMenu.setLocation(p.x, p.y);
-				dropDownMenu.setVisible(true);
-				dropDownMenu = null;
-			}
-
-			@Override
-			public boolean isSelect() {
-				return (selectedItemID >= 0);
-			}
-		};
-
-		if (items != null) {
-			for (ToolActionItem actionItem : items) {
-				if (actionItem.id == selectedItemID) {
-					toolButton.setImage(actionItem.image.createImage());
-					toolButton.setToolTipText(actionItem.label);
-				}
-			}
-		}
-	}
-
-	private void initFont(int tool) {
-		this.items = null;
-		setId(tool + ""); //$NON-NLS-1$
-		toolButton = new ToolComposite(parent, SWT.CASCADE) {
-
-			@Override
-			public void clickBody() {
-				selectedItemID = DRAW_TEXT;
-				if (toolButton != null) {
-					FontData fontData = new FontData(stringCustom);
-					toolButton.setImage(createFontImage(fontData, int2rgb(intgerCustom), true));
-					toolButton.redraw();
-				}
-				run();
-			}
-
-			@Override
-			public void clickMenu(int x, int y) {
-				if (Platform.getWS().equalsIgnoreCase(Platform.WS_WIN32)
-						|| Platform.getWS().equalsIgnoreCase(Platform.WS_WPF)) {
-					invokeFontDialog();
-				} else {
-					Menu rightClickMenu = new Menu(parent.getShell(), SWT.POP_UP);
-					MenuItem menuItem = new MenuItem(rightClickMenu, SWT.PUSH);
-					menuItem.setText(Messages.SelectToolAction_Font_);
-					menuItem.addListener(SWT.Selection, new Listener() {
-						public void handleEvent(final Event event) {
-							invokeFontDialog();
-						}
-					});
-					menuItem = new MenuItem(rightClickMenu, SWT.PUSH);
-					menuItem.setText(Messages.SelectToolAction_Color_);
-					menuItem.addListener(SWT.Selection, new Listener() {
-						public void handleEvent(final Event event) {
-							invokeColorDialog();
-						}
-					});
-					Point p = parent.toDisplay(x, y);
-					rightClickMenu.setLocation(p.x, p.y);
-					rightClickMenu.setVisible(true);
-				}
-			}
-
-			@Override
-			public boolean isSelect() {
-				return (selectedItemID >= 0);
-			}
-
-			public void invokeFontDialog() {
-				FontData fontData = new FontData(stringCustom);
-				FontDialog fontWindow = new FontDialog(parent.getShell());
-				fontWindow.setFontList(new FontData[] { fontData });
-				fontWindow.setRGB(int2rgb(intgerCustom));
-				fontData = fontWindow.open();
-				if (fontData != null) {
-					intgerCustom = rgb2int(fontWindow.getRGB());
-					stringCustom = fontData.toString();
-					toolButton.setToolTipText(font2string(fontData));
-					clickBody();
-				}
-			}
-
-			public void invokeColorDialog() {
-				ColorDialog colorWindow = new ColorDialog(parent.getShell());
-				colorWindow.setRGB(int2rgb(intgerCustom));
-				RGB rgb = colorWindow.open();
-				if (rgb != null) {
-					intgerCustom = rgb2int(rgb);
-					clickBody();
-				}
-			}
-		};
-
-		FontData fontData = new FontData(stringCustom);
-		toolButton.setToolTipText(font2string(fontData));
-		toolButton.setImage(createFontImage(fontData, int2rgb(intgerCustom), false));
-	}
-
-	private void initColor(int tool) {
-		this.items = null;
-		setId(tool + ""); //$NON-NLS-1$
-		toolButton = new ToolComposite(parent, SWT.NONE) {
-
-			@Override
-			public void clickMenu(int x, int y) {
-				ColorDialog colorWindow = new ColorDialog(parent.getShell());
-				colorWindow.setRGB(int2rgb(intgerCustom));
-				RGB rgb = colorWindow.open();
-				if (rgb != null) {
-					intgerCustom = rgb2int(rgb);
-					selectedItemID = intgerCustom;
-					toolButton.setImage(createColorImage(int2rgb(intgerCustom)));
-					toolButton.redraw();
-				}
-			}
-		};
-		toolButton.setToolTipText(""); //$NON-NLS-1$
-		toolButton.setImage(createColorImage(int2rgb(intgerCustom)));
-	}
-
-	private Image createColorImage(RGB rgb) {
-		Display display = parent.getDisplay();
-		Color BACKGROUND = display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-		Color DARK_GRAY = display.getSystemColor(SWT.COLOR_DARK_GRAY);
-		int x = 16, y = 16;
-		Image image = new Image(display, x, y);
-		GC gc = new GC(image);
-		gc.setForeground(DARK_GRAY);
-		gc.setBackground(BACKGROUND);
-		gc.fillRectangle(0, 0, x, y);
-		gc.setBackground(new Color(display, rgb));
-		gc.fillRectangle(1, 2, x - 2, y - 4);
-		gc.drawRectangle(1, 2, x - 3, y - 5);
-		gc.dispose();
-		return image;
-	}
-
-	private Image createFontImage(FontData fontData, RGB rgb, boolean select) {
-		Display display = parent.getDisplay();
-		Color ButtonFace = display.getSystemColor((select) ? SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW
-				: SWT.COLOR_WIDGET_BACKGROUND);
-		int x = 16, y = 16;
-		Image image = new Image(display, x, y);
-		GC gc = new GC(image);
-		gc.setBackground(ButtonFace);
-		gc.fillRectangle(0, 0, x, y);
-		String label = "A"; //$NON-NLS-1$
-		gc.setFont(new Font(display, new FontData(fontData.getName(), 11, fontData.getStyle())));
-		gc.setForeground(new Color(display, rgb));
-		Point sz = gc.textExtent(label);
-		gc.drawText(label, (x - sz.x) / 2, (y - sz.y) / 2 + 1, true);
-		gc.dispose();
-		return image;
-	}
-
-	private void initMenu(int tool, ToolActionItem[] items) {
-		this.items = items;
-		setId(tool + ""); //$NON-NLS-1$
-		if (items != null) {
-			setImageDescriptor(items[0].image);
-			setToolTipText(items[0].label);
-			selectedItemID = items[0].id;
-		}
-	}
-
-	private class ToolActionItem {
-		int id;
-
-		String label;
-
-		ImageDescriptor image;
-
-		ToolActionItem(int id, String label, ImageDescriptor image) {
-			this.id = id;
-			this.label = label;
-			this.image = image;
-		}
-	}
-
-	private class ToolComposite extends Composite {
-		private Image image;
-
-		private final boolean bMenu;
-
-		private boolean bMouse;
-
-		private static final int S = 1; // Border for Selected rectangle
-
-		private static final int B = 2; // Border for Shadow rectangle  
-
-		private static final int G = 3; // Gap
-
-		private static final int M = 4; // Image width for Sub menu  
-
-		private final Point iconSize = new Point(S + B + 16 + B + S, S + B + 16 + B + S);
-
-		private final Point maxSize = new Point(iconSize.x + G + M + G, iconSize.y);
-
-		public ToolComposite(Composite parent, int style) {
-			super(parent, style);
-			bMenu = (style & SWT.CASCADE) != 0;
-
-			addListener(SWT.Paint, new Listener() {
-				public void handleEvent(Event e) {
-					Color background = e.gc.getBackground();
-					Color foreground = e.gc.getForeground();
-					Display display = e.widget.getDisplay();
-					Color NORMAL_SHADOW = display.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
-					boolean enabled = getEnabled();
-					if (bMouse && enabled) {
-						e.gc.setForeground(NORMAL_SHADOW);
-						if (bMenu) {
-							e.gc.drawRectangle(0, 0, maxSize.x - 1, maxSize.y - 1);
-							e.gc.drawLine(iconSize.x, 0, iconSize.x, maxSize.y);
-						} else {
-							e.gc.drawRectangle(0, 0, iconSize.x - 1, iconSize.y - 1);
-						}
-					}
-					if (showSelection && isSelect() && enabled) {
-						Color HIGHLIGHT_SHADOW = display.getSystemColor(SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW);
-						Color LIGHT_SHADOW = display.getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
-						Color SELECTION = display.getSystemColor(SWT.COLOR_LIST_SELECTION);
-						e.gc.setBackground(HIGHLIGHT_SHADOW);
-						e.gc.fillRectangle(0, 0, iconSize.x, iconSize.y);
-						e.gc.setForeground(NORMAL_SHADOW);
-						e.gc.drawLine(S, S, iconSize.x - S - 1, S);
-						e.gc.drawLine(S + 1, S + 1, iconSize.x - S - 2, S + 1);
-						e.gc.drawLine(S, S, S, iconSize.y - S - 1);
-						e.gc.drawLine(S + 1, S + 1, S + 1, iconSize.y - S - 2);
-						e.gc.setForeground(HIGHLIGHT_SHADOW);
-						e.gc.drawLine(iconSize.x - S - 1, S + 1, iconSize.x - S - 1, iconSize.y - S - 1);
-						e.gc.drawLine(S, iconSize.y - S - 1, iconSize.x - S - 1, iconSize.y - S - 1);
-						e.gc.setForeground(LIGHT_SHADOW);
-						e.gc.drawLine(iconSize.x - S - 2, S + 2, iconSize.x - S - 2, iconSize.y - S - 2);
-						e.gc.drawLine(S + 1, iconSize.x - S - 2, iconSize.x - S - 2, iconSize.y - S - 2);
-						e.gc.setForeground(SELECTION);
-						e.gc.drawRectangle(0, 0, iconSize.x - 1, iconSize.y - 1);
-					}
-
-					if (getEnabled()) {
-						e.gc.drawImage(image, S + B, S + B);
-					} else {
-						Image disabled = new Image(display, image, SWT.IMAGE_DISABLE);
-						e.gc.drawImage(disabled, S + B, S + B);
-					}
-
-					if (bMenu) {
-						if (Platform.getWS().equalsIgnoreCase(Platform.WS_WIN32)
-								|| Platform.getWS().equalsIgnoreCase(Platform.WS_WPF)) {
-							Color FOREGROUND = display.getSystemColor((getEnabled()) ? SWT.COLOR_WIDGET_FOREGROUND
-									: SWT.COLOR_WIDGET_DARK_SHADOW);
-							e.gc.setForeground(FOREGROUND);
-							int x = iconSize.x + G;
-							int y = S + B + M;
-							int h = 6;
-							while (h >= 0) {
-								e.gc.drawLine(x, y, x, y + h);
-								x++;
-								y++;
-								h -= 2;
-							}
-						} else {
-							Color FOREGROUND = display.getSystemColor((getEnabled()) ? SWT.COLOR_WIDGET_DARK_SHADOW
-									: SWT.COLOR_WIDGET_NORMAL_SHADOW);
-							e.gc.setForeground(FOREGROUND);
-							int x = iconSize.x + G;
-							int y = S + B + M;
-							int h = 4;
-							e.gc.drawLine(x, y, x + h / 2 + 1, y + h / 2 + 1);
-							e.gc.drawLine(x, y + 1, x + h / 2, y + h / 2 + 1);
-							e.gc.drawLine(x, y + h + 1, x + h / 2, y + h / 2 + 1);
-							e.gc.drawLine(x, y + h + 2, x + h / 2, y + h / 2 + 2);
-						}
-					}
-					e.gc.setBackground(background);
-					e.gc.setForeground(foreground);
-					//System.out.println(e.toString());
-				}
-			});
-
-			addMouseListener(new MouseAdapter() {
-				@Override
-				public void mouseDown(MouseEvent e) {
-					if (e.x < iconSize.x && e.y < iconSize.y) {
-						if (showSelection) {
-							clickBody();
-							return;
-						} else {
-							invokeMenu((Composite) e.widget);
-						}
-					} else {
-						invokeMenu((Composite) e.widget);
-					}
-				}
-
-				private void invokeMenu(Composite widget) {
-					Rectangle b = widget.getBounds();
-					Point p = widget.getLocation();
-					p.x += b.width + 3;
-					bMouse = false;
-					redraw();
-					clickMenu(p.x, p.y);
-				}
-			});
-
-			addListener(SWT.MouseEnter, new Listener() {
-
-				public void handleEvent(Event event) {
-					if (getEnabled()) {
-						bMouse = true;
-						redraw();
-					}
-				}
-			});
-			addListener(SWT.MouseMove, new Listener() {
-
-				public void handleEvent(Event event) {
-					if (getEnabled()) {
-						bMouse = true;
-						redraw();
-					}
-				}
-			});
-			addListener(SWT.MouseExit, new Listener() {
-
-				public void handleEvent(Event event) {
-					if (getEnabled()) {
-						bMouse = false;
-						redraw();
-					}
-				}
-			});
-		}
-
-		@Override
-		public Point computeSize(int wHint, int hHint, boolean changed) {
-			if (!getVisible()) {
-				return new Point(0, 0);
-			}
-			return maxSize;
-		}
-
-		public void setImage(Image image) {
-			this.image = image;
-		}
-
-		public void clickBody() {
-		}
-
-		public void clickMenu(int x, int y) {
-		}
-
-		public boolean isSelect() {
-			return false;
-		}
-	}
-
-	private ToolActionItem[] items;
-
-	private int selectedItemID;
-
-	private ToolComposite toolButton;
-
-	private Menu dropDownMenu;
-
-	private int intgerCustom;
-
-	private String stringCustom;
-
-	private boolean showMenuAlways;
-
-	public boolean isShowMenuAlways() {
-		return showMenuAlways;
-	}
-
-	public void setShowMenuAlways(boolean showMenuAlways) {
-		this.showMenuAlways = showMenuAlways;
-	}
-
-	@Override
-	public void runWithEvent(Event event) {
-		if (showMenuAlways) {
-			IMenuCreator mc = getMenuCreator();
-			if (mc != null) {
-				Widget item = event.widget;
-				ToolItem ti = (ToolItem) item;
-				Menu m = mc.getMenu(ti.getParent());
-				if (m != null) {
-					// position the menu below the drop down item
-					Rectangle itemBounds = ti.getBounds();
-					Point point = ti.getParent().toDisplay(itemBounds.x, itemBounds.y + itemBounds.height);
-					m.setLocation(point.x, point.y); // waiting for SWT
-					m.setVisible(true);
-					return; // we don't fire the action
-				}
-			}
-		}
-		super.runWithEvent(event);
-	}
-
-	public static final int ZOOM_FIT = 0;
-
-	public static final int DRAW_FREE = 0;
-
-	public static final int DRAW_LINE = 1;
-
-	public static final int DRAW_ARROW1 = 2;
-
-	public static final int DRAW_ARROW2 = 3;
-
-	public static final int DRAW_BOX = 10;
-
-	public static final int DRAW_RBOX = 11;
-
-	public static final int DRAW_FILL_BOX = 12;
-
-	public static final int DRAW_FILL_RBOX = 13;
-
-	public static final int DRAW_OVAL = 20;
-
-	public static final int DRAW_FILL_OVAL = 21;
-
-	public static final int DRAW_TEXT = 30;
-
-	public static final int CAPTURE_DESKTOP = 0;
-
-	public static final int CAPTURE_CLIPBOARD = 1;
-
-	public static final int CAPTURE_FILE = 2;
-
-	public static final int CAPTURE_RECTANGLE = 3;
-
-	public int getSelect() {
-		return selectedItemID;
-	}
-
-	public boolean setSelect(int select) {
-		if (items != null) {
-			for (ToolActionItem actionItem : items) {
-				if (select == actionItem.id) {
-					selectItem(actionItem.label, null);
-					return true;
-				}
-			}
-		} else {
-			if (getId().equals(DRAWTEXT_TOOLBAR + "")) { //$NON-NLS-1$
-				toolButton.clickBody();
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public void setUnselect() {
-		selectedItemID = -1;
-		if (toolButton != null) {
-			if (getId().equals(DRAWTEXT_TOOLBAR + "")) { //$NON-NLS-1$
-				FontData fontData = new FontData(stringCustom);
-				toolButton.setImage(createFontImage(fontData, int2rgb(intgerCustom), false));
-			}
-			toolButton.redraw();
-		}
-	}
-
-	public int getIntgerCustom() {
-		return intgerCustom;
-	}
-
-	public String getStringCustom() {
-		return stringCustom;
-	}
-
-	protected void selectAndRun(String label, ImageDescriptor image) {
-		if (selectItem(label, image)) {
-			if (getId().equals(CAPTURE_DROP_DOWN_MENU + "")) { //$NON-NLS-1$
-				if (selectedItemID == CAPTURE_FILE) {
-					FileDialog dialog = new FileDialog(parent.getShell());
-					dialog.setFileName(stringCustom);
-					dialog.setFilterExtensions(new String[] { "*.bmp;*.jpg;*.png", "*.*" }); //$NON-NLS-1$ //$NON-NLS-2$
-					String result = dialog.open();
-					if (result != null && result.length() > 0) {
-						stringCustom = result;
-						run();
-					}
-				} else {
-					run();
-				}
-				selectedItemID = CAPTURE_DESKTOP;
-			} else {
-				run();
-			}
-		}
-	}
-
-	protected boolean selectItem(String label, ImageDescriptor image) {
-		for (ToolActionItem actionItem : items) {
-			if (actionItem.label.equals(label)) {
-				selectedItemID = actionItem.id;
-				if (getId().equals(CAPTURE_DROP_DOWN_MENU + "")) { //$NON-NLS-1$
-					// NONE
-				} else {
-					setToolTipText(label);
-					if (image != null) {
-						setImageDescriptor(image);
-					}
-					if (toolButton != null) {
-						toolButton.setToolTipText(label);
-						if (image != null) {
-							toolButton.setImage(image.createImage());
-						}
-						toolButton.redraw();
-					}
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private void addActionsToMenu() {
-		for (ToolActionItem actionItem : items) {
-			Action action = new Action() {
-				@Override
-				public void run() {
-					selectAndRun(getText(), getImageDescriptor());
-				}
-			};
-			action.setText(actionItem.label);
-			if (actionItem.image != null) {
-				action.setImageDescriptor(actionItem.image);
-			}
-			updateAction(action, actionItem.id);
-			ActionContributionItem contributionItem = new ActionContributionItem(action);
-			contributionItem.fill(dropDownMenu, -1);
-		}
-	}
-
-	private void updateAction(Action action, int id) {
-		action.setChecked(id == selectedItemID);
-		if (getId().equals(CAPTURE_DROP_DOWN_MENU + "")) { //$NON-NLS-1$
-			if (id == CAPTURE_CLIPBOARD) {
-				action.setEnabled(existImageOnClipboard());
-			} else if (id == CAPTURE_RECTANGLE) {
-				action.setEnabled(isEnableRectangle());
-			}
-		}
-	}
-
-	protected boolean isEnableRectangle() {
-		return false;
-	}
-
-	public void dispose() {
-		if (toolButton != null) {
-			toolButton.dispose();
-			toolButton = null;
-		}
-		if (dropDownMenu != null) {
-			dropDownMenu.dispose();
-			dropDownMenu = null;
-		}
-	}
-
-	public Menu getMenu(Control parent) {
-		if (dropDownMenu != null) {
-			dropDownMenu.dispose();
-		}
-		dropDownMenu = new Menu(parent);
-		addActionsToMenu();
-		return dropDownMenu;
-	}
-
-	public Menu getMenu(Menu parent) {
-		if (dropDownMenu != null) {
-			dropDownMenu.dispose();
-		}
-		dropDownMenu = new Menu(parent);
-		addActionsToMenu();
-		return dropDownMenu;
-	}
-
-	private final Composite parent;
-
-	private boolean showSelection;
-
-	public boolean getVisible() {
-		if (toolButton != null) {
-			return toolButton.getVisible();
-		}
-		return false;
-	}
-
-	public void setVisible(boolean visible) {
-		if (toolButton != null) {
-			toolButton.setVisible(visible);
-			toolButton.redraw();
-		}
-	}
-
-	public boolean getEnabled() {
-		if (toolButton != null) {
-			return toolButton.getEnabled();
-		}
-		return false;
-	}
-
-	@Override
-	public void setEnabled(boolean enabled) {
-		super.setEnabled(enabled);
-		if (toolButton != null) {
-			toolButton.setEnabled(enabled);
-			toolButton.redraw();
-		}
-	}
-
-	public Image getFileImage() {
-		try {
-			Image image = new Image(parent.getShell().getDisplay(), stringCustom);
-			return image;
-		} catch (Exception e) {
-			// None
-		}
-		return null;
-	}
-
-	private Transfer getImageTransfer() {
-		try {
-			Class<?> clazz = Class.forName("org.eclipse.swt.dnd.ImageTransfer"); //$NON-NLS-1$
-			Method method = clazz.getMethod("getInstance"); //$NON-NLS-1$
-			if (method != null) {
-				return (Transfer) method.invoke(null);
-			}
-		} catch (Exception e) {
-			// ignore
-		} catch (LinkageError e) {
-			// ignore
-		}
-		return null;
-	}
-
-	public Image getClipboardImage() {
-		Clipboard clipboard = new Clipboard(parent.getShell().getDisplay());
-		Transfer imageTransfer = getImageTransfer();
-		if (imageTransfer != null) {
-			Object data = clipboard.getContents(imageTransfer);
-			if (data instanceof ImageData) {
-				Image image = new Image(parent.getShell().getDisplay(), (ImageData) data);
-				return image;
-			}
-		}
-		return null;
-	}
-
-	private boolean existImageOnClipboard() {
-		Clipboard clipboard = new Clipboard(parent.getShell().getDisplay());
-		Transfer imageTransfer = getImageTransfer();
-		if (imageTransfer != null) {
-			Object data = clipboard.getContents(imageTransfer);
-			if (data instanceof ImageData) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static int rgb2int(RGB rgb) {
-		return rgb2int(rgb.red, rgb.green, rgb.blue);
-	}
-
-	public static int rgb2int(int r, int g, int b) {
-		return (r << 16) + (g << 8) + b;
-	}
-
-	public static RGB int2rgb(int rgb) {
-		return new RGB(rgb >> 16, (rgb >> 8) & 0x00ff, rgb & 0x00ff);
-	}
-
-	private String font2string(FontData fontData) {
-		String info = NLS.bind(Messages.SelectToolAction_Font_Name_Size, //
-				new Object[] { fontData.getName(), fontData.getHeight() + "" }); //$NON-NLS-1$
-		int style = fontData.getStyle();
-		if ((style & SWT.BOLD) != 0) {
-			info = info + Messages.SelectToolAction_Font_Bold;
-		}
-		if ((style & SWT.ITALIC) != 0) {
-			info = info + Messages.SelectToolAction_Font_Italic;
-		}
-		return info;
-	}
-}
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 797b3e6..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/SwtUtil.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.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);
-		}
-	}
-
-	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);
-	}
-
-	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 = shell.getAlpha();
-			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) {
-						shell.setAlpha(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;
-					}
-
-					shell.setAlpha(currentAlpha);
-
-					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/TaskBarManager.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/TaskBarManager.java
deleted file mode 100644
index 133b044..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/TaskBarManager.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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 org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Shawn Minto
- */
-public class TaskBarManager {
-
-	private static final String TASK_BAR_MENU_MANAGER_KEY = "org.eclipse.mylyn.commons.TaskBarMenuManager.instance"; //$NON-NLS-1$
-
-	public static MenuManager getTaskBarMenuManager() {
-		Widget /* TaskItem */taskItem = getApplicationTaskItem();
-		if (taskItem != null) {
-			MenuManager taskBarMenuManager = getTaskBarMenuManager(taskItem);
-			return taskBarMenuManager;
-		}
-		return null;
-	}
-
-	private static Widget /* TaskItem */getApplicationTaskItem() {
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		if (workbench != null && workbench.getDisplay() != null && !workbench.isClosing()) {
-
-			try {
-				Class<?> taskBarClass = Class.forName("org.eclipse.swt.widgets.TaskBar"); //$NON-NLS-1$
-				Method getSystemTaskBarMethod = Display.class.getMethod("getSystemTaskBar"); //$NON-NLS-1$
-				Object systemTaskBar = getSystemTaskBarMethod.invoke(workbench.getDisplay());
-				if (systemTaskBar != null && systemTaskBar.getClass().equals(taskBarClass)) {
-
-					Method getItemMethod = taskBarClass.getMethod("getItem", Shell.class); //$NON-NLS-1$
-					Object taskItem = getItemMethod.invoke(systemTaskBar, new Object[] { null });
-					if (taskItem instanceof Widget) {
-						return (Widget) taskItem;
-					}
-				}
-			} catch (Throwable t) {
-				// ignore since class probably doesn't exist
-			}
-
-		}
-		return null;
-	}
-
-	private static TaskBarMenuManager getTaskBarMenuManager(Widget /* TaskItem */taskItem) {
-		Assert.isNotNull(taskItem);
-		TaskBarMenuManager taskBarMenuManager;
-		Object data = taskItem.getData(TASK_BAR_MENU_MANAGER_KEY);
-		if (data instanceof TaskBarMenuManager) {
-			taskBarMenuManager = (TaskBarMenuManager) data;
-		} else {
-			taskBarMenuManager = new TaskBarMenuManager(taskItem);
-			taskItem.setData(TASK_BAR_MENU_MANAGER_KEY, taskBarMenuManager);
-		}
-		return taskBarMenuManager;
-	}
-
-	private static final class TaskBarMenuManager extends MenuManager {
-
-		private final Widget taskItem;
-
-		public TaskBarMenuManager(Widget taskItem) {
-			this.taskItem = taskItem;
-		}
-
-		@Override
-		protected void update(boolean force, boolean recursive) {
-			// force Menu creation
-			Menu menu = getMenu();
-			if (menu == null) {
-				Shell shell = getShell();
-				if (shell != null) {
-					menu = createContextMenu(shell);
-				}
-			}
-			super.update(force, recursive);
-			if(menu != null && menu.getItemCount() == 0){
-				// clear the menu on the TaskItem if there are no items
-				menu = null;
-			}
-			if (taskItem != null && !taskItem.isDisposed()) {
-				setMenuOnTaskItem(taskItem, menu);
-			}
-		}
-
-		private void setMenuOnTaskItem(Widget taskItem, Menu menu) {
-			try {
-				Class<?> taskItemClass = Class.forName("org.eclipse.swt.widgets.TaskItem"); //$NON-NLS-1$
-				if (taskItem.getClass().equals(taskItemClass)) {
-					Method setMenuMethod = taskItemClass.getMethod("setMenu", Menu.class); //$NON-NLS-1$
-					setMenuMethod.invoke(taskItem, menu);
-				}
-			} catch (Throwable t) {
-				// ignore since class probably doesn't exist
-			}
-		}
-
-		/**
-		 * From @see org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil#getNonModalShell()
-		 * <p>
-		 * 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 getShell() {
-			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;
-		}
-	}
-}
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 0345b1d..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/messages.properties
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-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_Find=Find
-
-AbstractNotificationPopup_Close_Notification_Job=Close Notification Job
-AbstractNotificationPopup_Notification=Notification
-
-DatePicker_Choose_Date=Choose Date
-DatePicker_Clear=Clear
-
-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, Clipboard or File
-ScreenshotCreationPage_Capture_Desktop_C=&Capture
-ScreenshotCreationPage_CAPTURE_SCRRENSHOT=Capture Screenshot
-ScreenshotCreationPage_Clear_all_annotations_made_on_screenshot_image=Clear all annotations made on screenshot image
-ScreenshotCreationPage_Clear=C&lear
-ScreenshotCreationPage_Undo=&Undo
-ScreenshotCreationPage_Undo_annotation=Undo annotation
-ScreenshotCreationPage_Redo=Re&do
-ScreenshotCreationPage_Redo_annotation=Redo annotation
-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_Fit_Image_F=&Fit
-ScreenshotCreationPage_NOTE_THAT_YOU_CONTINUTE=Note that you can continue to interact with the workbench in order to set up the screenshot.
-ScreenshotCreationPage_Show_Line_Type_Selector=Show Line Type Selector
-ScreenshotCreationPage_Show_Line_Bold_Selector=Show Line Bold Selector
-
-SelectToolAction_Font_Bold=, Bold
-SelectToolAction_Font_Italic=, Italic
-SelectToolAction_Font_Name_Size={0}, {1} pt
-SelectToolAction_1dot=1 dot
-SelectToolAction_2dots=2 dots
-SelectToolAction_4dots=4 dots
-SelectToolAction_8dots=8 dots
-SelectToolAction_Clipboard=Clipboard
-SelectToolAction_Desktop=Desktop
-SelectToolAction_File=File...
-SelectToolAction_Selected_Rectangle=Selected Rectangle
-SelectToolAction_Rectangle=Rectangle
-SelectToolAction_Round_Rectangle=Round Rectangle
-SelectToolAction_Oval=Oval
-SelectToolAction_Fill_Rectangle=Fill Rectangle
-SelectToolAction_Fill_Round_Rectangle=Fill Round Rectangle
-SelectToolAction_Fill_Oval=Fill Oval
-SelectToolAction_Free=Free
-SelectToolAction_Line=Line
-SelectToolAction_Single_Side_Arrow=Single Side Arrow
-SelectToolAction_Both_Side_Arrow=Both Side Arrow
-SelectToolAction_Dashed_Line=Dashed Line
-SelectToolAction_Dashed_Line_1_dot=1 dots Dashed Line
-SelectToolAction_Dashed_Line_2_dots=2 dots Dashed Line
-SelectToolAction_Dotted_Line=Dotted Line
-SelectToolAction_Solid_Line=Solid Line
-SelectToolAction_Fit=Fit
-SelectToolAction_ZoomHalf=50%
-SelectToolAction_Zoom1X=100%
-SelectToolAction_Zoom2X=200%
-SelectToolAction_Zoom4X=400%
-SelectToolAction_Zoom8X=800%
-SelectToolAction_Font_=Font...
-SelectToolAction_Color_=Color...
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 083e961..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractFilteredTree.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.layout.GridDataFactory;
-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.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Point;
-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.ui.dialogs.PatternFilter;
-import org.eclipse.ui.progress.WorkbenchJob;
-
-/**
- * @author Mik Kersten
- */
-public abstract class AbstractFilteredTree extends EnhancedFilteredTree {
-
-	private static final int FILTER_WIDTH_MIN = 60;
-
-	private static final int FILTER_WIDTH_MAX = 300;
-
-	private static final float FILTER_WIDTH_RATIO = 0.35f;
-
-	public static final String LABEL_FIND = Messages.AbstractFilteredTree_Find;
-
-	private WorkbenchJob refreshJob;
-
-	private AdaptiveRefreshPolicy refreshPolicy;
-
-	private Composite progressComposite;
-
-	private Composite searchComposite;
-
-	private boolean showProgress = false;
-
-	private String previousFilterText;
-
-	/**
-	 * XXX: using reflection to gain access
-	 * 
-	 * @param parent
-	 * @param treeStyle
-	 * @param filter
-	 */
-	public AbstractFilteredTree(Composite parent, int treeStyle, PatternFilter filter) {
-		super(parent, treeStyle, filter, true);
-		try {
-			// the super constructor calls doCreateRefreshJob() which assigns refreshJob
-			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(LABEL_FIND);
-	}
-
-	@Override
-	protected WorkbenchJob doCreateRefreshJob() {
-		this.refreshJob = super.doCreateRefreshJob();
-		return this.refreshJob;
-	}
-
-	@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(final Composite parent) {
-		// replace filterComposite by a new composite
-		filterComposite = new Composite(parent.getParent(), SWT.NONE);
-		GridLayout gridLayout = new GridLayout(1, false);
-		gridLayout.marginWidth = 0;
-		gridLayout.marginHeight = 0;
-		gridLayout.marginLeft = 3;
-		gridLayout.marginTop = 5;
-		gridLayout.marginBottom = 3;
-		gridLayout.verticalSpacing = 0;
-		filterComposite.setLayout(gridLayout);
-
-		// let FilteredTree create the find and clear control
-		super.createFilterControls(parent);
-		GridDataFactory.fillDefaults().align(SWT.BEGINNING, SWT.CENTER).grab(false, false).hint(FILTER_WIDTH_MIN,
-				SWT.DEFAULT).minSize(FILTER_WIDTH_MIN, SWT.DEFAULT).applyTo(parent);
-		filterComposite.addControlListener(new ControlAdapter() {
-			boolean handlingEvents;
-
-			@Override
-			public void controlResized(ControlEvent e) {
-				if (handlingEvents) {
-					return;
-				}
-				try {
-					handlingEvents = true;
-					Point size = parent.getParent().getSize();
-					int width = Math.max(FILTER_WIDTH_MIN, (int) (size.x * FILTER_WIDTH_RATIO));
-					int offset = 1;
-					if (parent.getParent().getLayoutData() instanceof GridData) {
-						offset = ((GridLayout) parent.getParent().getLayout()).marginWidth
-								+ ((GridLayout) parent.getParent().getLayout()).marginLeft
-								+ ((GridLayout) parent.getParent().getLayout()).horizontalSpacing;
-					}
-					((GridData) parent.getLayoutData()).widthHint = Math.min(width, FILTER_WIDTH_MAX) + offset;
-					((GridData) filterText.getParent().getLayoutData()).widthHint = Math.min(width, FILTER_WIDTH_MAX);
-					parent.getParent().layout();
-				} finally {
-					handlingEvents = false;
-				}
-			}
-		});
-		filterText.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyPressed(KeyEvent e) {
-				if (e.character == SWT.ESC && e.doit) {
-					setFilterText(""); //$NON-NLS-1$
-				}
-			}
-		});
-		((GridData) filterText.getLayoutData()).verticalAlignment = SWT.CENTER;
-
-		// move original filterComposite on new filterComposite
-		parent.setParent(filterComposite);
-
-		Composite workingSetComposite = createActiveWorkingSetComposite(filterComposite);
-		GridDataFactory.fillDefaults().align(SWT.BEGINNING, SWT.CENTER).grab(false, false).applyTo(workingSetComposite);
-
-		Composite activeTaskComposite = createActiveTaskComposite(filterComposite);
-		GridDataFactory.fillDefaults().align(SWT.BEGINNING, SWT.CENTER).grab(true, false).applyTo(activeTaskComposite);
-
-		gridLayout.numColumns = filterComposite.getChildren().length;
-		return parent;
-	}
-
-	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().
-		String text = getFilterString();
-		if (text == null || text.equals(previousFilterText)) {
-			return;
-		}
-		super.textChanged();
-
-		previousFilterText = text;
-
-		if (refreshPolicy != null) {
-			if (LABEL_FIND.equals(text) && !useNewLook) {
-				clearText();
-				refreshPolicy.textChanged(""); //$NON-NLS-1$
-			} else {
-				refreshPolicy.textChanged(text);
-			}
-		}
-		// 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 d767243..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractNotificationPopup.java
+++ /dev/null
@@ -1,608 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-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.Color;
-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 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() {
-		String productName = CommonUiUtil.getProductName();
-		if (productName != null) {
-			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(getTitleForeground());
-//		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);
-			}
-
-		});
-	}
-
-	protected Color getTitleForeground() {
-		return color.getTitleText();
-	}
-
-	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()) {
-			shell.setAlpha(0);
-		}
-		shell.setVisible(true);
-		fadeJob = SwtUtil.fadeIn(shell, new IFadeListener() {
-			public void faded(Shell shell, int alpha) {
-				if (shell.isDisposed()) {
-					return;
-				}
-
-				if (alpha == 255) {
-					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);
-		}
-		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();
-								}
-							}
-						});
-					}
-				}
-			}
-		});
-	}
-
-	@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 175b1d3..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonColors.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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 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() {
-		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 d76d218..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, 2009 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 1888129..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonImages.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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_OBJ_32 = "obj32"; //$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$
-
-	public static final ImageDescriptor PRIORITY_1_LARGE = create(T_OBJ_32, "priority-critical.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PRIORITY_2_LARGE = create(T_OBJ_32, "priority-high.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PRIORITY_3_LARGE = create(T_OBJ_32, "priority-normal.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PRIORITY_4_LARGE = create(T_OBJ_32, "priority-low.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PRIORITY_5_LARGE = create(T_OBJ_32, "priority-very-low.png"); //$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 = create(T_TOOL, "schedule.png"); //$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_SMALL = create(T_TOOL, "person-me-small.png"); //$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$
-
-	public static final ImageDescriptor NOTIFICATION_PREFERENCES_HOVER = create(T_EVIEW,
-			"notification-preferences-active.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor NOTIFICATION_PREFERENCES = create(T_EVIEW,
-			"notification-preferences-inactive.png"); //$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$
-
-	public static final ImageDescriptor BANNER_EXPORT = create(T_WIZBAN, "banner-export.gif"); //$NON-NLS-1$
-
-	// Discovery
-
-	public static final ImageDescriptor DISCOVERY = create(T_TOOL, "discovery.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor BANNER_DISOVERY = create(T_WIZBAN, "banner-discovery.png"); //$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 EDIT_SMALL = create(T_TOOL, "edit-small.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor CUT = create(T_TOOL, "cut.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor UNDO = create(T_TOOL, "undo_edit.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor REDO = create(T_TOOL, "redo_edit.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 FILE_PLAIN = create(T_OBJ, "file-plain.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FILE_PLAIN_SMALL = create(T_OBJ, "file-small.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor NOTES_SMALL = create(T_OBJ, "notes-small.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor QUESTION = create(T_OBJ, "question.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor INFORMATION = create(T_OBJ, "message_info.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 WEB = create(T_TOOL, "web.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FIND = create(T_TOOL, "find.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor SAVE = create(T_TOOL, "save.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 49438b2..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonTextSupport.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.core.commands.operations.IOperationHistoryListener;
-import org.eclipse.core.commands.operations.OperationHistoryEvent;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.commands.ActionHandler;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.ITextOperationTarget;
-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.Display;
-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 UndoRedoListener implements IOperationHistoryListener {
-
-		private TextViewer viewer;
-
-		public void historyNotification(OperationHistoryEvent event) {
-			if (viewer != null && selectionChangedListener != null && Display.getCurrent() != null) {
-				selectionChangedListener.selectionChanged(new SelectionChangedEvent(viewer, viewer.getSelection()));
-			}
-		}
-
-		public void setViewer(TextViewer viewer) {
-			this.viewer = viewer;
-		}
-
-	}
-
-	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;
-
-	private final UndoRedoListener undoRedoListener;
-
-	public CommonTextSupport(IHandlerService handlerService) {
-		Assert.isNotNull(handlerService);
-		this.handlerService = handlerService;
-		this.undoRedoListener = new UndoRedoListener();
-	}
-
-	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);
-
-		undoRedoListener.setViewer(viewer);
-		OperationHistoryFactory.getOperationHistory().addOperationHistoryListener(undoRedoListener);
-	}
-
-	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;
-		}
-
-		undoRedoListener.setViewer(null);
-		OperationHistoryFactory.getOperationHistory().removeOperationHistoryListener(undoRedoListener);
-	}
-
-	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);
-		}
-		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 014d625..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonThemes.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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_OVERDUE_FOR_OTHERS = "org.eclipse.mylyn.tasks.ui.colors.foreground.overdue.for.others"; //$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 final String COLOR_TASK_ACTIVE = "org.eclipse.mylyn.tasks.ui.colors.foreground.task.active"; //$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) || property.equals(COLOR_TASK_ACTIVE);
-		}
-	}
-
-}
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 6e3a557..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonUiUtil.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.IProduct;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-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_ENABLED = "org.eclipse.mylyn.commons.ui.enabled"; //$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 restore) {
-		if (restore) {
-			restoreState(composite);
-		} else {
-			saveStateAndDisable(composite);
-		}
-	}
-
-	private static void saveStateAndDisable(Composite composite) {
-		if (!composite.isDisposed()) {
-			Object data = composite.getData(KEY_ENABLED);
-			if (data == null) {
-				if (!composite.getEnabled()) {
-					composite.setData(KEY_ENABLED, Boolean.FALSE);
-				} else {
-					composite.setData(KEY_ENABLED, Boolean.TRUE);
-					composite.setEnabled(false);
-				}
-			}
-			for (Control control : composite.getChildren()) {
-				if (control instanceof Composite) {
-					saveStateAndDisable((Composite) control);
-				} else {
-					data = control.getData(KEY_ENABLED);
-					if (data == null) {
-						if (!control.getEnabled()) {
-							control.setData(KEY_ENABLED, Boolean.FALSE);
-						} else {
-							control.setData(KEY_ENABLED, Boolean.TRUE);
-							control.setEnabled(false);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private static void restoreState(Composite composite) {
-		if (!composite.isDisposed()) {
-			Object data = composite.getData(KEY_ENABLED);
-			if (data != null) {
-				if (data == Boolean.TRUE) {
-					composite.setEnabled(data == Boolean.TRUE);
-				}
-				composite.setData(KEY_ENABLED, null);
-			}
-			for (Control control : composite.getChildren()) {
-				if (control instanceof Composite) {
-					restoreState((Composite) control);
-				} else {
-					data = control.getData(KEY_ENABLED);
-					if (data != null) {
-						if (data == Boolean.TRUE) {
-							control.setEnabled(true);
-						}
-						control.setData(KEY_ENABLED, null);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns text masking the &amp;-character from decoration as an accelerator in SWT labels.
-	 */
-	public static String toLabel(String text) {
-		return (text != null) ? text.replaceAll("&", "&&") : null; // mask & from SWT //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * Returns text for use as the label of an action to ensure that it is displayed properly.
-	 * 
-	 * @return the cleaned text
-	 */
-	public static String toMenuLabel(String label) {
-		// a tab at the end of the text will make sure that the @ will not create a weird space in the action text
-		// bug 287347: @ at start of task name cause a weird space in activation history menu
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=287347
-		if (label.contains("@")) { //$NON-NLS-1$
-			label += "\t"; //$NON-NLS-1$
-		}
-		return CommonUiUtil.toLabel(label);
-	}
-
-	public static String getProductName() {
-		return getProductName(null);
-	}
-
-	public static String getProductName(String defaultName) {
-		IProduct product = Platform.getProduct();
-		if (product != null) {
-			String productName = product.getName();
-			if (productName != null) {
-				String LABEL_SDK = "SDK"; //$NON-NLS-1$
-				if (productName.endsWith(LABEL_SDK)) {
-					productName = productName.substring(0, productName.length() - LABEL_SDK.length()).trim();
-				}
-				return productName;
-			}
-		}
-		return defaultName;
-	}
-
-}
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 8a94376..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, 2009 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 edf2040..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DatePicker.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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.mylyn.internal.provisional.commons.ui.dialogs.IInPlaceDialogListener;
-import org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.InPlaceDateSelectionDialog;
-import org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.InPlaceDialogEvent;
-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;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-
-/**
- * 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;
-
-	private ImageHyperlink clearControl;
-
-	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(3, 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.heightHint = 5;
-		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();
-				}
-
-			}
-		});
-
-		clearControl = new ImageHyperlink(this, SWT.NONE);
-		clearControl.setImage(CommonImages.getImage(CommonImages.FIND_CLEAR_DISABLED));
-		clearControl.setHoverImage(CommonImages.getImage(CommonImages.FIND_CLEAR));
-		clearControl.setToolTipText(Messages.DatePicker_Clear);
-		clearControl.addHyperlinkListener(new HyperlinkAdapter() {
-			@Override
-			public void linkActivated(HyperlinkEvent e) {
-				dateSelected(false, null);
-			}
-
-		});
-		clearControl.setBackground(clearControl.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-		GridData clearButtonGridData = new GridData();
-		clearButtonGridData.horizontalIndent = 3;
-		clearControl.setLayoutData(clearButtonGridData);
-
-		pickButton = new Button(this, style | SWT.ARROW | SWT.DOWN);
-		GridData pickButtonGridData = new GridData(SWT.RIGHT, SWT.FILL, false, true);
-		pickButtonGridData.verticalIndent = 0;
-		pickButtonGridData.horizontalIndent = 3;
-		pickButton.setLayoutData(pickButtonGridData);
-		pickButton.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent arg0) {
-				final 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 = pickButton.getShell();
-				if (shell == null) {
-					//fall back
-					if (PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null) {
-						shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-					} else {
-						shell = new Shell(PlatformUI.getWorkbench().getDisplay());
-					}
-				}
-
-				final InPlaceDateSelectionDialog dialog = new InPlaceDateSelectionDialog(shell, pickButton,
-						newCalendar, DatePicker.TITLE_DIALOG, includeTimeOfday, selectedHourOfDay);
-				dialog.addEventListener(new IInPlaceDialogListener() {
-
-					public void buttonPressed(InPlaceDialogEvent event) {
-						Calendar selectedCalendar = null;
-						if (event.getReturnCode() == Window.OK && dialog.getDate() != null) {
-							selectedCalendar = newCalendar;
-							selectedCalendar.setTime(dialog.getDate());
-						}
-						dateSelected(event.getReturnCode() == Window.CANCEL, selectedCalendar);
-					}
-				});
-				dialog.open();
-			}
-		});
-		updateClearControlVisibility();
-		pack();
-		setBackground(getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-	}
-
-	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) {
-		super.setBackground(backgroundColor);
-		dateText.setBackground(backgroundColor);
-		if ((getStyle() & SWT.FLAT) != 0) {
-			pickButton.setBackground(backgroundColor);
-		} else {
-			pickButton.setBackground(null);
-		}
-	}
-
-	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();
-		}
-
-	}
-
-	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);
-		}
-
-		updateClearControlVisibility();
-	}
-
-	private void updateClearControlVisibility() {
-		if (clearControl != null && clearControl.getLayoutData() instanceof GridData) {
-			GridData gd = (GridData) clearControl.getLayoutData();
-			gd.exclude = date == null;
-			clearControl.getParent().layout();
-		}
-	}
-
-	@Override
-	public void setEnabled(boolean enabled) {
-		dateText.setEnabled(enabled);
-		pickButton.setEnabled(enabled);
-		clearControl.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 58c9b65..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DatePickerPanel.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.IOpenListener;
-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.OpenEvent;
-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;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * @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;
-
-	/**
-	 * @Since 3.3
-	 */
-	public DatePickerPanel(Composite parent, int style, Calendar initialDate, boolean includeTime, int hourOfDay) {
-		this(parent, style, initialDate, includeTime, hourOfDay, -1);
-	}
-
-	public DatePickerPanel(Composite parent, int style, Calendar initialDate, boolean includeTime, int hourOfDay,
-			int marginSize) {
-		super(parent, style);
-		this.date = initialDate;
-		this.hourOfDay = hourOfDay;
-		initialize(includeTime, marginSize);
-		setDate(date);
-		//this.setBackground()
-	}
-
-	private void initialize(boolean includeTime, int marginSize) {
-		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 = 1;
-		}
-		if (marginSize != -1) {
-			gridLayout.marginWidth = marginSize;
-		}
-		this.setLayout(gridLayout);
-
-		calendar = new DateTime(this, SWT.CALENDAR);
-		calendar.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetDefaultSelected(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, true));
-				notifyListeners(new SelectionChangedEvent(DatePickerPanel.this, getSelection()));
-			}
-
-			@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);
-		}
-
-		Hyperlink todayLink = new Hyperlink(this, SWT.NONE);
-		todayLink.setText(Messages.DatePickerPanel_Today);
-		todayLink.setUnderlined(true);
-		todayLink.setForeground(CommonColors.HYPERLINK_WIDGET);
-		GridDataFactory.fillDefaults().span(2, 1).grab(true, false).align(SWT.CENTER, SWT.TOP).applyTo(todayLink);
-		todayLink.addHyperlinkListener(new HyperlinkAdapter() {
-			@Override
-			public void linkActivated(HyperlinkEvent e) {
-				Calendar today = Calendar.getInstance();
-				ISelection selection = getSelection();
-				if (selection instanceof DateSelection && !selection.isEmpty()) {
-					Calendar selectedDate = ((DateSelection) selection).getDate();
-					if (selectedDate != null) {
-						today.set(Calendar.HOUR_OF_DAY, selectedDate.get(Calendar.HOUR_OF_DAY));
-						today.set(Calendar.MINUTE, selectedDate.get(Calendar.MINUTE));
-						today.set(Calendar.SECOND, selectedDate.get(Calendar.SECOND));
-						today.set(Calendar.MILLISECOND, selectedDate.get(Calendar.MILLISECOND));
-					}
-				}
-				setDate(today, true);
-			}
-		});
-	}
-
-	/**
-	 * 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()));
-			}
-		});
-
-		listViewer.addOpenListener(new IOpenListener() {
-
-			public void open(OpenEvent event) {
-				date.set(Calendar.HOUR_OF_DAY, timeList.getSelectionIndex());
-				date.set(Calendar.MINUTE, 0);
-				setSelection(new DateSelection(date, true));
-				notifyListeners(new SelectionChangedEvent(DatePickerPanel.this, getSelection()));
-			}
-		});
-
-		GridDataFactory.fillDefaults().hint(SWT.DEFAULT, 50).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) {
-		setDate(date, false);
-	}
-
-	/**
-	 * @since 3.3
-	 */
-	public void setDate(Calendar date, boolean notifyListeners) {
-		this.date = date;
-		calendar.setYear(date.get(Calendar.YEAR));
-		calendar.setMonth(date.get(Calendar.MONTH));
-		calendar.setDay(date.get(Calendar.DAY_OF_MONTH));
-		if (notifyListeners) {
-			setSelection(new DateSelection(date, false));
-			notifyListeners(new SelectionChangedEvent(DatePickerPanel.this, getSelection()));
-		}
-	}
-
-	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;
-
-		private final boolean isDefaultSelection;
-
-		public DateSelection(Calendar calendar) {
-			this(calendar, false);
-		}
-
-		public DateSelection(Calendar calendar, boolean isDefaultSelection) {
-			date = calendar;
-			this.isDefaultSelection = isDefaultSelection;
-
-		}
-
-		public boolean isEmpty() {
-			return date == null;
-		}
-
-		public boolean isDefaultSelection() {
-			return isDefaultSelection;
-		}
-
-		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 7ae3e9d..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DateSelectionDialog.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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();
-					if (dateSelection.isDefaultSelection()) {
-						okPressed();
-					}
-				}
-			}
-		});
-
-		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) {
-		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/EnhancedFilteredTree.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/EnhancedFilteredTree.java
deleted file mode 100644
index 39e17d7..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/EnhancedFilteredTree.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Hiroyuki Inaba 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:
- *     Hiroyuki Inaba - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.lang.reflect.Field;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-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.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.TypedListener;
-import org.eclipse.ui.dialogs.FilteredTree;
-import org.eclipse.ui.dialogs.PatternFilter;
-
-/**
- * A {@link FilteredTree} that uses the new look on Eclipse 3.5 and later.
- * 
- * @author Hiroyuki Inaba
- */
-// TODO e3.5 remove this class and replace with FilteredTree
-public class EnhancedFilteredTree extends FilteredTree {
-
-	protected boolean useNewLook;
-
-	private TextSearchControl searchControl;
-
-	public EnhancedFilteredTree(Composite parent, int treeStyle, PatternFilter filter, boolean useNewLook) {
-		super(parent, treeStyle, filter);
-	}
-
-	public EnhancedFilteredTree(Composite parent, int treeStyle, PatternFilter filter) {
-		super(parent, treeStyle, filter);
-	}
-
-	public EnhancedFilteredTree(Composite parent) {
-		super(parent);
-	}
-
-	@Override
-	protected void createControl(Composite parent, int treeStyle) {
-		super.createControl(parent, treeStyle);
-
-		// set this after so that there isn't a double border created around the search
-		useNewLook = setNewLook(this);
-	}
-
-	@Override
-	protected Composite createFilterControls(Composite parent) {
-		createFilterText(parent);
-		return parent;
-	}
-
-	public static boolean setNewLook(FilteredTree tree) {
-		try {
-			Field newStyleField = FilteredTree.class.getDeclaredField("useNewLook"); //$NON-NLS-1$
-			newStyleField.setAccessible(true);
-			newStyleField.setBoolean(tree, true);
-			return newStyleField.getBoolean(tree);
-		} catch (Exception e) {
-			// ignore
-		}
-		return false;
-	}
-
-	@Override
-	protected void createFilterText(Composite parent) {
-		super.createFilterText(parent);
-
-		// This code is here to make it so that the key listener for the down arrow listens to the KeyEvent.doit 
-		// flag so that the history popup dialog can be keyboard accessible and the down arrow works to select items 
-		// from the history 
-		if (searchControl != null && searchControl.hasHistorySupport()) {
-			Text textControl = searchControl.getTextControl();
-			KeyListener downArrowListener = null;
-			Listener[] listeners = textControl.getListeners(SWT.KeyDown);
-			if (listeners != null && listeners.length > 0) {
-				for (Listener listener : listeners) {
-					if (listener instanceof TypedListener
-							&& ((TypedListener) listener).getEventListener().getClass().getName().startsWith(
-									"org.eclipse.ui.dialogs.FilteredTree$") //$NON-NLS-1$
-							&& ((TypedListener) listener).getEventListener() instanceof KeyListener) {
-						downArrowListener = (KeyListener) ((TypedListener) listener).getEventListener();
-						break;
-					}
-				}
-			}
-			if (downArrowListener != null) {
-				final KeyListener oldKeyListener = downArrowListener;
-				textControl.removeKeyListener(downArrowListener);
-				textControl.addKeyListener(new KeyAdapter() {
-					@Override
-					public void keyPressed(KeyEvent e) {
-						if (e.doit) {
-							oldKeyListener.keyPressed(e);
-						}
-					}
-
-					@Override
-					public void keyReleased(KeyEvent e) {
-						if (e.doit) {
-							oldKeyListener.keyReleased(e);
-						}
-					}
-				});
-			}
-		}
-
-	}
-
-	@Override
-	protected Text doCreateFilterText(Composite parent) {
-		searchControl = new TextSearchControl(parent, true, getHistoryPopupDialog());
-
-		searchControl.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-				if (e.detail == TextSearchControl.ICON_CANCEL) {
-					clearText();
-				}
-				if (e.detail == TextSearchControl.ICON_SEARCH) {
-					textChanged();
-				}
-			}
-		});
-		searchControl.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
-		return searchControl.getTextControl();
-	}
-
-	public TextSearchControl getTextSearchControl() {
-		return searchControl;
-	}
-
-	protected SearchHistoryPopUpDialog getHistoryPopupDialog() {
-		return new SearchHistoryPopUpDialog(getShell(), SWT.TOP);
-	}
-}
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 75cfe78..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/GradientCanvas.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 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 java.util.Map;
-
-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;
-
-/**
- * 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$
-
-	static String PREFIX = "org.eclipse.ui.forms."; //$NON-NLS-1$
-
-	static String H_PREFIX = PREFIX + "H_"; //$NON-NLS-1$
-
-	public static String H_BOTTOM_KEYLINE1 = H_PREFIX + "BOTTOM_KEYLINE1"; //$NON-NLS-1$
-
-	/**
-	 * Key for the form header bottom keyline 2 color.
-	 */
-	public static String H_BOTTOM_KEYLINE2 = H_PREFIX + "BOTTOM_KEYLINE2"; //$NON-NLS-1$
-
-	private Image backgroundImage;
-
-	private Image gradientImage;
-
-	Map<String, Color> colors = new Hashtable<String, Color>();
-
-	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) {
-					// XXX 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) {
-				// XXX 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()) {
-			drawSeparator(carea, igc);
-		}
-		igc.dispose();
-		gc.drawImage(buffer, carea.x, carea.y);
-		buffer.dispose();
-	}
-
-	private void drawSeparator(Rectangle carea, GC igc) {
-		// bg separator
-		if (hasColor(H_BOTTOM_KEYLINE1)) {
-			igc.setForeground(getColor(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(H_BOTTOM_KEYLINE2)) {
-			igc.setForeground(getColor(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);
-		}
-	}
-
-	private void updateGradientImage() {
-		Rectangle rect = getBounds();
-		if (gradientImage != null) {
-			// XXX FormImages.getInstance().markFinished(gradientImage);
-			gradientImage.dispose();
-			gradientImage = null;
-		}
-		if (gradientInfo != null) {
-			// XXX 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);
-	}
-
-	// XXX 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);
-			}
-
-			if (isSeparatorVisible()) {
-				drawSeparator(getClientArea(), gc);
-			}
-			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;
-	}
-
-	public void putColor(String key, Color color) {
-		if (color == null) {
-			colors.remove(key);
-		} else {
-			colors.put(key, color);
-		}
-	}
-
-	public Color getColor(String key) {
-		return 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/GradientToolTip.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/GradientToolTip.java
deleted file mode 100644
index 748f07e..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/GradientToolTip.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.resource.JFaceResources;
-import org.eclipse.jface.resource.LocalResourceManager;
-import org.eclipse.jface.window.ToolTip;
-import org.eclipse.mylyn.internal.commons.ui.NotificationPopupColors;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-
-/**
- * A Custom JFace ToolTip that applies a gradient to the contents
- * 
- * @author Shawn Minto
- * @since 3.2
- */
-public abstract class GradientToolTip extends ToolTip {
-
-	private NotificationPopupColors colors;
-
-	private LocalResourceManager resourceManager;
-
-	public GradientToolTip(Control control, int style, boolean manualActivation) {
-		super(control, style, manualActivation);
-		initResources(control);
-	}
-
-	public GradientToolTip(Control control) {
-		super(control);
-		initResources(control);
-	}
-
-	private void initResources(Control control) {
-		resourceManager = new LocalResourceManager(JFaceResources.getResources());
-		colors = new NotificationPopupColors(control.getDisplay(), resourceManager);
-	}
-
-	@Override
-	protected final Composite createToolTipContentArea(Event event, final Composite parent) {
-		GradientCanvas gradient = new GradientCanvas(parent, SWT.NONE);
-		gradient.setSeparatorVisible(false);
-		GridLayout headLayout = new GridLayout();
-		headLayout.marginHeight = 0;
-		headLayout.marginWidth = 0;
-		headLayout.horizontalSpacing = 0;
-		headLayout.verticalSpacing = 0;
-		headLayout.numColumns = 1;
-		gradient.setLayout(headLayout);
-
-		gradient.setBackgroundGradient(new Color[] { colors.getGradientBegin(), colors.getGradientEnd() },
-				new int[] { 100 }, true);
-
-		createToolTipArea(event, gradient);
-
-		// force a null background so that the gradient shines through
-		for (Control c : gradient.getChildren()) {
-			setNullBackground(c);
-		}
-
-		return gradient;
-	}
-
-	private void setNullBackground(final Control outerCircle) {
-		outerCircle.setBackground(null);
-		if (outerCircle instanceof Composite) {
-			((Composite) outerCircle).setBackgroundMode(SWT.INHERIT_FORCE);
-			for (Control c : ((Composite) outerCircle).getChildren()) {
-				setNullBackground(c);
-			}
-		}
-	}
-
-	protected abstract Composite createToolTipArea(Event event, Composite parent);
-}
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 f67dfda..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, 2009 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/Messages.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/Messages.java
deleted file mode 100644
index a53c051..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/Messages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.provisional.commons.ui.messages"; //$NON-NLS-1$
-
-	public static String DatePickerPanel_Today;
-
-	public static String TextControl_FindToolTip;
-
-	public static String TextControl_AccessibleListenerFindButton;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
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 6bf95ca..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ScreenshotCreationPage.java
+++ /dev/null
@@ -1,1737 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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
- *     Hiroyuki Inaba - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.HashSet;
-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.Messages;
-import org.eclipse.mylyn.internal.commons.ui.SelectToolAction;
-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.MenuDetectEvent;
-import org.eclipse.swt.events.MenuDetectListener;
-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.Font;
-import org.eclipse.swt.graphics.FontData;
-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.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-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.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.progress.UIJob;
-
-/**
- * A wizard page to create a screenshot from the display.
- * <p>
- * NOTE: this class exposes a lot of implementation detail and is likely to change.
- * 
- * @author Balazs Brinkus
- * @author Willian Mitsuda
- * @author Mik Kersten
- * @author Hiroyuki Inaba
- */
-public class ScreenshotCreationPage extends WizardPage {
-
-	private SelectToolAction captureAction;
-
-	private SelectToolAction fitAction;
-
-	private IAction cropAction;
-
-	private IAction markAction;
-
-	private IAction clearAction;
-
-	private IAction undoAction;
-
-	private IAction redoAction;
-
-	private Composite paletteArea;
-
-	private int lastDrawAction;
-
-	private SelectToolAction drawLineToolbar;
-
-	private SelectToolAction drawArrowToolbar;
-
-	private SelectToolAction drawBoxToolbar;
-
-	private SelectToolAction drawTextToolbar;
-
-	private SelectToolAction lineTypeToolbar;
-
-	private SelectToolAction lineBoldToolbar;
-
-	private SelectToolAction drawColorToolbar;
-
-	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;
-
-	private Image previousImage;
-
-	/**
-	 * 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;
-
-	private boolean isFirstCapture = true;
-
-	private Text textArea;
-
-	/**
-	 * Mouse event history. Entry is [0] MouseDown/MouseMove/MouseUp, [1] x, [2] y
-	 */
-	private List<int[]> historyMouseEvent = new ArrayList<int[]>();
-
-	/**
-	 * Draw tool history. Entry is [0] drawHistory index, [1] FREE/LINE/BOX/OVAL, [2] Line type, [3] Bold, [4] R/G/B
-	 */
-	private List<int[]> historyDrawTool = new ArrayList<int[]>();
-
-	private List<StringBuffer> historyDrawText = new ArrayList<StringBuffer>();
-
-	private List<String> historyDrawFont = new ArrayList<String>();
-
-	private int historyCheckpoint = 0;
-
-	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 SelectToolAction(getShell(), Messages.ScreenshotCreationPage_Capture_Desktop_C,
-				SelectToolAction.CAPTURE_DROP_DOWN_MENU) {
-
-			@Override
-			public void run() {
-				if (captureAction.getSelect() == SelectToolAction.CAPTURE_DESKTOP) {
-					captureScreenshotContent();
-				} else if (captureAction.getSelect() == SelectToolAction.CAPTURE_CLIPBOARD) {
-					captureScreenshotContent(captureAction.getClipboardImage());
-				} else if (captureAction.getSelect() == SelectToolAction.CAPTURE_RECTANGLE) {
-					captureScreenshotContentFromSelection();
-				} else {
-					captureScreenshotContent(captureAction.getFileImage());
-				}
-				setErrorMessage(null);
-				if (isFirstCapture) {
-					isFirstCapture = false;
-					fitAction.setEnabled(true);
-					cropAction.setEnabled(true);
-					cropAction.setChecked(true);
-					markAction.setEnabled(true);
-					drawLineToolbar.setEnabled(true);
-					drawArrowToolbar.setEnabled(true);
-					drawBoxToolbar.setEnabled(true);
-					drawTextToolbar.setEnabled(true);
-				}
-
-				historyMouseEvent = new ArrayList<int[]>();
-				historyDrawTool = new ArrayList<int[]>();
-				historyDrawText = new ArrayList<StringBuffer>();
-				historyDrawFont = new ArrayList<String>();
-				historyCheckpoint = 0;
-				undoAction.setEnabled(false);
-				redoAction.setEnabled(false);
-				clearAction.setEnabled(false);
-			}
-
-			@Override
-			protected boolean isEnableRectangle() {
-				return (currentSelection != null);
-			}
-		};
-		captureAction.setToolTipText(Messages.ScreenshotCreationPage_Capture_Desktop);
-		captureAction.setImageDescriptor(ImageDescriptor.createFromImage(CommonImages.getImage(CommonImages.IMAGE_CAPTURE)));
-		captureAction.setShowMenuAlways(false);
-
-//		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 SelectToolAction(Messages.ScreenshotCreationPage_Fit_Image_F,
-				SelectToolAction.ZOOM_DROP_DOWN_MENU) {
-			@Override
-			public void run() {
-				refreshCanvasSize();
-			}
-		};
-		fitAction.setToolTipText(Messages.ScreenshotCreationPage_Fit_Image);
-		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);
-//				undoAction.setEnabled(false);
-//				redoAction.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 setChecked(boolean checked) {
-				super.setChecked(checked);
-				if (paletteArea != null) {
-					if (checked) {
-						if (getSelectDrawToolbar() < 0) {
-							setSelectDrawToolbar(lastDrawAction);
-						}
-					} else {
-						int select = getSelectDrawToolbar();
-						if (select >= 0) {
-							lastDrawAction = select;
-							unselectDrawToolbar();
-						}
-					}
-					boolean isDrawText = (drawTextToolbar.getSelect() >= 0) ? false : checked;
-					//drawLineToolbar.setEnabled(checked);
-					//drawArrowToolbar.setEnabled(checked);
-					//drawBoxToolbar.setEnabled(checked);
-					//drawTextToolbar.setEnabled(checked);
-					drawColorToolbar.setEnabled(isDrawText);
-					lineTypeToolbar.setEnabled(isDrawText);
-					lineBoldToolbar.setEnabled(isDrawText);
-				}
-			}
-
-			@Override
-			public void run() {
-				currentAction = EditorAction.MARKING;
-				cropAction.setChecked(false);
-				markAction.setChecked(true);
-//				undoAction.setEnabled(false);
-//				redoAction.setEnabled(false);
-				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);
-
-		clearAction = new Action(Messages.ScreenshotCreationPage_Clear, IAction.AS_PUSH_BUTTON) {
-			@Override
-			public void run() {
-				clearAction.setEnabled(false);
-				workImageGC.drawImage(originalImage, 0, 0);
-				canvas.redraw();
-				setImageDirty(true);
-
-				historyMouseEvent = new ArrayList<int[]>();
-				historyDrawTool = new ArrayList<int[]>();
-				historyDrawText = new ArrayList<StringBuffer>();
-				historyDrawFont = new ArrayList<String>();
-				historyCheckpoint = 0;
-				undoAction.setEnabled(false);
-				redoAction.setEnabled(false);
-			}
-		};
-		clearAction.setToolTipText(Messages.ScreenshotCreationPage_Clear_all_annotations_made_on_screenshot_image);
-		clearAction.setImageDescriptor(CommonImages.CLEAR);
-		clearAction.setEnabled(false);
-
-		undoAction = new Action(Messages.ScreenshotCreationPage_Undo) {
-			@Override
-			public void run() {
-				if (historyCheckpoint > 0) {
-					historyCheckpoint--;
-					drawAnnotationHistory();
-				}
-				if (historyCheckpoint == 0) {
-					undoAction.setEnabled(false);
-				}
-				if (historyCheckpoint < historyDrawTool.size()) {
-					redoAction.setEnabled(true);
-				}
-			}
-		};
-		undoAction.setToolTipText(Messages.ScreenshotCreationPage_Undo_annotation);
-		undoAction.setImageDescriptor(CommonImages.UNDO);
-		undoAction.setEnabled(false);
-
-		redoAction = new Action(Messages.ScreenshotCreationPage_Redo) {
-			@Override
-			public void run() {
-				if (historyCheckpoint < historyDrawTool.size()) {
-					historyCheckpoint++;
-					drawAnnotationHistory();
-				}
-				if (historyCheckpoint > 0) {
-					undoAction.setEnabled(true);
-				}
-				if (historyCheckpoint >= historyDrawTool.size()) {
-					redoAction.setEnabled(false);
-				}
-			}
-		};
-		redoAction.setToolTipText(Messages.ScreenshotCreationPage_Redo_annotation);
-		redoAction.setImageDescriptor(CommonImages.REDO);
-		redoAction.setEnabled(false);
-
-		tbm.add(createAndConfigureCI(captureAction));
-		tbm.add(new Separator());
-		tbm.add(createAndConfigureCI(fitAction));
-		tbm.add(createAndConfigureCI(cropAction));
-		tbm.add(createAndConfigureCI(markAction));
-		tbm.add(new Separator());
-		tbm.add(createAndConfigureCI(clearAction));
-		tbm.add(createAndConfigureCI(undoAction));
-		tbm.add(createAndConfigureCI(redoAction));
-		tbm.add(new Separator());
-
-		Composite body = new Composite(vf, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 0;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		body.setLayout(layout);
-		createPaletteBars(body);
-		lastDrawAction = getSelectDrawToolbar();
-		unselectDrawToolbar();
-
-		scrolledComposite = new ScrolledComposite(body, SWT.V_SCROLL | SWT.H_SCROLL);
-		scrolledComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		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();
-
-					int zoom = fitAction.getSelect();
-					switch (zoom) {
-					case SelectToolAction.ZOOM_FIT:
-						e.gc.drawImage(workImage, 0, 0, imageBounds.width, imageBounds.height, //
-								0, 0, canvasBounds.width, canvasBounds.height);
-						break;
-					case 50:
-						e.gc.drawImage(workImage, 0, 0, imageBounds.width, imageBounds.height, //
-								0, 0, imageBounds.width / 2, imageBounds.height / 2);
-						break;
-					case 100:
-						e.gc.drawImage(workImage, 0, 0);
-						break;
-					default:
-						e.gc.drawImage(workImage, 0, 0, imageBounds.width, imageBounds.height, //
-								0, 0, imageBounds.width * zoom / 100, imageBounds.height * zoom / 100);
-						break;
-					}
-					drawSelection(e.gc);
-				} else {
-//					page.setErrorMessage("Screenshot required");
-					fitAction.setEnabled(false);
-				}
-			}
-		});
-
-		scrolledComposite.addControlListener(new ControlAdapter() {
-			@Override
-			public void controlResized(ControlEvent e) {
-				if (fitAction.getSelect() == SelectToolAction.ZOOM_FIT) {
-					refreshCanvasSize();
-				}
-			}
-		});
-		scrolledComposite.setEnabled(false);
-
-		vf.setTopLeft(tbm.createControl(vf));
-		vf.setContent(body);
-		registerMouseListeners();
-
-		vf.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Dialog.applyDialogFont(vf);
-	}
-
-	private void createPaletteBars(Composite body) {
-		paletteArea = new Composite(body, SWT.NONE);
-		paletteArea.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		RowLayout rowlayout = new RowLayout(SWT.VERTICAL);
-		rowlayout.marginRight += 1;
-		paletteArea.setLayout(rowlayout);
-
-		paletteArea.addListener(SWT.Paint, new Listener() {
-			public void handleEvent(Event e) {
-				Color gcForeground = e.gc.getForeground();
-				Rectangle bounds = ((Composite) e.widget).getBounds();
-				Color border = e.widget.getDisplay().getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
-				e.gc.setForeground(border);
-				e.gc.drawLine(bounds.width - 1, 0, bounds.width - 1, bounds.height);
-				e.gc.setForeground(gcForeground);
-			}
-		});
-		paletteArea.addMenuDetectListener(new MenuDetectListener() {
-
-			public void menuDetected(MenuDetectEvent e) {
-				Menu rightClickMenu = new Menu(Display.getDefault().getActiveShell(), SWT.POP_UP);
-				MenuItem menuItem = new MenuItem(rightClickMenu, SWT.CHECK);
-				menuItem.setText(Messages.ScreenshotCreationPage_Show_Line_Type_Selector);
-				menuItem.setSelection(lineTypeToolbar.getVisible());
-				menuItem.addListener(SWT.Selection, new Listener() {
-					public void handleEvent(final Event event) {
-						lineTypeToolbar.setVisible(!lineTypeToolbar.getVisible());
-						paletteArea.layout();
-					}
-				});
-				menuItem = new MenuItem(rightClickMenu, SWT.CHECK);
-				menuItem.setText(Messages.ScreenshotCreationPage_Show_Line_Bold_Selector);
-				menuItem.setSelection(lineBoldToolbar.getVisible());
-				menuItem.addListener(SWT.Selection, new Listener() {
-					public void handleEvent(final Event event) {
-						lineBoldToolbar.setVisible(!lineBoldToolbar.getVisible());
-						paletteArea.layout();
-					}
-				});
-				rightClickMenu.setLocation(e.x, e.y);
-				rightClickMenu.setVisible(true);
-			}
-		});
-		drawLineToolbar = new SelectToolAction(paletteArea, SelectToolAction.DRAWLINE_TOOLBAR) {
-
-			@Override
-			public void run() {
-				markAction.run();
-				drawArrowToolbar.setUnselect();
-				drawBoxToolbar.setUnselect();
-				drawTextToolbar.setUnselect();
-				drawColorToolbar.setEnabled(true);
-				lineTypeToolbar.setEnabled(true);
-				lineBoldToolbar.setEnabled(true);
-			}
-		};
-		drawLineToolbar.setEnabled(false);
-		drawArrowToolbar = new SelectToolAction(paletteArea, SelectToolAction.DRAWARROW_TOOLBAR) {
-
-			@Override
-			public void run() {
-				markAction.run();
-				drawLineToolbar.setUnselect();
-				drawBoxToolbar.setUnselect();
-				drawTextToolbar.setUnselect();
-				drawColorToolbar.setEnabled(true);
-				lineTypeToolbar.setEnabled(true);
-				lineBoldToolbar.setEnabled(true);
-			}
-		};
-		drawArrowToolbar.setEnabled(false);
-		drawBoxToolbar = new SelectToolAction(paletteArea, SelectToolAction.DRAWBOX_TOOLBAR) {
-
-			@Override
-			public void run() {
-				markAction.run();
-				drawLineToolbar.setUnselect();
-				drawArrowToolbar.setUnselect();
-				drawTextToolbar.setUnselect();
-				drawColorToolbar.setEnabled(true);
-				lineTypeToolbar.setEnabled(true);
-				lineBoldToolbar.setEnabled(true);
-			}
-		};
-		drawBoxToolbar.setEnabled(false);
-		drawTextToolbar = new SelectToolAction(paletteArea, SelectToolAction.DRAWTEXT_TOOLBAR) {
-
-			@Override
-			public void run() {
-				markAction.run();
-				drawLineToolbar.setUnselect();
-				drawArrowToolbar.setUnselect();
-				drawBoxToolbar.setUnselect();
-				drawColorToolbar.setEnabled(false);
-				lineTypeToolbar.setEnabled(false);
-				lineBoldToolbar.setEnabled(false);
-			}
-		};
-		drawTextToolbar.setEnabled(false);
-		drawColorToolbar = new SelectToolAction(paletteArea, SelectToolAction.COLOR_TOOLBAR);
-		drawColorToolbar.setEnabled(false);
-		lineTypeToolbar = new SelectToolAction(paletteArea, SelectToolAction.LINETYPE_TOOLBAR);
-		lineTypeToolbar.setEnabled(false);
-		lineTypeToolbar.setVisible(false);
-		lineBoldToolbar = new SelectToolAction(paletteArea, SelectToolAction.LINEBOLD_TOOLBAR);
-		lineBoldToolbar.setEnabled(false);
-		lineBoldToolbar.setVisible(false);
-	}
-
-	private void setSelectDrawToolbar(int drawTool) {
-		if (drawLineToolbar.setSelect(drawTool)) {
-			drawArrowToolbar.setUnselect();
-			drawBoxToolbar.setUnselect();
-			drawTextToolbar.setUnselect();
-			return;
-		}
-		if (drawArrowToolbar.setSelect(drawTool)) {
-			drawLineToolbar.setUnselect();
-			drawBoxToolbar.setUnselect();
-			drawTextToolbar.setUnselect();
-			return;
-		}
-		if (drawBoxToolbar.setSelect(drawTool)) {
-			drawLineToolbar.setUnselect();
-			drawArrowToolbar.setUnselect();
-			drawTextToolbar.setUnselect();
-			return;
-		}
-		drawLineToolbar.setUnselect();
-		drawArrowToolbar.setUnselect();
-		drawBoxToolbar.setUnselect();
-		drawTextToolbar.setSelect(drawTool);
-	}
-
-	private void unselectDrawToolbar() {
-		drawLineToolbar.setUnselect();
-		drawArrowToolbar.setUnselect();
-		drawBoxToolbar.setUnselect();
-		drawTextToolbar.setUnselect();
-	}
-
-	private int getSelectDrawToolbar() {
-		int drawTool;
-		if ((drawTool = drawLineToolbar.getSelect()) >= 0) {
-			return drawTool;
-		}
-		if ((drawTool = drawArrowToolbar.getSelect()) >= 0) {
-			return drawTool;
-		}
-		if ((drawTool = drawBoxToolbar.getSelect()) >= 0) {
-			return drawTool;
-		}
-		if ((drawTool = drawTextToolbar.getSelect()) >= 0) {
-			return drawTool;
-		}
-		return -1;
-	}
-
-	private ActionContributionItem createAndConfigureCI(IAction action) {
-		ActionContributionItem ci = new ActionContributionItem(action);
-		ci.setMode(ActionContributionItem.MODE_FORCE_TEXT);
-		return ci;
-	}
-
-	@Override
-	public void dispose() {
-		disposeImageResources();
-
-		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 * scaleFactor)) - x;
-		int height = Math.min(bottom, (int) Math.round(workImage.getBounds().height * scaleFactor)) - y;
-		return new Rectangle(x, y, width, height);
-	}
-
-	private Rectangle getOutsideSelection(Rectangle rectangle) {
-		if (rectangle == null) {
-			return null;
-		}
-		return new Rectangle(rectangle.x - SQUARE_SIZE * 2, rectangle.y - SQUARE_SIZE * 2, //
-				rectangle.width + SQUARE_SIZE * 4 + 1, rectangle.height + SQUARE_SIZE * 4 + 1);
-	}
-
-	private static final int[][] grapGroupPoints = { //
-	/*    */{ 0, 0, 0 }, { 1, 0, 0 }, { 2, 0, 1 }, { 3, 0, 2 }, { 4, 0, 2 }, //
-			{ 0, 1, 0 }, /*         *//*         *//*         */{ 4, 1, 2 }, //
-			{ 0, 2, 3 }, /*         *//*         *//*         */{ 4, 2, 4 }, //
-			{ 0, 3, 5 }, /*         *//*         *//*         */{ 4, 3, 7 }, //
-			{ 0, 4, 5 }, { 1, 4, 5 }, { 2, 4, 6 }, { 3, 4, 7 }, { 4, 4, 7 } };
-
-	private static final int[] grapScanOrder = { 0, 4, 1, 3, 2 };
-
-	private int getGrabPoint(int x, int y) {
-		if (currentSelection == null) {
-			return -1;
-		}
-
-		Rectangle inside = getScaledSelection();
-		Rectangle outside = getOutsideSelection(inside);
-		int[] xGroupPoint = { outside.x, //
-				inside.x, //
-				inside.x + SQUARE_SIZE * 4, //
-				inside.x + inside.width - SQUARE_SIZE * 4, //
-				inside.x + inside.width, //
-				outside.x + outside.width };
-		int[] yGroupPoint = { outside.y, //
-				inside.y, //
-				inside.y + SQUARE_SIZE * 4, //
-				inside.y + inside.height - SQUARE_SIZE * 4, //
-				inside.y + inside.height, //
-				outside.y + outside.height };
-		int xGroup = -1, yGroup = -1;
-		for (int element : grapScanOrder) {
-			if (xGroupPoint[element] <= x && x <= xGroupPoint[element + 1]) {
-				xGroup = element;
-				break;
-			}
-		}
-		if (xGroup < 0) {
-			return -1;
-		}
-		for (int element : grapScanOrder) {
-			if (yGroupPoint[element] <= y && y <= yGroupPoint[element + 1]) {
-				yGroup = element;
-				break;
-			}
-		}
-		if (yGroup < 0) {
-			return -1;
-		}
-		for (int[] element : grapGroupPoints) {
-			if (element[0] == xGroup && element[1] == yGroup) {
-				return element[2];
-			}
-		}
-		return -1;
-	}
-
-	@Override
-	public boolean isPageComplete() {
-		return workImage != null;
-	}
-
-	@Override
-	public boolean canFlipToNextPage() {
-		return isPageComplete();
-	}
-
-	private void captureScreenshotContent(Image image) {
-		final Display display = getShell().getDisplay();
-		disposeImageResources();
-		originalImage = image;
-		Rectangle displayBounds = originalImage.getBounds();
-		workImage = new Image(display, displayBounds.width, displayBounds.height);
-		GC gc = new GC(workImage);
-		gc.drawImage(originalImage, 0, 0);
-		gc.dispose();
-
-		workImageGC = new GC(workImage);
-		workImageGC.setLineCap(SWT.CAP_ROUND);
-
-		scrolledComposite.setEnabled(true);
-		clearSelection();
-		refreshCanvasSize();
-
-		setPageComplete(true);
-	}
-
-	private void captureScreenshotContentFromSelection() {
-		Display display = getShell().getDisplay();
-
-		Image image = new Image(display, currentSelection);
-		GC gc = new GC(image);
-		gc.drawImage(workImage, currentSelection.x, currentSelection.y, currentSelection.width,
-				currentSelection.height, 0, 0, currentSelection.width, currentSelection.height);
-		gc.dispose();
-		disposeImageResources();
-
-		originalImage = image;
-		Rectangle displayBounds = originalImage.getBounds();
-		workImage = new Image(display, displayBounds.width, displayBounds.height);
-		gc = new GC(workImage);
-		gc.drawImage(originalImage, 0, 0);
-		gc.dispose();
-
-		workImageGC = new GC(workImage);
-		workImageGC.setLineCap(SWT.CAP_ROUND);
-
-		scrolledComposite.setEnabled(true);
-		clearSelection();
-		refreshCanvasSize();
-
-		setPageComplete(true);
-	}
-
-	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.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);
-	}
-
-	private static final int grabPointCurosr[] = { SWT.CURSOR_SIZENWSE, SWT.CURSOR_SIZENS, SWT.CURSOR_SIZENESW,
-			SWT.CURSOR_SIZEWE, SWT.CURSOR_SIZEWE, SWT.CURSOR_SIZENESW, SWT.CURSOR_SIZENS, SWT.CURSOR_SIZENWSE };
-
-	private static final SelectionSide[][] grabPointResizableSides = { { SelectionSide.LEFT, SelectionSide.TOP },
-			{ SelectionSide.TOP }, { SelectionSide.TOP, SelectionSide.RIGHT }, { SelectionSide.LEFT },
-			{ SelectionSide.RIGHT }, { SelectionSide.LEFT, SelectionSide.BOTTOM }, { SelectionSide.BOTTOM },
-			{ 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 > 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 > 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;
-		}
-	}
-
-	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 > imageBounds.width) {
-			newX = imageBounds.width - originalSelection.width;
-		}
-		if (newY + originalSelection.height > imageBounds.height) {
-			newY = imageBounds.height - originalSelection.height;
-		}
-		currentSelection = new Rectangle(newX, newY, originalSelection.width, originalSelection.height);
-	}
-
-	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
-					int info = getGrabPoint(e.x, e.y);
-					if (info >= 0) {
-						canvas.setCursor(cursors.get(grabPointCurosr[info]));
-						cursorSet = true;
-					}
-
-					// 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) {
-					if (startPoint != null) {
-						int drawTool = getSelectDrawToolbar();
-						if (drawTool == SelectToolAction.DRAW_FREE) {
-							int[] history = new int[3];
-							history[0] = SWT.MouseMove;
-							history[1] = scaledX;
-							history[2] = scaledY;
-							historyMouseEvent.add(history);
-						} else {
-							int[] history = historyMouseEvent.get(historyMouseEvent.size() - 1);
-							if (history[0] == SWT.MouseMove) {
-								history[1] = scaledX;
-								history[2] = scaledY;
-							} else {
-								history = new int[3];
-								history[0] = SWT.MouseMove;
-								history[1] = scaledX;
-								history[2] = scaledY;
-								historyMouseEvent.add(history);
-							}
-						}
-					}
-
-					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;
-					}
-
-					startPoint = null;
-					currentAction = EditorAction.CROPPING;
-
-					canvas.redraw();
-					setImageDirty(true);
-				} else if (currentAction == EditorAction.MARKING) {
-					if (startPoint != null) {
-						int drawTool = getSelectDrawToolbar();
-						if (drawTool != SelectToolAction.DRAW_FREE) {
-							if (drawTool == SelectToolAction.DRAW_TEXT) {
-								drawAnnotationText();
-							}
-							previousImage.dispose();
-							previousImage = null;
-						}
-
-						int[] history = new int[3];
-						history[0] = SWT.MouseUp;
-						history[1] = 0;
-						history[2] = 0;
-						historyMouseEvent.add(history);
-					}
-
-					startPoint = null;
-					setImageDirty(true);
-				}
-			}
-
-			/**
-			 * Input annotation text and draw text
-			 */
-			private void drawAnnotationText() {
-				workImageGC.drawImage(previousImage, 0, 0);
-				canvas.redraw();
-
-				int[] history = historyMouseEvent.get(historyMouseEvent.size() - 1);
-				if (history[0] != SWT.MouseMove) {
-					historyCheckpoint--;
-					updateAnnotationHistory();
-					return;
-				}
-
-				int endedPoint_x, endedPoint_y;
-				if (history[1] < startPoint.x) {
-					endedPoint_x = startPoint.x;
-					startPoint.x = history[1];
-				} else {
-					endedPoint_x = history[1];
-				}
-				if (history[2] < startPoint.y) {
-					endedPoint_y = startPoint.y;
-					startPoint.y = history[2];
-				} else {
-					endedPoint_y = history[2];
-				}
-				final Rectangle bounds = new Rectangle(startPoint.x, startPoint.y, endedPoint_x - startPoint.x,
-						endedPoint_y - startPoint.y);
-				textArea = new Text(canvas, SWT.MULTI | SWT.WRAP);
-				int xs = (int) Math.round(startPoint.x * scaleFactor);
-				int ys = (int) Math.round(startPoint.y * scaleFactor);
-				int xe = (int) Math.round(endedPoint_x * scaleFactor);
-				int ye = (int) Math.round(endedPoint_y * scaleFactor);
-				textArea.setBounds(new Rectangle(xs, ys, xe - xs, ye - ys));
-				FontData fontData = new FontData(drawTextToolbar.getStringCustom());
-				if (scaleFactor != 1.0) {
-					fontData.setHeight((int) Math.round(fontData.getHeight() * scaleFactor));
-				}
-				textArea.setFont(new Font(getShell().getDisplay(), fontData));
-				textArea.setForeground(new Color(getShell().getDisplay(),
-						SelectToolAction.int2rgb(drawTextToolbar.getIntgerCustom())));
-				textArea.setTabs(1);
-				Point point = textArea.getCaretLocation();
-				textArea.setBounds(new Rectangle(xs - point.x, ys, xe - xs + point.x + point.x, ye - ys));
-				textArea.setFocus();
-				textArea.addListener(SWT.Deactivate, new Listener() {
-
-					public void handleEvent(Event event) {
-						String text = textArea.getText();
-						{
-							String newtext = ""; //$NON-NLS-1$
-							int currpos = 0;
-							int charpos = currpos;
-							textArea.setTopIndex(0);
-							textArea.setSelection(currpos);
-							int linepos = textArea.getCaretLineNumber();
-							boolean remove1st = false;
-							String line;
-							while (currpos < text.length()) {
-								int y = textArea.getCaretLineNumber();
-								if (linepos != y) {
-									line = text.substring(charpos, currpos);
-									if (line.endsWith("\n")) { //$NON-NLS-1$
-										line = line.substring(0, line.length() - 1);
-									}
-									newtext = newtext + "\n" + line; //$NON-NLS-1$
-									remove1st = true;
-									charpos = currpos;
-									linepos = y;
-								}
-								currpos++;
-								textArea.setSelection(currpos);
-							}
-							line = text.substring(charpos, currpos);
-							if (line.endsWith("\n")) { //$NON-NLS-1$
-								line = line.substring(0, line.length() - 1);
-							}
-							if (line.length() > 0) {
-								newtext = newtext + "\n" + text.substring(charpos, currpos); //$NON-NLS-1$
-								remove1st = true;
-							}
-							currpos = newtext.indexOf("\r"); //$NON-NLS-1$
-							while (currpos > 0) {
-								newtext = newtext.substring(0, currpos) + newtext.substring(currpos + 1);
-								currpos = newtext.indexOf("\r"); //$NON-NLS-1$
-							}
-							newtext = newtext.replace("\t", " "); //$NON-NLS-1$//$NON-NLS-2$
-							if (remove1st) {
-								newtext = newtext.substring(1);
-							}
-							text = newtext;
-						}
-
-						textArea.dispose();
-						textArea = null;
-
-						if (text.length() > 0) {
-							historyDrawText.get(historyCheckpoint - 1).append(text);
-							Color color = workImageGC.getForeground();
-							FontData fontData = new FontData(drawTextToolbar.getStringCustom());
-							workImageGC.setFont(new Font(getShell().getDisplay(), fontData));
-							workImageGC.setForeground(new Color(getShell().getDisplay(),
-									SelectToolAction.int2rgb(drawTextToolbar.getIntgerCustom())));
-							workImageGC.setClipping(bounds);
-							workImageGC.drawText(text, bounds.x, bounds.y, true);
-							workImageGC.setClipping((Rectangle) null);
-							workImageGC.setForeground(color);
-						} else {
-							historyCheckpoint--;
-							updateAnnotationHistory();
-						}
-						canvas.redraw();
-					}
-				});
-			}
-
-			/**
-			 * 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) {
-					updateAnnotationHistory();
-
-					int drawTool = getSelectDrawToolbar();
-					int[] history = new int[5];
-					history[0] = historyMouseEvent.size();
-					history[1] = drawTool;
-					history[2] = (lineTypeToolbar != null) ? lineTypeToolbar.getSelect() : SWT.LINE_DOT;
-					history[3] = (lineBoldToolbar != null) ? lineBoldToolbar.getSelect() : 1;
-					RGB rgb;
-					if (drawTool == SelectToolAction.DRAW_TEXT) {
-						rgb = SelectToolAction.int2rgb(drawTextToolbar.getIntgerCustom());
-					} else {
-						rgb = SelectToolAction.int2rgb(drawColorToolbar.getSelect());
-					}
-					history[4] = (rgb.red << 16) + (rgb.green << 8) + rgb.blue;
-					historyDrawTool.add(history);
-					historyDrawText.add(new StringBuffer());
-					if (drawTool == SelectToolAction.DRAW_TEXT) {
-						FontData fontData = new FontData(drawTextToolbar.getStringCustom());
-						historyDrawFont.add(fontData.toString());
-					} else {
-						historyDrawFont.add(""); //$NON-NLS-1$
-					}
-					historyCheckpoint = historyDrawTool.size();
-
-					history = new int[3];
-					history[0] = SWT.MouseDown;
-					history[1] = scaledX;
-					history[2] = scaledY;
-					historyMouseEvent.add(history);
-					undoAction.setEnabled(true);
-
-					if (drawTool != SelectToolAction.DRAW_FREE) {
-						Display display = getShell().getDisplay();
-						previousImage = new Image(display, workImage.getBounds());
-						GC gc = new GC(previousImage);
-						gc.drawImage(workImage, 0, 0);
-						gc.dispose();
-					}
-
-					if (drawTool != SelectToolAction.DRAW_TEXT) {
-						workImageGC.setLineStyle(lineTypeToolbar.getSelect());
-						workImageGC.setLineWidth(lineBoldToolbar.getSelect());
-						workImageGC.setForeground(new Color(getShell().getDisplay(),
-								SelectToolAction.int2rgb(drawColorToolbar.getSelect())));
-					} else {
-						workImageGC.setLineStyle(SWT.LINE_DOT);
-						workImageGC.setLineWidth(1);
-						workImageGC.setForeground(new Color(getShell().getDisplay(), 0, 0, 0));
-					}
-
-					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) {
-					int info = getGrabPoint(e.x, e.y);
-					if (info >= 0) {
-						originalSelection = currentSelection;
-						currentAction = EditorAction.RESIZING_SELECTION;
-						resizableSides = new HashSet<SelectionSide>();
-						for (SelectionSide side : grabPointResizableSides[info]) {
-							resizableSides.add(side);
-						}
-						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);
-
-				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.getSelect() == SelectToolAction.ZOOM_FIT) {
-			// 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();
-				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 = fitAction.getSelect(); // 50, 100, 200, 400 or 800
-			scaleFactor = scaleFactor / 100;
-			Rectangle bounds = scrolledComposite.getClientArea();
-			if (workImage != null) {
-				Rectangle imageBounds = workImage.getBounds();
-				bounds.width = (int) Math.round(imageBounds.width * scaleFactor);
-				bounds.height = (int) Math.round(imageBounds.height * scaleFactor);
-			}
-			canvas.setBounds(bounds);
-		}
-
-		canvas.redraw();
-	}
-
-	private void updateAnnotationHistory() {
-		int[] history;
-		if (historyCheckpoint < historyDrawTool.size()) {
-			history = historyDrawTool.get(historyCheckpoint);
-			while (history[0] < historyMouseEvent.size()) {
-				historyMouseEvent.remove(historyMouseEvent.size() - 1);
-			}
-			while (historyCheckpoint < historyDrawTool.size()) {
-				historyDrawTool.remove(historyDrawTool.size() - 1);
-			}
-			while (historyCheckpoint < historyDrawText.size()) {
-				historyDrawText.remove(historyDrawText.size() - 1);
-			}
-			while (historyCheckpoint < historyDrawFont.size()) {
-				historyDrawFont.remove(historyDrawFont.size() - 1);
-			}
-			redoAction.setEnabled(false);
-		}
-
-		undoAction.setEnabled(historyCheckpoint > 0);
-	}
-
-	/**
-	 * Draw Annotation with history
-	 */
-	private void drawAnnotationHistory() {
-		workImageGC.drawImage(originalImage, 0, 0);
-		Color backBackground = workImageGC.getBackground();
-		Color backForeground = workImageGC.getForeground();
-		int backLineStyle = workImageGC.getLineStyle();
-		int backLineWidth = workImageGC.getLineWidth();
-		int[] history;
-		for (int c = 0; c < historyCheckpoint; c++) {
-			history = historyDrawTool.get(c);
-			int toolKind = history[1];
-			int boldlKind = history[3];
-			workImageGC.setLineStyle(history[2]);
-			workImageGC.setLineWidth(boldlKind);
-			workImageGC.setForeground(new Color(getShell().getDisplay(), //
-					history[4] >> 16, //
-					(history[4] >> 8) & 0x00ff, //
-					history[4] & 0x00ff));
-
-			int h = history[0];
-			history = historyMouseEvent.get(h);
-			int start_x = history[1];
-			int start_y = history[2];
-			for (h++; h < historyMouseEvent.size(); h++) {
-				history = historyMouseEvent.get(h);
-				if (history[0] == SWT.MouseUp) {
-					break;
-				}
-				int x = history[1];
-				int y = history[2];
-				if (toolKind == SelectToolAction.DRAW_FREE) {
-					workImageGC.drawLine(start_x, start_y, x, y);
-					start_x = x;
-					start_y = y;
-				} else {
-					if (start_x == x && start_y == y) {
-						workImageGC.drawLine(start_x, start_y, x, y);
-					} else {
-						int rounded;
-						int width = x - start_x;
-						int height = y - start_y;
-						switch (toolKind) {
-						case SelectToolAction.DRAW_LINE:
-							workImageGC.drawLine(start_x, start_y, x, y);
-							break;
-						case SelectToolAction.DRAW_ARROW1:
-							workImageGC.setBackground(workImageGC.getForeground());
-							drawArrowLine(start_x, start_y, x, y, false);
-							break;
-						case SelectToolAction.DRAW_ARROW2:
-							workImageGC.setBackground(workImageGC.getForeground());
-							drawArrowLine(start_x, start_y, x, y, true);
-							break;
-						case SelectToolAction.DRAW_BOX:
-							workImageGC.drawRectangle(start_x, start_y, width, height);
-							break;
-						case SelectToolAction.DRAW_RBOX:
-							rounded = boldlKind * 8;
-							workImageGC.drawRoundRectangle(start_x, start_y, width, height, rounded, rounded);
-							break;
-						case SelectToolAction.DRAW_OVAL:
-							workImageGC.drawOval(start_x, start_y, width, height);
-							break;
-						case SelectToolAction.DRAW_FILL_BOX:
-							workImageGC.setBackground(workImageGC.getForeground());
-							workImageGC.fillRectangle(start_x, start_y, width, height);
-							break;
-						case SelectToolAction.DRAW_FILL_RBOX:
-							rounded = boldlKind * 8;
-							workImageGC.setBackground(workImageGC.getForeground());
-							workImageGC.fillRoundRectangle(start_x, start_y, width, height, rounded, rounded);
-							break;
-						case SelectToolAction.DRAW_FILL_OVAL:
-							workImageGC.setBackground(workImageGC.getForeground());
-							workImageGC.fillOval(start_x, start_y, width, height);
-							break;
-						case SelectToolAction.DRAW_TEXT:
-							StringBuffer text = historyDrawText.get(c);
-							{
-								Font backFont = workImageGC.getFont();
-								FontData fontData = new FontData(historyDrawFont.get(c));
-								workImageGC.setFont(new Font(getShell().getDisplay(), fontData));
-								workImageGC.setClipping(start_x, start_y, width, height);
-								workImageGC.drawText(text.toString(), start_x, start_y, true);
-								workImageGC.setClipping((Rectangle) null);
-								workImageGC.setFont(backFont);
-							}
-							break;
-						}
-					}
-				}
-			}
-		}
-		workImageGC.setBackground(backBackground);
-		workImageGC.setForeground(backForeground);
-		workImageGC.setLineStyle(backLineStyle);
-		workImageGC.setLineWidth(backLineWidth);
-
-		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 inside = getScaledSelection();
-
-		// Draw shadow
-		gc.setBackground(CommonColors.GRAY_MID);
-		gc.setAdvanced(true);
-		gc.setAlpha(120);
-
-		Region invertedSelection = new Region();
-		invertedSelection.add(canvas.getClientArea());
-		invertedSelection.subtract(inside);
-		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(inside);
-
-//		// 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);
-//		}
-		gc.setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
-		Rectangle outside = getOutsideSelection(inside);
-		gc.drawRectangle(outside);
-		gc.setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
-		gc.fillRectangle(outside.x, outside.y, //
-				SQUARE_SIZE * 6, SQUARE_SIZE * 2);
-		gc.fillRectangle(outside.x + outside.width - SQUARE_SIZE * 6, outside.y, //
-				SQUARE_SIZE * 6, SQUARE_SIZE * 2);
-		gc.fillRectangle(outside.x, outside.y, //
-				SQUARE_SIZE * 2, SQUARE_SIZE * 6);
-		gc.fillRectangle(outside.x + outside.width - SQUARE_SIZE * 2, outside.y, //
-				SQUARE_SIZE * 2, SQUARE_SIZE * 6);
-		gc.fillRectangle(outside.x, outside.y + outside.height - SQUARE_SIZE * 6, //
-				SQUARE_SIZE * 2, SQUARE_SIZE * 6);
-		gc.fillRectangle(outside.x + outside.width - SQUARE_SIZE * 2, outside.y + outside.height - SQUARE_SIZE * 6, //
-				SQUARE_SIZE * 2, SQUARE_SIZE * 6);
-		gc.fillRectangle(outside.x, outside.y + outside.height - SQUARE_SIZE * 2, //
-				SQUARE_SIZE * 6, SQUARE_SIZE * 2);
-		gc.fillRectangle(outside.x + outside.width - SQUARE_SIZE * 6, outside.y + outside.height - SQUARE_SIZE * 2, //
-				SQUARE_SIZE * 6, SQUARE_SIZE * 2);
-	}
-
-	/**
-	 * Connects the previous mark point to the new reference point, by drawing a new line, rectangle or oval
-	 */
-	private void drawMarkLine(int x, int y) {
-		if (startPoint != null) {
-			clearAction.setEnabled(true);
-			int drawTool = getSelectDrawToolbar();
-			if (drawTool == SelectToolAction.DRAW_FREE) {
-				workImageGC.drawLine(startPoint.x, startPoint.y, x, y);
-				startPoint.x = x;
-				startPoint.y = y;
-			} else {
-				workImageGC.drawImage(previousImage, 0, 0);
-				if (startPoint.x == x && startPoint.y == y) {
-					workImageGC.drawLine(startPoint.x, startPoint.y, x, y);
-				} else {
-					Color backColor;
-					Color markColor;
-					int rounded;
-					int width = x - startPoint.x;
-					int height = y - startPoint.y;
-					switch (drawTool) {
-					case SelectToolAction.DRAW_LINE:
-						workImageGC.drawLine(startPoint.x, startPoint.y, x, y);
-						break;
-					case SelectToolAction.DRAW_ARROW1:
-						backColor = workImageGC.getBackground();
-						markColor = new Color(getShell().getDisplay(),
-								SelectToolAction.int2rgb(drawColorToolbar.getSelect()));
-						workImageGC.setBackground(markColor);
-						drawArrowLine(startPoint.x, startPoint.y, x, y, false);
-						workImageGC.setBackground(backColor);
-						break;
-					case SelectToolAction.DRAW_ARROW2:
-						backColor = workImageGC.getBackground();
-						markColor = new Color(getShell().getDisplay(),
-								SelectToolAction.int2rgb(drawColorToolbar.getSelect()));
-						workImageGC.setBackground(markColor);
-						drawArrowLine(startPoint.x, startPoint.y, x, y, true);
-						workImageGC.setBackground(backColor);
-						break;
-					case SelectToolAction.DRAW_BOX:
-						workImageGC.drawRectangle(startPoint.x, startPoint.y, width, height);
-						break;
-					case SelectToolAction.DRAW_RBOX:
-						rounded = lineBoldToolbar.getSelect() * 8;
-						workImageGC.drawRoundRectangle(startPoint.x, startPoint.y, width, height, rounded, rounded);
-						break;
-					case SelectToolAction.DRAW_OVAL:
-						workImageGC.drawOval(startPoint.x, startPoint.y, width, height);
-						break;
-					case SelectToolAction.DRAW_FILL_BOX:
-						backColor = workImageGC.getBackground();
-						markColor = new Color(getShell().getDisplay(),
-								SelectToolAction.int2rgb(drawColorToolbar.getSelect()));
-						workImageGC.setBackground(markColor);
-						workImageGC.fillRectangle(startPoint.x, startPoint.y, width, height);
-						workImageGC.setBackground(backColor);
-						break;
-					case SelectToolAction.DRAW_FILL_RBOX:
-						rounded = lineBoldToolbar.getSelect() * 8;
-						backColor = workImageGC.getBackground();
-						markColor = new Color(getShell().getDisplay(),
-								SelectToolAction.int2rgb(drawColorToolbar.getSelect()));
-						workImageGC.setBackground(markColor);
-						workImageGC.fillRoundRectangle(startPoint.x, startPoint.y, width, height, rounded, rounded);
-						workImageGC.setBackground(backColor);
-						break;
-					case SelectToolAction.DRAW_FILL_OVAL:
-						backColor = workImageGC.getBackground();
-						markColor = new Color(getShell().getDisplay(),
-								SelectToolAction.int2rgb(drawColorToolbar.getSelect()));
-						workImageGC.setBackground(markColor);
-						workImageGC.fillOval(startPoint.x, startPoint.y, width, height);
-						workImageGC.setBackground(backColor);
-						break;
-					case SelectToolAction.DRAW_TEXT:
-						workImageGC.fillRectangle(startPoint.x, startPoint.y, width, height);
-						workImageGC.drawRectangle(startPoint.x, startPoint.y, width, height);
-						break;
-					}
-				}
-			}
-			canvas.redraw();
-		}
-	}
-
-	public void drawArrowLine(int xs, int ys, int xe, int ye, boolean bothsides) {
-		int width = xe - xs, height = ye - ys;
-		int bold = workImageGC.getLineWidth();
-		int leng = (bold == 8) ? bold * 4 : (bold == 4) ? bold * 6 : (bold == 2) ? bold * 8 : bold * 10;
-		double delta = Math.PI / 6.0;
-		double theta = Math.atan2(height, width);
-
-		// Draw line
-		if (bothsides) {
-			workImageGC.drawLine( // 
-					xs + (int) (leng / 2 * Math.cos(theta)), //
-					ys + (int) (leng / 2 * Math.sin(theta)), //
-					xe - (int) (leng / 2 * Math.cos(theta)), //
-					ye - (int) (leng / 2 * Math.sin(theta)));
-		} else {
-			workImageGC.drawLine( //
-					xs, //
-					ys, //
-					xe - (int) (leng / 2 * Math.cos(theta)), //
-					ye - (int) (leng / 2 * Math.sin(theta)));
-		}
-
-		// Draw ending side arrow
-		workImageGC.setLineWidth(1);
-
-		int[] point = { xe, ye, //
-				xe - (int) (leng * Math.cos(theta - delta)), //
-				ye - (int) (leng * Math.sin(theta - delta)), //
-				xe - (int) (leng * Math.cos(theta + delta)), //
-				ye - (int) (leng * Math.sin(theta + delta)) };
-		workImageGC.fillPolygon(point);
-
-		// Draw starting side arrow
-		if (bothsides) {
-			int[] point2 = { xs, ys, //
-					xs + (int) (leng * Math.cos(theta - delta)), //
-					ys + (int) (leng * Math.sin(theta - delta)), //
-					xs + (int) (leng * Math.cos(theta + delta)), //
-					ys + (int) (leng * Math.sin(theta + delta)) };
-			workImageGC.fillPolygon(point2);
-		}
-
-		workImageGC.setLineWidth(bold);
-	}
-
-	private static enum SelectionSide {
-
-		LEFT, RIGHT, TOP, BOTTOM;
-
-	};
-
-	private static final int SQUARE_SIZE = 3;
-
-	/**
-	 * 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/SearchHistoryPopUpDialog.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/SearchHistoryPopUpDialog.java
deleted file mode 100644
index 37cc531..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/SearchHistoryPopUpDialog.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.Collection;
-import java.util.Collections;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.dialogs.PopupDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.IOpenListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.OpenEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-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.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-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.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-public class SearchHistoryPopUpDialog extends PopupDialog {
-
-	private static final int MAX_HISTORY_NO_FILTER = 3;
-
-	private static final int MAX_HISTORY_FILTER = 10;
-
-	private final int side;
-
-	private Rectangle trimBounds;
-
-	private TextSearchControl textSearchControl;
-
-	private Text textControl;
-
-	private TableViewer historyTable;
-
-	private TableTreePatternFilter patternFilter;
-
-	private Composite additionalControlsComposite;
-
-	public SearchHistoryPopUpDialog(Shell parent, int side) {
-		super(parent, PopupDialog.HOVER_SHELLSTYLE, false, false, false, false, false, null, null);
-		this.side = side;
-		updateBounds();
-	}
-
-	@Override
-	protected void initializeBounds() {
-		Rectangle monitorBounds = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getShell()
-				.getMonitor()
-				.getClientArea();
-		Rectangle bounds = getShell().getBounds();
-		int x = 0;
-		int y = 0;
-
-		switch (side) {
-		case SWT.TOP:
-			x = trimBounds.x;
-			y = trimBounds.y + trimBounds.height;
-			if (x + bounds.width > monitorBounds.x + monitorBounds.width) {
-				x = (trimBounds.x + trimBounds.width) - bounds.width;
-			}
-			break;
-		case SWT.BOTTOM:
-			x = trimBounds.x;
-			y = trimBounds.y - bounds.height;
-			if (x + bounds.width > monitorBounds.x + monitorBounds.width) {
-				x = (trimBounds.x + trimBounds.width) - bounds.width;
-			}
-			break;
-		case SWT.RIGHT:
-			x = (trimBounds.x + trimBounds.width) - bounds.width;
-			y = trimBounds.y + trimBounds.height;
-			break;
-		case SWT.LEFT:
-			x = trimBounds.x;
-			y = trimBounds.y + trimBounds.height;
-			break;
-		}
-		getShell().setBounds(x, y, Math.max(trimBounds.width, bounds.width), bounds.height);
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		getShell().setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
-		Control createDialogArea = createDialogArea(parent);
-		return createDialogArea;
-	}
-
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout();
-		gl.marginHeight = 0;
-		gl.marginWidth = 0;
-		gl.horizontalSpacing = 0;
-		gl.verticalSpacing = 0;
-		gl.numColumns = 1;
-		composite.setLayout(gl);
-
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(composite);
-
-		createTable(composite);
-
-		additionalControlsComposite = new Composite(composite, SWT.NONE);
-		gl = new GridLayout();
-		gl.marginHeight = 0;
-		gl.marginWidth = 0;
-		gl.horizontalSpacing = 0;
-		gl.verticalSpacing = 0;
-		gl.numColumns = 1;
-		additionalControlsComposite.setLayout(gl);
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(additionalControlsComposite);
-
-		createAdditionalSearchRegion(additionalControlsComposite);
-		if (additionalControlsComposite.getChildren().length == 0) {
-			additionalControlsComposite.dispose();
-			additionalControlsComposite = null;
-		}
-
-		parent.pack();
-
-		return parent;
-	}
-
-	private void createTable(Composite composite) {
-		historyTable = new TableViewer(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.NO_SCROLL);
-		TableColumn bindingNameColumn = new TableColumn(historyTable.getTable(), SWT.LEFT);
-		// XXX fix this
-		bindingNameColumn.setWidth(2000);
-		historyTable.setUseHashlookup(true);
-
-		historyTable.setContentProvider(new ITreeContentProvider() {
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-
-			}
-
-			public void dispose() {
-
-			}
-
-			public Object[] getElements(Object inputElement) {
-				if (inputElement instanceof Collection<?>) {
-					Object[] elements = ((Collection<?>) inputElement).toArray();
-					return reverseArray(elements);
-				}
-				return new Object[0];
-			}
-
-			public boolean hasChildren(Object element) {
-				return false;
-			}
-
-			public Object getParent(Object element) {
-				return null;
-			}
-
-			public Object[] getChildren(Object parentElement) {
-				return null;
-			}
-
-			private Object[] reverseArray(Object[] originalArray) {
-				int i = 0;
-				int j = originalArray.length - 1;
-
-				while (i < j) {
-					Object firstElement = originalArray[i];
-					originalArray[i] = originalArray[j];
-					originalArray[j] = firstElement;
-
-					i++;
-					j--;
-				}
-				return originalArray;
-			}
-
-		});
-
-		if (textSearchControl != null) {
-			historyTable.setInput(textSearchControl.getSearchHistory());
-		} else {
-			historyTable.setInput(Collections.emptyList());
-		}
-		historyTable.addOpenListener(new IOpenListener() {
-
-			public void open(OpenEvent event) {
-				String text = getTextFromSelection(event.getSelection());
-				if (text != null) {
-					textSearchControl.getTextControl().setText(text);
-					textControl.setSelection(text.length());
-					textSearchControl.addToSearchHistory(text);
-				}
-				close();
-			}
-
-		});
-
-		// XXX CHANGE TO SELECTION LISTENER??
-		historyTable.getTable().addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseDown(MouseEvent e) {
-				String text = getTextFromSelection(historyTable.getSelection());
-				if (text != null) {
-					textSearchControl.getTextControl().setText(text);
-					textSearchControl.addToSearchHistory(text);
-				}
-				textSearchControl.getTextControl().setFocus();
-				close();
-			}
-		});
-		patternFilter = new TableTreePatternFilter();
-		patternFilter.setIncludeLeadingWildcard(true);
-		patternFilter.setPattern(textSearchControl.getTextControl().getText());
-		historyTable.addFilter(patternFilter);
-		if (textControl.getText().length() > 0) {
-			historyTable.setSorter(new ViewerSorter());
-			historyTable.setItemCount(Math.min(historyTable.getTable().getItemCount(), MAX_HISTORY_FILTER));
-		} else {
-			historyTable.setSorter(null);
-			historyTable.setItemCount(Math.min(historyTable.getTable().getItemCount(), MAX_HISTORY_NO_FILTER));
-		}
-		GridDataFactory.fillDefaults().grab(true, false).hint(trimBounds.width, SWT.DEFAULT).applyTo(
-				historyTable.getTable());
-		setHistoryTableVisible(historyTable.getTable().getItemCount() > 0);
-	}
-
-	private void setHistoryTableVisible(boolean isVisible) {
-		GridData layoutData = (GridData) historyTable.getTable().getLayoutData();
-		historyTable.getTable().setVisible(isVisible);
-		boolean wasVisible = !layoutData.exclude;
-		layoutData.exclude = !isVisible;
-		if (wasVisible != isVisible || isVisible) {
-			getShell().pack();
-		}
-		initializeBounds();
-	}
-
-	private boolean shouldOpen() {
-		return (historyTable != null && historyTable.getTable() != null && historyTable.getTable().isVisible())
-				|| additionalControlsComposite != null;
-	}
-
-	private String getTextFromSelection(ISelection selection) {
-		if (selection instanceof StructuredSelection) {
-			Object firstElement = ((StructuredSelection) selection).getFirstElement();
-			if (firstElement instanceof String) {
-				return (String) firstElement;
-			}
-
-		}
-		return null;
-	}
-
-	private boolean isOpen = false;
-
-	@Override
-	public int open() {
-		if (!isOpen) {
-			isOpen = true;
-			int rc = super.open();
-			if (!shouldOpen()) {
-				close();
-			}
-			return rc;
-		}
-		return 0;
-	}
-
-	public void asyncClose() {
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				if ((textControl != null && !textControl.isDisposed() && textControl.isFocusControl())
-						|| !hasFocus(getShell())) {
-					close();
-				}
-			}
-		});
-	}
-
-	@Override
-	public boolean close() {
-		if (patternFilter != null) {
-			patternFilter.setPattern(null);
-		}
-		boolean b = super.close();
-		isOpen = !b;
-		return b;
-	}
-
-	private boolean updateBounds() {
-		Rectangle bounds;
-		if (textSearchControl == null || textSearchControl.getTextControl() == null
-				|| textSearchControl.getTextControl().isDisposed()) {
-			bounds = new Rectangle(0, 0, 0, 0);
-		} else {
-			bounds = textSearchControl.getBounds();
-			Point absPosition = textSearchControl.toDisplay(textSearchControl.getLocation());
-			bounds.x = absPosition.x - bounds.x;
-			bounds.y = absPosition.y - bounds.y;
-		}
-		if (trimBounds == null || !trimBounds.equals(bounds)) {
-			this.trimBounds = bounds;
-			return true;
-		}
-		return false;
-	}
-
-	public void attach(final TextSearchControl textSearchControl) {
-		Assert.isNotNull(textSearchControl);
-		Assert.isNotNull(textSearchControl.getTextControl());
-		this.textSearchControl = textSearchControl;
-		this.textControl = textSearchControl.getTextControl();
-		textSearchControl.addModifyListener(new ModifyListener() {
-
-			public void modifyText(ModifyEvent e) {
-				if (!hasFocus(textControl)) {
-					// user shouldn't be modifying the text if it doesnt have focus
-					return;
-				}
-				if (!isOpen && textControl != null && !textControl.isDisposed() && textControl.getText().length() > 0) {
-					updateBounds();
-					open();
-				}
-				if (isOpen && historyTable != null && !historyTable.getTable().isDisposed() && patternFilter != null) {
-					patternFilter.setPattern(textControl.getText());
-					historyTable.setSelection(null);
-					historyTable.refresh();
-					if (textControl.getText().length() > 0) {
-						historyTable.setSorter(new ViewerSorter());
-						historyTable.setItemCount(Math.min(historyTable.getTable().getItemCount(), MAX_HISTORY_FILTER));
-					} else {
-						historyTable.setSorter(null);
-						historyTable.setItemCount(Math.min(historyTable.getTable().getItemCount(),
-								MAX_HISTORY_NO_FILTER));
-					}
-					setHistoryTableVisible(historyTable.getTable().getItemCount() > 0);
-					if (!shouldOpen()) {
-						asyncClose();
-					}
-				}
-			}
-		});
-
-		textControl.addDisposeListener(new DisposeListener() {
-
-			public void widgetDisposed(DisposeEvent e) {
-				close();
-			}
-		});
-
-		textControl.addKeyListener(new KeyAdapter() {
-
-			@Override
-			public void keyPressed(KeyEvent e) {
-				if (e.character == SWT.ESC && isOpen) {
-					close();
-					e.doit = false;
-				} else if (e.stateMask == 0 && e.keyCode == SWT.ARROW_DOWN && isOpen && historyTable.getTable() != null
-						&& !historyTable.getTable().isDisposed() && historyTable.getTable().getItemCount() > 0) {
-					historyTable.getTable().select(0);
-					historyTable.getTable().setFocus();
-					e.doit = false;
-				} else if ((e.stateMask & SWT.MOD1) != 0 && e.keyCode == SWT.ARROW_DOWN && !isOpen) {
-					updateBounds();
-					open();
-					e.doit = false;
-				}
-			}
-		});
-
-		Listener moveResizeListener = new Listener() {
-
-			public void handleEvent(Event event) {
-				if (isOpen) {
-					if (updateBounds()) {
-						initializeBounds();
-					}
-				}
-			}
-		};
-		textSearchControl.addListener(SWT.Move, moveResizeListener);
-		textSearchControl.addListener(SWT.Resize, moveResizeListener);
-
-		textControl.addFocusListener(new FocusListener() {
-
-			public void focusLost(FocusEvent e) {
-				asyncClose();
-			}
-
-			public void focusGained(FocusEvent e) {
-			}
-		});
-	}
-
-	private boolean hasFocus(Control control) {
-		if (control != null && !control.isDisposed() && control.isFocusControl()) {
-			return true;
-		}
-		if (control instanceof Composite) {
-			for (Control child : ((Composite) control).getChildren()) {
-				if (hasFocus(child)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	protected void createAdditionalSearchRegion(Composite composite) {
-	}
-
-}
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 76e7f04..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/SelectionProviderAdapter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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, ISelectionChangedListener {
-
-	private ISelection selection;
-
-	/**
-	 * Constructs a <code>SelectionProviderAdapter</code> and initializes the selection to <code>selection</code>.
-	 * 
-	 * @param selection
-	 *            the initial selection
-	 * @see #setSelection(ISelection)
-	 */
-	public SelectionProviderAdapter(ISelection selection) {
-		setSelection(selection);
-	}
-
-	/**
-	 * Constructs a <code>SelectionProviderAdapter</code> with a <code>null</code> selection.
-	 */
-	public SelectionProviderAdapter() {
-	}
-
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		addListenerObject(listener);
-	}
-
-	public ISelection getSelection() {
-		return selection;
-	}
-
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		removeListenerObject(listener);
-	}
-
-	public void selectionChanged(final SelectionChangedEvent event) {
-		this.selection = event.getSelection();
-		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) {
-		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/TableTreePatternFilter.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/TableTreePatternFilter.java
deleted file mode 100644
index 42dfaaf..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/TableTreePatternFilter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.dialogs.PatternFilter;
-
-public class TableTreePatternFilter extends PatternFilter {
-
-	@Override
-	protected boolean isParentMatch(Viewer viewer, Object element) {
-		if (viewer instanceof AbstractTreeViewer) {
-			return super.isParentMatch(viewer, element);
-		}
-		return false;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/TextSearchControl.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/TextSearchControl.java
deleted file mode 100644
index 180ae6d..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/TextSearchControl.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.mylyn.internal.commons.ui.CommonsUiPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlEvent;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseMoveListener;
-import org.eclipse.swt.events.MouseTrackListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.WorkbenchMessages;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Shawn Minto
- */
-public class TextSearchControl extends Composite {
-
-	private static final String FIND_TEXT_MEMENTO_ELEMENT = "text"; //$NON-NLS-1$
-
-	private static final String FIND_MEMENTO_ELEMENT = "historyItem"; //$NON-NLS-1$
-
-	private static final String FIND_MEMENTO_TYPE = "filteredTreeFindHistory"; //$NON-NLS-1$
-
-	private static final int MAX_HISTORY_ITEMS = 50;
-
-	/**
-	 * Image descriptor for enabled clear button.
-	 */
-	private static final String CLEAR_ICON = "org.eclipse.ui.internal.dialogs.CLEAR_ICON"; //$NON-NLS-1$
-
-	/**
-	 * Image descriptor for enabled clear button.
-	 */
-	private static final String FIND_ICON = "org.eclipse.ui.internal.dialogs.FIND_ICON"; //$NON-NLS-1$
-
-	/* SWT STYLE BIT AVAILABLE ON 3.5 AND HIGHER */
-	public static final int ICON_SEARCH = 1 << 9;
-
-	/* SWT STYLE BIT AVAILABLE ON 3.5 AND HIGHER */
-	public static final int ICON_CANCEL = 1 << 8;
-
-	/**
-	 * Get image descriptors for the clear button.
-	 */
-	static {
-		ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PlatformUI.PLUGIN_ID,
-				"$nl$/icons/full/etool16/clear_co.gif"); //$NON-NLS-1$
-		if (descriptor != null) {
-			JFaceResources.getImageRegistry().put(CLEAR_ICON, descriptor);
-		}
-
-		descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(CommonsUiPlugin.ID_PLUGIN,
-				"$nl$/icons/etool16/find.png"); //$NON-NLS-1$
-		if (descriptor != null) {
-			JFaceResources.getImageRegistry().put(FIND_ICON, descriptor);
-		}
-	}
-
-	private final Text textControl;
-
-	private Control clearControl;
-
-	private Control findControl;
-
-	private final boolean automaticFind;
-
-	private final Set<SelectionListener> selectionListeners = new HashSet<SelectionListener>();
-
-	private Collection<String> searchHistory = new LinkedHashSet<String>();
-
-	private boolean hasHistorySupport;
-
-	private static Boolean useNativeSearchField;
-
-	@SuppressWarnings("restriction")
-	public TextSearchControl(Composite parent, boolean automaticFind, SearchHistoryPopUpDialog historyDialog) {
-		super(parent, getCompositeStyle(automaticFind, parent));
-		this.automaticFind = automaticFind;
-
-		int textStyle = SWT.SINGLE;
-		int numColumns = 1;
-		if (useNativeSearchField(automaticFind, parent)) {
-			if (automaticFind) {
-				textStyle |= SWT.SEARCH | ICON_CANCEL;
-			} else {
-				textStyle |= SWT.SEARCH | ICON_SEARCH | ICON_CANCEL;
-			}
-		} else {
-			super.setBackground(getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-			super.setFont(parent.getFont());
-			numColumns = 2;
-			if (!automaticFind) {
-				numColumns += 1;
-			}
-		}
-		GridLayoutFactory.swtDefaults()
-				.margins(0, 0)
-				.extendedMargins(0, 0, 0, 0)
-				.spacing(0, 1)
-				.numColumns(numColumns)
-				.applyTo(this);
-
-		textControl = new Text(this, textStyle);
-
-		GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
-		textControl.setLayoutData(gridData);
-
-		if (useNativeSearchField == null || !useNativeSearchField) {
-			findControl = createLabelButtonControl(this, textControl, JFaceResources.getImageRegistry().getDescriptor(
-					FIND_ICON), Messages.TextControl_AccessibleListenerFindButton, Messages.TextControl_FindToolTip,
-					ICON_SEARCH);
-			clearControl = createLabelButtonControl(this, textControl, JFaceResources.getImageRegistry().getDescriptor(
-					CLEAR_ICON), WorkbenchMessages.FilteredTree_ClearToolTip,//FilteredTree_AccessibleListenerClearButton,
-					WorkbenchMessages.FilteredTree_ClearToolTip, ICON_CANCEL);
-			addModifyListener(new ModifyListener() {
-
-				public void modifyText(ModifyEvent e) {
-					updateButtonVisibilityAndEnablement();
-
-				}
-			});
-			updateButtonVisibilityAndEnablement();
-		}
-
-		if (historyDialog != null) {
-			historyDialog.attach(this);
-			hasHistorySupport = true;
-		}
-
-		registerListeners();
-	}
-
-	public boolean hasHistorySupport() {
-		return hasHistorySupport;
-	}
-
-	private void registerListeners() {
-		addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-				if (textControl != null && !textControl.isDisposed()) {
-					addToSearchHistory(textControl.getText());
-				}
-
-			}
-		});
-		textControl.addFocusListener(new FocusAdapter() {
-
-			@Override
-			public void focusLost(FocusEvent e) {
-				if (textControl != null && !textControl.isDisposed()) {
-					addToSearchHistory(textControl.getText());
-				}
-			}
-		});
-	}
-
-	private static int getCompositeStyle(boolean automaticFind, Composite parent) {
-		if (useNativeSearchField(automaticFind, parent)) {
-			return SWT.NONE;
-		}
-		return SWT.BORDER;
-	}
-
-	private static boolean useNativeSearchField(boolean automaticFind, Composite parent) {
-		if (parent != null) {
-			if (useNativeSearchField == null) {
-				useNativeSearchField = Boolean.FALSE;
-				Text testText = null;
-				try {
-					int style = SWT.SEARCH | ICON_CANCEL;
-					if (automaticFind) {
-						style |= ICON_SEARCH;
-					}
-					testText = new Text(parent, style);
-					useNativeSearchField = new Boolean((testText.getStyle() & ICON_CANCEL) != 0
-							&& (!automaticFind || (testText.getStyle() & ICON_SEARCH) != 0));
-				} finally {
-					if (testText != null) {
-						testText.dispose();
-					}
-				}
-
-			}
-		} else {
-			useNativeSearchField = Boolean.FALSE;
-		}
-		return useNativeSearchField.booleanValue();
-	}
-
-	private Control createLabelButtonControl(Composite parent, final Text textControl,
-			ImageDescriptor activeImageDescriptor, final String accessibilityText, String toolTipText, final int detail) {
-
-		final Image nativeImage = parent.getDisplay().getSystemImage(detail);
-
-		final Image activeImage = nativeImage != null ? nativeImage : activeImageDescriptor.createImage();
-		final Image inactiveImage = new Image(parent.getDisplay(), activeImage, SWT.IMAGE_GRAY);
-		final Image pressedImage = inactiveImage;
-
-		final Label labelButton = new Label(parent, SWT.NONE);
-		labelButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
-		labelButton.setImage(inactiveImage);
-		labelButton.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-		labelButton.setToolTipText(toolTipText);
-		labelButton.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				if (nativeImage == null && activeImage != null && !activeImage.isDisposed()) {
-					activeImage.dispose();
-				}
-				if (inactiveImage != null && !inactiveImage.isDisposed()) {
-					inactiveImage.dispose();
-				}
-				if (pressedImage != null && !pressedImage.isDisposed()) {
-					pressedImage.dispose();
-				}
-			}
-		});
-		labelButton.addMouseListener(new MouseAdapter() {
-			private MouseMoveListener fMoveListener;
-
-			@Override
-			public void mouseDown(MouseEvent e) {
-				labelButton.setImage(pressedImage);
-				fMoveListener = new MouseMoveListener() {
-					private boolean fMouseInButton = true;
-
-					public void mouseMove(MouseEvent e) {
-						boolean mouseInButton = isMouseInButton(e);
-						if (mouseInButton != fMouseInButton) {
-							fMouseInButton = mouseInButton;
-							labelButton.setImage(mouseInButton ? pressedImage : inactiveImage);
-						}
-					}
-				};
-				labelButton.addMouseMoveListener(fMoveListener);
-			}
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				if (fMoveListener != null) {
-					labelButton.removeMouseMoveListener(fMoveListener);
-					fMoveListener = null;
-					boolean mouseInButton = isMouseInButton(e);
-					labelButton.setImage(mouseInButton ? activeImage : inactiveImage);
-					if (mouseInButton) {
-						if (textControl.isEnabled() && textControl.getText().length() > 0) {
-							notifySelectionChanged(detail);
-						}
-					}
-				}
-			}
-
-			private boolean isMouseInButton(MouseEvent e) {
-				Point buttonSize = labelButton.getSize();
-				return 0 <= e.x && e.x < buttonSize.x && 0 <= e.y && e.y < buttonSize.y;
-			}
-		});
-
-		labelButton.addMouseTrackListener(new MouseTrackListener() {
-			public void mouseEnter(MouseEvent e) {
-				if (labelButton.getImage() != activeImage) {
-					labelButton.setImage(activeImage);
-				}
-			}
-
-			public void mouseExit(MouseEvent e) {
-				if (labelButton.getImage() != inactiveImage) {
-					labelButton.setImage(inactiveImage);
-				}
-			}
-
-			public void mouseHover(MouseEvent e) {
-			}
-		});
-
-		labelButton.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-			@Override
-			public void getName(AccessibleEvent e) {
-				e.result = accessibilityText;
-			}
-		});
-		labelButton.getAccessible().addAccessibleControlListener(new AccessibleControlAdapter() {
-			@Override
-			public void getRole(AccessibleControlEvent e) {
-				e.detail = ACC.ROLE_PUSHBUTTON;
-			}
-		});
-		return labelButton;
-	}
-
-	@Override
-	public void addTraverseListener(TraverseListener listener) {
-		textControl.addTraverseListener(listener);
-	}
-
-	@Override
-	public void removeTraverseListener(TraverseListener listener) {
-		textControl.removeTraverseListener(listener);
-	}
-
-	public void addSelectionListener(SelectionListener listener) {
-		textControl.addSelectionListener(listener);
-		selectionListeners.add(listener);
-	}
-
-	public void removeSelectionListener(SelectionListener listener) {
-		textControl.removeSelectionListener(listener);
-		selectionListeners.remove(listener);
-	}
-
-	public void addModifyListener(ModifyListener listener) {
-		textControl.addModifyListener(listener);
-	}
-
-	public void removeModifyListener(ModifyListener listener) {
-		textControl.removeModifyListener(listener);
-	}
-
-	private void notifySelectionChanged(int detail) {
-		if (useNativeSearchField != null && useNativeSearchField) {
-			// notification should happen via the widgets selection listener
-			return;
-		}
-		Event event = new Event();
-		event.detail = detail;
-		event.widget = textControl;
-		event.display = textControl.getDisplay();
-
-		SelectionEvent e = new SelectionEvent(event);
-		for (Object element : selectionListeners) {
-			((SelectionListener) element).widgetDefaultSelected(e);
-		}
-	}
-
-	private void updateButtonVisibilityAndEnablement() {
-		if (textControl != null && !textControl.isDisposed()) {
-			boolean hasText = textControl.getText().length() > 0;
-
-			setFindButtonVisibility(!(hasText && automaticFind));
-			setClearButtonVisibility(hasText);
-		}
-	}
-
-	private void setFindButtonVisibility(boolean visible) {
-		if (findControl != null && !findControl.isDisposed()) {
-			findControl.setVisible(visible);
-			if (findControl.getLayoutData() instanceof GridData) {
-				((GridData) findControl.getLayoutData()).exclude = !visible;
-				findControl.getParent().layout();
-			}
-		}
-	}
-
-	private void setClearButtonVisibility(boolean visible) {
-		if (clearControl != null && !clearControl.isDisposed()) {
-			clearControl.setVisible(visible);
-			if (clearControl.getLayoutData() instanceof GridData) {
-				((GridData) clearControl.getLayoutData()).exclude = !visible;
-				clearControl.getParent().layout();
-			}
-		}
-	}
-
-	public Text getTextControl() {
-		return textControl;
-	}
-
-	public String getText() {
-		if (textControl != null && !textControl.isDisposed()) {
-			return textControl.getText();
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public void setText(String text) {
-		if (textControl != null && !textControl.isDisposed()) {
-			textControl.setText(text);
-		}
-	}
-
-	@Override
-	public void setBackground(Color color) {
-		if (useNativeSearchField != null && useNativeSearchField) {
-			super.setBackground(color);
-		}
-	}
-
-	public Collection<String> getSearchHistory() {
-		return Collections.unmodifiableCollection(searchHistory);
-	}
-
-	void addToSearchHistory(String searchString) {
-		if (searchString != null && searchString.trim().length() > 0) {
-			searchHistory.remove(searchString);
-			searchHistory.add(searchString);
-		}
-	}
-
-	public void saveState(IMemento memento) {
-		if (memento == null) {
-			return;
-		}
-
-		IMemento rootMemento = memento.createChild(FIND_MEMENTO_TYPE);
-		int i = 0;
-		for (String text : searchHistory) {
-			IMemento child = rootMemento.createChild(FIND_MEMENTO_ELEMENT);
-			child.putString(FIND_TEXT_MEMENTO_ELEMENT, text);
-			i++;
-			if (i > MAX_HISTORY_ITEMS) {
-				break;
-			}
-		}
-	}
-
-	public void restoreState(IMemento memento) {
-		if (memento == null) {
-			return;
-		}
-		List<String> history = new ArrayList<String>();
-
-		IMemento rootMemento = memento.getChild(FIND_MEMENTO_TYPE);
-		if (rootMemento != null) {
-			IMemento[] children = rootMemento.getChildren(FIND_MEMENTO_ELEMENT);
-			if (children != null && children.length > 0) {
-				for (IMemento child : children) {
-					String historyItem = child.getString(FIND_TEXT_MEMENTO_ELEMENT);
-					// add to the end of the list
-					history.add(history.size(), historyItem);
-				}
-			}
-		}
-		if (history != null) {
-			searchHistory = history;
-		}
-	}
-}
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 3363e43..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, 2009 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 df11e97..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/WorkbenchUtil.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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.QualifiedName;
-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 {
-
-
-	// TODO e3.6 IProgressConstants2#SHOW_IN_TASKBAR_ICON_PROPERTY
-	public static final QualifiedName SHOW_IN_TASKBAR_ICON_PROPERTY = new QualifiedName(
-			"org.eclipse.ui.workbench.progress", "inTaskBarIcon"); //$NON-NLS-1$//$NON-NLS-2$
-	
-	// FIXME remove this again
-	private 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$
-		}
-	}
-
-//	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);
-					CommonsUiPlugin.getDefault().getLog().log(status);
-					if (!TEST_MODE) {
-						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);
-			if (!TEST_MODE) {
-				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);
-				if (!TEST_MODE) {
-					MessageDialog.openWarning(getShell(), Messages.WorkbenchUtil_Open_Location_Title,
-							status.getMessage());
-				} else {
-					CommonsUiPlugin.getDefault().getLog().log(status);
-				}
-			} else {
-				Status status = new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN, NLS.bind(
-						Messages.WorkbenchUtil_Invalid_URL_Error, location), e);
-				if (!TEST_MODE) {
-					MessageDialog.openError(getShell(), Messages.WorkbenchUtil_Open_Location_Title, status.getMessage());
-				} else {
-					CommonsUiPlugin.getDefault().getLog().log(status);
-				}
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/AbstractInPlaceDialog.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/AbstractInPlaceDialog.java
deleted file mode 100644
index 0f441b2..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/AbstractInPlaceDialog.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.dialogs;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.PopupDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.window.Window;
-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.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Monitor;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Abstract class for an in-place popup dialog that has a cancel button and sends and ok event when the dialog is closed
- * 
- * @author Shawn Minto
- * @since 3.3
- */
-public abstract class AbstractInPlaceDialog extends PopupDialog {
-
-	public static final int ID_CLEAR = IDialogConstants.CLIENT_ID + 1;
-
-	protected static final int MARGIN_SIZE = 3;
-
-	private final int side;
-
-	private final Rectangle controlBounds;
-
-	private Control control;
-
-	private final Set<IInPlaceDialogListener> listeners = new HashSet<IInPlaceDialogListener>();
-
-	private final Control openControl;
-
-	DisposeListener disposeListener = new DisposeListener() {
-
-		public void widgetDisposed(DisposeEvent e) {
-			dispose();
-		}
-	};
-
-	public AbstractInPlaceDialog(Shell parent, int side, Control openControl) {
-		super(parent, PopupDialog.INFOPOPUP_SHELLSTYLE, false, false, false, false, false, null, null);
-		this.side = side;
-		this.openControl = openControl;
-
-		Rectangle bounds;
-		if (openControl == null || openControl.isDisposed()) {
-			bounds = new Rectangle(0, 0, 0, 0);
-		} else {
-			bounds = openControl.getBounds();
-			Point absPosition = openControl.toDisplay(openControl.getLocation());
-			bounds.x = absPosition.x - bounds.x;
-			bounds.y = absPosition.y - bounds.y;
-		}
-		this.controlBounds = bounds;
-		if (openControl != null) {
-			openControl.addDisposeListener(disposeListener);
-		}
-
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		return createDialogArea(parent);
-	}
-
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout();
-		gl.marginHeight = 0;
-		gl.marginWidth = 0;
-		gl.horizontalSpacing = 0;
-		gl.verticalSpacing = 0;
-		gl.numColumns = 1;
-		composite.setLayout(gl);
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(composite);
-
-		this.control = createControl(composite);
-
-		Composite buttonComposite = new Composite(parent, SWT.NONE);
-		gl = new GridLayout();
-		gl.marginHeight = 0;
-		gl.marginWidth = 0;
-		gl.marginBottom = MARGIN_SIZE;
-		gl.marginRight = MARGIN_SIZE;
-		gl.horizontalSpacing = 10;
-		gl.verticalSpacing = 0;
-		gl.numColumns = 1;
-		gl.makeColumnsEqualWidth = false;
-		buttonComposite.setLayout(gl);
-		GridDataFactory.fillDefaults().grab(true, false).align(SWT.END, SWT.CENTER).applyTo(buttonComposite);
-		createButtons(buttonComposite);
-		Dialog.applyDialogFont(parent);
-
-		parent.pack();
-
-		setBackgroundColor(parent);
-
-		return parent;
-	}
-
-	private void setBackgroundColor(Composite parent) {
-		parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-		for (Control control : parent.getChildren()) {
-			if (control instanceof Composite) {
-				setBackgroundColor((Composite) control);
-			} else {
-				control.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-			}
-		}
-	}
-
-	protected abstract Control createControl(Composite composite);
-
-	protected void createButtons(Composite composite) {
-		createButton(composite, ID_CLEAR, Messages.DateSelectionDialog_Clear, true);
-	}
-
-	protected void dispose() {
-		setReturnCode(Window.CANCEL);
-		close();
-	}
-
-	protected Control createButton(Composite composite, final int returnCode, String text, final boolean shouldClose) {
-		Button button = new Button(composite, SWT.NONE);
-		button.setText(text);
-		button.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				setReturnCode(returnCode);
-				if (shouldClose) {
-					close();
-				} else {
-					notifyButtonPressed(false);
-				}
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-		if (composite.getLayout() instanceof GridLayout) {
-			((GridLayout) composite.getLayout()).numColumns = composite.getChildren().length;
-		}
-		GridDataFactory.fillDefaults().applyTo(button);
-		return button;
-	}
-
-	@Override
-	public int open() {
-		int result = super.open();
-		getControl().setFocus();
-		setReturnCode(-1);
-		return result;
-	}
-
-	@Override
-	public boolean close() {
-		if (getReturnCode() == -1) {
-			setReturnCode(Window.OK);
-		}
-		notifyButtonPressed(true);
-		if (openControl != null && !openControl.isDisposed()) {
-			openControl.removeDisposeListener(disposeListener);
-		}
-		return super.close();
-	}
-
-	public void addEventListener(IInPlaceDialogListener listener) {
-		listeners.add(listener);
-	}
-
-	public void removeCloseListener(IInPlaceDialogListener listener) {
-		listeners.remove(listener);
-	}
-
-	private void notifyButtonPressed(boolean isClosing) {
-		final InPlaceDialogEvent event = new InPlaceDialogEvent(getReturnCode(), isClosing);
-		for (final IInPlaceDialogListener listener : listeners) {
-			SafeRunnable.run(new ISafeRunnable() {
-
-				public void run() throws Exception {
-					listener.buttonPressed(event);
-				}
-
-				public void handleException(Throwable exception) {
-					CommonsUiPlugin.getDefault().getLog().log(
-							new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN,
-									"Error while notifying IInPlaceCloseListener", exception)); //$NON-NLS-1$
-				}
-			});
-		}
-	}
-
-	@Override
-	protected void initializeBounds() {
-		Rectangle monitorBounds = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getShell()
-				.getMonitor()
-				.getClientArea();
-		Rectangle bounds = getShell().getBounds();
-		int x = 0;
-		int y = 0;
-
-		switch (side) {
-		case SWT.TOP:
-			x = controlBounds.x;
-			y = controlBounds.y + controlBounds.height;
-			if (x + bounds.width > monitorBounds.x + monitorBounds.width) {
-				x = (controlBounds.x + controlBounds.width) - bounds.width;
-			}
-			break;
-		case SWT.BOTTOM:
-			x = controlBounds.x;
-			y = controlBounds.y - bounds.height;
-			if (x + bounds.width > monitorBounds.x + monitorBounds.width) {
-				x = (controlBounds.x + controlBounds.width) - bounds.width;
-			}
-			break;
-		case SWT.RIGHT:
-			x = (controlBounds.x + controlBounds.width) - bounds.width;
-			y = controlBounds.y + controlBounds.height;
-			break;
-		case SWT.LEFT:
-			x = controlBounds.x;
-			y = controlBounds.y + controlBounds.height;
-			break;
-		}
-		getShell().setBounds(x, y, bounds.width, bounds.height);
-	}
-
-	@Override
-	protected void adjustBounds() {
-		Point tipSize = getShell().getSize();
-		Point location = getShell().getLocation();
-
-		Rectangle bounds;
-		Point rightBounds = new Point(tipSize.x + location.x, tipSize.y + location.y);
-
-		Monitor[] ms = getShell().getDisplay().getMonitors();
-
-		if (ms.length > 1) {
-			bounds = controlBounds;
-			Point p = new Point(location.x, location.y);
-
-			Rectangle tmp;
-			for (Monitor element : ms) {
-				tmp = element.getBounds();
-				if (tmp.contains(p)) {
-					bounds = tmp;
-					break;
-				}
-			}
-
-		} else {
-			bounds = getControl().getDisplay().getBounds();
-		}
-
-		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;
-			}
-		}
-
-		getShell().setLocation(location);
-	}
-
-	public Control getControl() {
-		return control;
-	}
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/IInPlaceDialogListener.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/IInPlaceDialogListener.java
deleted file mode 100644
index 6564a49..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/IInPlaceDialogListener.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.dialogs;
-
-/**
- * Listener interface for close events from an {@link AbstractInPlaceDialog}
- * 
- * @author Shawn Minto
- * @since 3.3
- */
-public interface IInPlaceDialogListener {
-
-	public void buttonPressed(InPlaceDialogEvent event);
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceCheckBoxTreeDialog.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceCheckBoxTreeDialog.java
deleted file mode 100644
index ff27ebf..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceCheckBoxTreeDialog.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.dialogs;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.internal.provisional.commons.ui.EnhancedFilteredTree;
-import org.eclipse.mylyn.internal.provisional.commons.ui.SubstringPatternFilter;
-import org.eclipse.swt.SWT;
-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.Shell;
-import org.eclipse.ui.dialogs.PatternFilter;
-import org.eclipse.ui.progress.WorkbenchJob;
-
-/**
- * @author Shawn Minto
- * @since 3.3
- */
-public class InPlaceCheckBoxTreeDialog extends AbstractInPlaceDialog {
-
-	private final Map<String, String> validValues;
-
-	private CheckboxFilteredTree valueTree;
-
-	private final Set<String> selectedValues;
-
-	private final String dialogLabel;
-
-	private class CheckboxFilteredTree extends EnhancedFilteredTree {
-
-		public CheckboxFilteredTree(Composite parent, int treeStyle, PatternFilter filter) {
-			super(parent, treeStyle, filter);
-		}
-
-		@Override
-		protected WorkbenchJob doCreateRefreshJob() {
-			WorkbenchJob job = super.doCreateRefreshJob();
-			job.addJobChangeListener(new JobChangeAdapter() {
-				@Override
-				public void done(IJobChangeEvent event) {
-					if (event.getResult() != null && event.getResult().isOK() && !getViewer().getTree().isDisposed()) {
-						getViewer().setCheckedElements(selectedValues.toArray());
-					}
-				}
-			});
-			return job;
-		}
-
-		@Override
-		protected TreeViewer doCreateTreeViewer(Composite parent, int style) {
-			return new CheckboxTreeViewer(parent, style);
-		}
-
-		@Override
-		public CheckboxTreeViewer getViewer() {
-			return (CheckboxTreeViewer) super.getViewer();
-		}
-
-	}
-
-	public InPlaceCheckBoxTreeDialog(Shell shell, Control openControl, List<String> values,
-			Map<String, String> validValues, String dialogLabel) {
-		super(shell, SWT.RIGHT, openControl);
-		Assert.isNotNull(values);
-		Assert.isNotNull(validValues);
-		Assert.isNotNull(dialogLabel);
-		this.selectedValues = new HashSet<String>(values);
-		this.validValues = validValues;
-		this.dialogLabel = dialogLabel;
-		setShellStyle(getShellStyle());
-	}
-
-	@Override
-	protected Control createControl(Composite parent) {
-		getShell().setText(dialogLabel);
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = MARGIN_SIZE;
-		layout.marginWidth = MARGIN_SIZE;
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 0;
-		composite.setLayout(layout);
-		GridData gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH);
-		composite.setLayoutData(gd);
-
-		valueTree = new CheckboxFilteredTree(composite, SWT.CHECK | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL
-				| SWT.BORDER, new SubstringPatternFilter());
-		gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH);
-		gd.heightHint = 175;
-		gd.widthHint = 160;
-		CheckboxTreeViewer viewer = valueTree.getViewer();
-		viewer.getControl().setLayoutData(gd);
-
-		if (validValues != null) {
-
-			viewer.setContentProvider(new ITreeContentProvider() {
-
-				public Object[] getChildren(Object parentElement) {
-					if (parentElement instanceof Map<?, ?>) {
-						return ((Map<?, ?>) parentElement).keySet().toArray();
-					}
-					return null;
-				}
-
-				public Object getParent(Object element) {
-					return null;
-				}
-
-				public boolean hasChildren(Object element) {
-					return false;
-				}
-
-				public Object[] getElements(Object inputElement) {
-					return getChildren(inputElement);
-				}
-
-				public void dispose() {
-				}
-
-				public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-				}
-
-			});
-
-			//viewer.setSorter(new ViewerSorter());
-			viewer.setLabelProvider(new LabelProvider() {
-				@Override
-				public String getText(Object element) {
-					if (element instanceof String) {
-						return validValues.get(element);
-					}
-					return super.getText(element);
-				}
-			});
-			viewer.setInput(validValues);
-
-			Set<String> invalidValues = new HashSet<String>();
-
-			// Remove any currently entered invalid values
-			for (String value : selectedValues) {
-				if (!validValues.containsKey(value)) {
-					invalidValues.add(value);
-				}
-			}
-
-			// Remove any unselected values
-			for (String value : validValues.keySet()) {
-				if (!viewer.setChecked(value, true)) {
-					invalidValues.add(value);
-				}
-			}
-
-			selectedValues.removeAll(invalidValues);
-
-			viewer.setCheckedElements(selectedValues.toArray());
-
-		}
-
-		viewer.addCheckStateListener(new ICheckStateListener() {
-
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				if (event.getChecked()) {
-					selectedValues.add((String) event.getElement());
-				} else {
-					selectedValues.remove(event.getElement());
-				}
-			}
-
-		});
-
-		return valueTree;
-	}
-
-	public Set<String> getSelectedValues() {
-		return new HashSet<String>(selectedValues);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceDateSelectionDialog.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceDateSelectionDialog.java
deleted file mode 100644
index 74cf7e6..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceDateSelectionDialog.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.dialogs;
-
-import java.util.Calendar;
-import java.util.Date;
-
-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;
-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
- * @author Shawn Minto
- * @since 3.3
- */
-public class InPlaceDateSelectionDialog extends AbstractInPlaceDialog {
-
-	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 InPlaceDateSelectionDialog(Shell parentShell, Control openControl, Calendar initialDate, String title,
-			boolean includeTime, int hourOfDay) {
-		super(parentShell, SWT.RIGHT, openControl);
-		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 createControl(Composite parent) {
-		getShell().setText(title);
-		final DatePickerPanel datePanel = new DatePickerPanel(parent, SWT.NULL, initialCalendar, includeTime,
-				hourOfDay, MARGIN_SIZE);
-		datePanel.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (!event.getSelection().isEmpty()) {
-					DateSelection dateSelection = (DateSelection) event.getSelection();
-					selectedDate = dateSelection.getDate().getTime();
-					if (dateSelection.isDefaultSelection()) {
-						close();
-					}
-				}
-			}
-		});
-
-		datePanel.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
-
-		return datePanel;
-	}
-
-	@Override
-	public boolean close() {
-		return super.close();
-	}
-
-	@Override
-	protected void createButtons(Composite composite) {
-	}
-
-	public Date getDate() {
-		return selectedDate;
-	}
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceDialogEvent.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceDialogEvent.java
deleted file mode 100644
index dd7b08f..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/InPlaceDialogEvent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.dialogs;
-
-/**
- * Event sent with an {@link IInPlaceDialogListener} that contains information about the close event that occurred
- * 
- * @author Shawn Minto
- * @since 3.3
- */
-public class InPlaceDialogEvent {
-
-	private final int returnCode;
-
-	private final boolean isClosing;
-
-	public InPlaceDialogEvent(int returnCode, boolean isClosing) {
-		this.returnCode = returnCode;
-		this.isClosing = isClosing;
-	}
-
-	public boolean isClosing() {
-		return isClosing;
-	}
-
-	public int getReturnCode() {
-		return returnCode;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/Messages.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/Messages.java
deleted file mode 100644
index f023edc..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/Messages.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.dialogs;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @since 3.3
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.provisional.commons.ui.dialogs.messages"; //$NON-NLS-1$
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/messages.properties b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/messages.properties
deleted file mode 100644
index f5fd324..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/dialogs/messages.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 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
-###############################################################################
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 9ea1846..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, 2009 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 3f8c8e7..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, 2009 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.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/messages.properties b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/messages.properties
deleted file mode 100644
index c4bea6a..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/messages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2010 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
-###############################################################################
-DatePickerPanel_Today=Today
-TextControl_FindToolTip=Find
-TextControl_AccessibleListenerFindButton=Find
diff --git a/org.eclipse.mylyn.commons.xmlrpc/.classpath b/org.eclipse.mylyn.commons.xmlrpc/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/.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.xmlrpc/.cvsignore b/org.eclipse.mylyn.commons.xmlrpc/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.xmlrpc/.options b/org.eclipse.mylyn.commons.xmlrpc/.options
deleted file mode 100644
index 7a10014..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# AbstractXmlRpcClient
-org.eclipse.mylyn.commons.xmlrpc/debug/authentication=false
-org.eclipse.mylyn.commons.xmlrpc/debug/xmlrpc=false
diff --git a/org.eclipse.mylyn.commons.xmlrpc/.project b/org.eclipse.mylyn.commons.xmlrpc/.project
deleted file mode 100644
index 136f9f4..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.commons.xmlrpc</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.xmlrpc/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1314ffa..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,342 +0,0 @@
-#Tue May 12 20:42:46 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.xmlrpc/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 3ec69cf..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Fri Jul 24 06:39:32 PDT 2009
-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) 2010 Steffen Pingel 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 * Contributors\:\n *     Steffen Pingel - initial API and implementation\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.xmlrpc/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 5e7f2bd..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/.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.xmlrpc/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.commons.xmlrpc/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/.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.xmlrpc/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF
deleted file mode 100644
index 1b7d5a7..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/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.commons.xmlrpc;singleton:=true
-Bundle-Version: 3.4.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
- org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.commons.xmlrpc/about.html b/org.eclipse.mylyn.commons.xmlrpc/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/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.xmlrpc/build.properties b/org.eclipse.mylyn.commons.xmlrpc/build.properties
deleted file mode 100644
index 1349875..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2010 Steffen Pingel 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.xmlrpc/plugin.properties b/org.eclipse.mylyn.commons.xmlrpc/plugin.properties
deleted file mode 100644
index 6ea1a9e..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2010 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:
-#      Steffen Pingel - initial API and implementation
-###############################################################################
-#Properties file for org.eclipse.mylyn.trac.core
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn XML-RPC Support
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/CommonXmlRpcClient.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/CommonXmlRpcClient.java
deleted file mode 100644
index 8911099..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/CommonXmlRpcClient.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.TimeZone;
-
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.auth.AuthScheme;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.auth.DigestScheme;
-import org.apache.commons.httpclient.cookie.CookiePolicy;
-import org.apache.xmlrpc.XmlRpcException;
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
-import org.apache.xmlrpc.serializer.CharSetXmlWriterFactory;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.mylyn.commons.core.CoreUtil;
-import org.eclipse.mylyn.commons.net.AbstractWebLocation;
-import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
-import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.commons.net.WebUtil;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Facilitates connections to repositories accessed through XML-RPC.
- * 
- * @author Steffen Pingel
- */
-public class CommonXmlRpcClient {
-
-	static final boolean DEBUG_AUTH = Boolean.valueOf(Platform.getDebugOption("org.eclipse.mylyn.commons.xmlrpc/debug/authentication")); //$NON-NLS-1$
-
-	static final boolean DEBUG_XMLRPC = Boolean.valueOf(Platform.getDebugOption("org.eclipse.mylyn.commons.xmlrpc/debug/xmlrpc")); //$NON-NLS-1$
-
-	private static final String DEFAULT_CHARSET = "UTF-8"; //$NON-NLS-1$
-
-	private static final String DEFAULT_TIME_ZONE = TimeZone.getDefault().getID();
-
-	private static final String DEFAULT_USER_AGENT = "Apache XML-RPC/3.0"; //$NON-NLS-1$
-
-	private static final String DEFAULT_CONTENT_TYPE = "text/xml"; //$NON-NLS-1$
-
-	private static HttpClient createHttpClient(String userAgent) {
-		HttpClient httpClient = new HttpClient();
-		httpClient.setHttpConnectionManager(WebUtil.getConnectionManager());
-		httpClient.getParams().setCookiePolicy(CookiePolicy.RFC_2109);
-		WebUtil.configureHttpClient(httpClient, userAgent);
-		return httpClient;
-	}
-
-	private final AuthScope authScope;
-
-	private XmlRpcClientConfigImpl config;
-
-	volatile DigestScheme digestScheme;
-
-	private HttpClientTransportFactory factory;
-
-	final HttpClient httpClient;
-
-	private final AbstractWebLocation location;
-
-//	private boolean probed;
-
-	private XmlRpcClient xmlrpc;
-
-	private volatile boolean contentTypeCheckingEnabled;
-
-	public CommonXmlRpcClient(AbstractWebLocation location) {
-		this(location, createHttpClient(DEFAULT_USER_AGENT));
-	}
-
-	public CommonXmlRpcClient(AbstractWebLocation location, HttpClient client) {
-		this.location = location;
-		this.httpClient = createHttpClient(DEFAULT_USER_AGENT);
-		this.authScope = new AuthScope(WebUtil.getHost(location.getUrl()), WebUtil.getPort(location.getUrl()), null,
-				AuthScope.ANY_SCHEME);
-	}
-
-	public <T> T call(final IProgressMonitor monitor, final String method, final Object... parameters)
-			throws XmlRpcException {
-		return new XmlRpcOperation<T>(this) {
-			@SuppressWarnings("unchecked")
-			@Override
-			public T execute() throws XmlRpcException {
-				return (T) call(monitor, method, parameters);
-			}
-		}.execute();
-	}
-
-	public MulticallResult call(final IProgressMonitor monitor, final Multicall call) throws XmlRpcException {
-		return new XmlRpcOperation<MulticallResult>(this) {
-			@Override
-			public MulticallResult execute() throws XmlRpcException {
-				return call(monitor, call);
-			}
-		}.execute();
-	}
-
-	protected void createXmlRpcClient() {
-		config = new XmlRpcClientConfigImpl();
-		config.setEncoding(DEFAULT_CHARSET);
-		config.setTimeZone(TimeZone.getTimeZone(DEFAULT_TIME_ZONE));
-		config.setContentLengthOptional(false);
-		config.setConnectionTimeout(WebUtil.getConnectionTimeout());
-		config.setReplyTimeout(WebUtil.getSocketTimeout());
-
-		xmlrpc = new XmlRpcClient();
-		xmlrpc.setConfig(config);
-		// bug 307200: force factory that supports proper UTF-8 encoding
-		xmlrpc.setXmlWriterFactory(new CharSetXmlWriterFactory());
-
-		factory = new HttpClientTransportFactory(xmlrpc, httpClient);
-		factory.setLocation(location);
-		factory.setInterceptor(new HttpMethodInterceptor() {
-			public void processRequest(HttpMethod method) {
-				DigestScheme scheme = digestScheme;
-				if (scheme != null) {
-					if (DEBUG_AUTH) {
-						System.err.println(location.getUrl() + ": Digest scheme is present"); //$NON-NLS-1$ 
-					}
-					Credentials creds = httpClient.getState().getCredentials(authScope);
-					if (creds != null) {
-						if (DEBUG_AUTH) {
-							System.err.println(location.getUrl() + ": Setting digest scheme for request"); //$NON-NLS-1$ 
-						}
-						method.getHostAuthState().setAuthScheme(digestScheme);
-						method.getHostAuthState().setAuthRequested(true);
-					}
-				}
-			}
-
-			@SuppressWarnings("null")
-			public void processResponse(HttpMethod method) throws XmlRpcException {
-				if (isContentTypeCheckingEnabled()) {
-					Header contentTypeHeader = method.getResponseHeader("Content-Type"); //$NON-NLS-1$
-					if (contentTypeHeader == null || !DEFAULT_CONTENT_TYPE.equals(contentTypeHeader.getValue())) {
-						throw new XmlRpcIllegalContentTypeException(
-								NLS.bind(
-										"The server returned an unexpected content type: ''{0}''", contentTypeHeader.getValue()), contentTypeHeader.getValue()); //$NON-NLS-1$
-					}
-				}
-				AuthScheme authScheme = method.getHostAuthState().getAuthScheme();
-				if (authScheme instanceof DigestScheme) {
-					digestScheme = (DigestScheme) authScheme;
-					if (DEBUG_AUTH) {
-						System.err.println(location.getUrl() + ": Received digest scheme"); //$NON-NLS-1$ 
-					}
-				}
-			}
-		});
-		xmlrpc.setTransportFactory(factory);
-
-		try {
-			config.setServerURL(new URL(location.getUrl()));
-		} catch (MalformedURLException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public synchronized XmlRpcClient getClient() {
-		if (xmlrpc == null) {
-			createXmlRpcClient();
-		}
-
-		return xmlrpc;
-	}
-
-	public HttpClient getHttpClient() {
-		return httpClient;
-	}
-
-	public AbstractWebLocation getLocation() {
-		return location;
-	}
-
-//	public boolean isProbed() {
-//		return probed;
-//	}
-//
-//	public void setProbed(boolean probed) {
-//		this.probed = probed;
-//	}
-
-	AuthenticationCredentials updateCredentials() {
-		// update configuration with latest values
-		AuthenticationCredentials credentials = location.getCredentials(AuthenticationType.REPOSITORY);
-		if (credentials != null) {
-			Credentials httpCredentials = WebUtil.getHttpClientCredentials(credentials,
-					WebUtil.getHost(location.getUrl()));
-			httpClient.getState().setCredentials(authScope, httpCredentials);
-			if (CoreUtil.TEST_MODE) {
-				System.err.println(" Setting credentials: " + httpCredentials); //$NON-NLS-1$
-			}
-			httpClient.getState().setCredentials(authScope, httpCredentials);
-		} else {
-			httpClient.getState().clearCredentials();
-		}
-		return credentials;
-	}
-
-	public boolean isContentTypeCheckingEnabled() {
-		return contentTypeCheckingEnabled;
-	}
-
-	public void setContentTypeCheckingEnabled(boolean contentTypeCheckingEnabled) {
-		this.contentTypeCheckingEnabled = contentTypeCheckingEnabled;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpClientTransportFactory.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpClientTransportFactory.java
deleted file mode 100644
index 14fef8f..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpClientTransportFactory.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import java.io.BufferedOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.HttpVersion;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.xmlrpc.XmlRpcException;
-import org.apache.xmlrpc.XmlRpcRequest;
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.client.XmlRpcClientException;
-import org.apache.xmlrpc.client.XmlRpcHttpClientConfig;
-import org.apache.xmlrpc.client.XmlRpcHttpTransport;
-import org.apache.xmlrpc.client.XmlRpcTransport;
-import org.apache.xmlrpc.client.XmlRpcTransportFactory;
-import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig;
-import org.apache.xmlrpc.util.HttpUtil;
-import org.apache.xmlrpc.util.XmlRpcIOException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.mylyn.commons.net.AbstractWebLocation;
-import org.eclipse.mylyn.commons.net.WebUtil;
-import org.xml.sax.SAXException;
-
-/**
- * A custom transport factory used to establish XML-RPC connections. Uses the Mylyn proxy settings.
- * 
- * @author Steffen Pingel
- */
-class HttpClientTransportFactory implements XmlRpcTransportFactory {
-
-	/**
-	 * A transport that uses the Apache HttpClient library.
-	 */
-	static class HttpClientTransport extends XmlRpcHttpTransport {
-
-		private final HttpClient httpClient;
-
-		private final AbstractWebLocation location;
-
-		private PostMethod method;
-
-		private int contentLength = -1;
-
-		private XmlRpcHttpClientConfig config;
-
-		private IProgressMonitor monitor;
-
-		private HostConfiguration hostConfiguration;
-
-		private final HttpMethodInterceptor interceptor;
-
-		public HttpClientTransport(XmlRpcClient client, HttpClient httpClient, AbstractWebLocation location,
-				HttpMethodInterceptor interceptor) {
-			super(client, ""); //$NON-NLS-1$
-			this.httpClient = httpClient;
-			this.location = location;
-			this.interceptor = interceptor;
-		}
-
-		@Override
-		protected void close() throws XmlRpcClientException {
-			method.releaseConnection();
-		}
-
-		public int getContentLength() {
-			return contentLength;
-		}
-
-		@Override
-		protected InputStream getInputStream() throws XmlRpcException {
-			int responseCode = method.getStatusCode();
-			if (responseCode != HttpURLConnection.HTTP_OK) {
-				XmlRpcHttpException e = new XmlRpcHttpException(responseCode);
-				if (responseCode == HttpStatus.SC_UNAUTHORIZED) {
-					e.setAuthScheme(method.getHostAuthState().getAuthScheme());
-				}
-				throw e;
-			}
-
-			try {
-				return method.getResponseBodyAsStream();
-			} catch (HttpException e) {
-				throw new XmlRpcClientException("Error in HTTP transport: " + e.getMessage(), e); //$NON-NLS-1$
-			} catch (IOException e) {
-				throw new XmlRpcClientException("I/O error in server communication: " + e.getMessage(), e); //$NON-NLS-1$
-			}
-		}
-
-		@Override
-		protected String getUserAgent() {
-			return WebUtil.getUserAgent(""); //$NON-NLS-1$
-		}
-
-		@Override
-		protected void initHttpHeaders(XmlRpcRequest request) throws XmlRpcClientException {
-			config = (XmlRpcHttpClientConfig) request.getConfig();
-
-			if (request instanceof XmlRpcClientRequest) {
-				XmlRpcClientRequest clientRequest = (XmlRpcClientRequest) request;
-				monitor = clientRequest.getProgressMonitor();
-			} else {
-				monitor = null;
-			}
-
-			String url = config.getServerURL().toString();
-			hostConfiguration = WebUtil.createHostConfiguration(httpClient, location, monitor);
-			method = new PostMethod(WebUtil.getRequestPath(url));
-
-			super.initHttpHeaders(request);
-
-			if (config.getConnectionTimeout() != 0) {
-				httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(config.getConnectionTimeout());
-			}
-
-			if (config.getReplyTimeout() != 0) {
-				httpClient.getHttpConnectionManager().getParams().setSoTimeout(config.getConnectionTimeout());
-			}
-
-			method.getParams().setVersion(HttpVersion.HTTP_1_1);
-
-			if (interceptor != null) {
-				interceptor.processRequest(method);
-			}
-		}
-
-		@Override
-		protected boolean isResponseGzipCompressed(XmlRpcStreamRequestConfig config) {
-			Header header = method.getResponseHeader("Content-Encoding"); //$NON-NLS-1$
-			return header != null && HttpUtil.isUsingGzipEncoding(header.getValue());
-		}
-
-		@Override
-		protected void setContentLength(int contentLength) {
-			this.contentLength = contentLength;
-		}
-
-		@Override
-		protected void setCredentials(XmlRpcHttpClientConfig config) throws XmlRpcClientException {
-			// handled by AbstractXmlRpcClient
-		}
-
-		@Override
-		protected void setRequestHeader(String header, String value) {
-			method.setRequestHeader(new Header(header, value));
-		}
-
-		@Override
-		protected void writeRequest(final ReqWriter writer) throws XmlRpcException {
-			method.setRequestEntity(new RequestEntity() {
-				public long getContentLength() {
-					return HttpClientTransport.this.getContentLength();
-				}
-
-				public String getContentType() {
-					return "text/xml"; //$NON-NLS-1$
-				}
-
-				public boolean isRepeatable() {
-					return getContentLength() != -1;
-				}
-
-				public void writeRequest(OutputStream pOut) throws IOException {
-					try {
-						/* Make sure, that the socket is not closed by replacing it with our
-						 * own BufferedOutputStream.
-						 */
-						OutputStream ostream;
-						if (isUsingByteArrayOutput(config)) {
-							// No need to buffer the output.
-							ostream = new FilterOutputStream(pOut) {
-								@Override
-								public void close() throws IOException {
-									flush();
-								}
-							};
-						} else {
-							ostream = new BufferedOutputStream(pOut) {
-								@Override
-								public void close() throws IOException {
-									flush();
-								}
-							};
-						}
-						writer.write(ostream);
-					} catch (XmlRpcException e) {
-						throw new XmlRpcIOException(e);
-					} catch (SAXException e) {
-						throw new XmlRpcIOException(e);
-					}
-				}
-			});
-
-			try {
-				WebUtil.execute(httpClient, hostConfiguration, method, monitor);
-				if (interceptor != null) {
-					interceptor.processResponse(method);
-				}
-			} catch (XmlRpcIOException e) {
-				Throwable t = e.getLinkedException();
-				if (t instanceof XmlRpcException) {
-					throw (XmlRpcException) t;
-				} else {
-					throw new XmlRpcException("Unexpected exception: " + t.getMessage(), t); //$NON-NLS-1$
-				}
-			} catch (IOException e) {
-				throw new XmlRpcException("I/O error while communicating with HTTP server: " + e.getMessage(), e); //$NON-NLS-1$
-			}
-		}
-
-	}
-
-	private final XmlRpcClient xmlRpcClient;
-
-	private AbstractWebLocation location;
-
-	private final HttpClient httpClient;
-
-	private HttpMethodInterceptor interceptor;
-
-	public HttpClientTransportFactory(XmlRpcClient xmlRpcClient, HttpClient httpClient) {
-		this.xmlRpcClient = xmlRpcClient;
-		this.httpClient = httpClient;
-	}
-
-	public AbstractWebLocation getLocation() {
-		return location;
-	}
-
-	public XmlRpcTransport getTransport() {
-		return new HttpClientTransport(xmlRpcClient, httpClient, location, interceptor);
-	}
-
-	public void setLocation(AbstractWebLocation location) {
-		this.location = location;
-	}
-
-	public HttpMethodInterceptor getInterceptor() {
-		return interceptor;
-	}
-
-	public void setInterceptor(HttpMethodInterceptor interceptor) {
-		this.interceptor = interceptor;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpMethodInterceptor.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpMethodInterceptor.java
deleted file mode 100644
index 6326709..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/HttpMethodInterceptor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.xmlrpc.XmlRpcException;
-import org.apache.xmlrpc.client.XmlRpcClientException;
-
-/**
- * @author Steffen Pingel
- */
-interface HttpMethodInterceptor {
-
-	public abstract void processRequest(HttpMethod method) throws XmlRpcClientException;
-
-	public abstract void processResponse(HttpMethod method) throws XmlRpcException;
-
-}
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/Multicall.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/Multicall.java
deleted file mode 100644
index 6ac4e85..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/Multicall.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.xmlrpc.XmlRpcException;
-
-/**
- * Represents a multicall.
- * 
- * @author Steffen Pingel
- */
-public class Multicall {
-
-	List<Map<String, Object>> calls = new ArrayList<Map<String, Object>>();
-
-	public Multicall() {
-	}
-
-	public Multicall add(String methodName, Object... parameters) throws XmlRpcException {
-		Map<String, Object> table = new HashMap<String, Object>();
-		table.put("methodName", methodName); //$NON-NLS-1$
-		table.put("params", parameters); //$NON-NLS-1$
-		calls.add(table);
-		return this;
-	}
-
-	@SuppressWarnings("unchecked")
-	public Map<String, Object>[] getCalls() {
-		return calls.toArray(new Map[0]);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/MulticallResult.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/MulticallResult.java
deleted file mode 100644
index 0b9a00a..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/MulticallResult.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Steffen Pingel
- */
-public class MulticallResult {
-
-	private final Object[] response;
-
-	public MulticallResult(Object[] response) {
-		this.response = response;
-	}
-
-	public List<Object> getItems() {
-		return getItems(Object.class);
-	}
-
-	public <T> List<T> getItems(Class<T> itemClass) {
-		List<T> items = new ArrayList<T>(response.length);
-		for (Object element : response) {
-			items.add(itemClass.cast(getMultiCallResult(element)));
-		}
-		return items;
-	}
-
-	private Object getMultiCallResult(Object item) {
-		return ((Object[]) item)[0];
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcClientRequest.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcClientRequest.java
deleted file mode 100644
index db2a5a1..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcClientRequest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import java.net.URL;
-
-import org.apache.xmlrpc.XmlRpcRequestConfig;
-import org.apache.xmlrpc.client.XmlRpcClientRequestImpl;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * @author Steffen Pingel
- */
-class XmlRpcClientRequest extends XmlRpcClientRequestImpl {
-
-	private final IProgressMonitor progressMonitor;
-
-	private final URL url;
-
-	public XmlRpcClientRequest(XmlRpcRequestConfig config, URL url, String methodName, Object[] params,
-			IProgressMonitor monitor) {
-		super(config, methodName, params);
-		this.url = url;
-		this.progressMonitor = monitor;
-	}
-
-	public IProgressMonitor getProgressMonitor() {
-		return progressMonitor;
-	}
-
-	public URL getUrl() {
-		return url;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcHttpException.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcHttpException.java
deleted file mode 100644
index 695e3ef..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcHttpException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import org.apache.commons.httpclient.auth.AuthScheme;
-import org.apache.xmlrpc.XmlRpcException;
-
-/**
- * @author Steffen Pingel
- */
-public class XmlRpcHttpException extends XmlRpcException {
-
-	private static final long serialVersionUID = 9032521978140685830L;
-
-	private AuthScheme authScheme;
-
-	public XmlRpcHttpException(int responseCode) {
-		super(responseCode, "HTTP Error " + responseCode); //$NON-NLS-1$
-	}
-
-	public AuthScheme getAuthScheme() {
-		return authScheme;
-	}
-
-	public void setAuthScheme(AuthScheme authScheme) {
-		this.authScheme = authScheme;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcIllegalContentTypeException.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcIllegalContentTypeException.java
deleted file mode 100644
index 3a7f3c3..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcIllegalContentTypeException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import org.apache.xmlrpc.XmlRpcException;
-
-/**
- * Indicates the server responded with an unexpected content type.
- * 
- * @author Steffen Pingel
- */
-public class XmlRpcIllegalContentTypeException extends XmlRpcException {
-
-	private static final long serialVersionUID = -1844484692848370951L;
-
-	private final String contentType;
-
-	public XmlRpcIllegalContentTypeException(String message, String contentType) {
-		super(message);
-		this.contentType = contentType;
-	}
-
-	/**
-	 * Returns the content type specified by the server.
-	 */
-	public String getContentType() {
-		return contentType;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcLoginException.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcLoginException.java
deleted file mode 100644
index 33fe0bb..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcLoginException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import org.apache.xmlrpc.XmlRpcException;
-
-/**
- * Indicates an authentication error during login.
- * 
- * @author Steffen Pingel
- */
-public class XmlRpcLoginException extends XmlRpcException {
-
-	private static final long serialVersionUID = -6128773690643367414L;
-
-	private boolean ntlmAuthRequested;
-
-	public XmlRpcLoginException(String message) {
-		super(message);
-	}
-
-	public XmlRpcLoginException() {
-		super(null);
-	}
-
-	public boolean isNtlmAuthRequested() {
-		return ntlmAuthRequested;
-	}
-
-	void setNtlmAuthRequested(boolean ntlmAuthRequested) {
-		this.ntlmAuthRequested = ntlmAuthRequested;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcNoSuchMethodException.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcNoSuchMethodException.java
deleted file mode 100644
index 4a71d0c..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcNoSuchMethodException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import org.apache.xmlrpc.XmlRpcException;
-
-public class XmlRpcNoSuchMethodException extends XmlRpcException {
-
-	private static final long serialVersionUID = 9075003728286406705L;
-
-	public XmlRpcNoSuchMethodException(XmlRpcException e) {
-		super("No such method", e); //$NON-NLS-1$
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcOperation.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcOperation.java
deleted file mode 100644
index 05309e0..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcOperation.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.auth.AuthScheme;
-import org.apache.commons.httpclient.auth.NTLMScheme;
-import org.apache.xmlrpc.XmlRpcException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.mylyn.commons.core.CoreUtil;
-import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
-import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.commons.net.Policy;
-import org.eclipse.mylyn.commons.net.UnsupportedRequestException;
-
-/**
- * @author Steffen Pingel
- */
-public abstract class XmlRpcOperation<T> {
-
-	private static final Pattern RPC_METHOD_NOT_FOUND_PATTERN = Pattern.compile("No such handler: "); //$NON-NLS-1$
-
-	protected static final int XML_FAULT_GENERAL_ERROR = 1;
-
-	protected static final int XML_FAULT_PERMISSION_DENIED = 403;
-
-	private final CommonXmlRpcClient client;
-
-	public XmlRpcOperation(CommonXmlRpcClient client) {
-		this.client = client;
-	}
-
-	protected Object call(IProgressMonitor monitor, String method, Object... parameters) throws XmlRpcException {
-		monitor = Policy.monitorFor(monitor);
-		XmlRpcException lastException = null;
-		for (int attempt = 0; attempt < 3; attempt++) {
-//			if (!client.isProbed()) {
-//				try {
-//					probeAuthenticationScheme(monitor);
-//				} finally {
-//					client.setProbed(true);
-//				}
-//			}
-
-			try {
-				return executeCall(monitor, method, parameters);
-			} catch (XmlRpcLoginException e) {
-				try {
-					client.getLocation().requestCredentials(AuthenticationType.REPOSITORY, null, monitor);
-				} catch (UnsupportedRequestException ignored) {
-					throw e;
-				}
-				lastException = e;
-			} catch (XmlRpcPermissionDeniedException e) {
-				try {
-					client.getLocation().requestCredentials(AuthenticationType.REPOSITORY, null, monitor);
-				} catch (UnsupportedRequestException ignored) {
-					throw e;
-				}
-				lastException = e;
-			} catch (XmlRpcProxyAuthenticationException e) {
-				try {
-					client.getLocation().requestCredentials(AuthenticationType.PROXY, null, monitor);
-				} catch (UnsupportedRequestException ignored) {
-					throw e;
-				}
-				lastException = e;
-			}
-		}
-		if (lastException != null) {
-			throw lastException;
-		} else {
-			// this path should never be reached
-			throw new IllegalStateException();
-		}
-	}
-
-	private void checkForException(Object result) throws NumberFormatException, XmlRpcException {
-		if (result instanceof Map<?, ?>) {
-			Map<?, ?> exceptionData = (Map<?, ?>) result;
-			if (exceptionData.containsKey("faultCode") && exceptionData.containsKey("faultString")) { //$NON-NLS-1$ //$NON-NLS-2$ 
-				throw new XmlRpcException(Integer.parseInt(exceptionData.get("faultCode").toString()), //$NON-NLS-1$
-						(String) exceptionData.get("faultString")); //$NON-NLS-1$
-			} else if (exceptionData.containsKey("title")) { //$NON-NLS-1$
-				String message = (String) exceptionData.get("title"); //$NON-NLS-1$
-				String detail = (String) exceptionData.get("_message"); //$NON-NLS-1$
-				if (detail != null) {
-					message += ": " + detail; //$NON-NLS-1$
-				}
-				throw new XmlRpcException(XML_FAULT_GENERAL_ERROR, message);
-			}
-		}
-	}
-
-	protected boolean credentialsValid(AuthenticationCredentials credentials) {
-		return credentials != null;
-	}
-
-	public abstract T execute() throws XmlRpcException;
-
-	protected Object executeCall(IProgressMonitor monitor, String method, Object... parameters) throws XmlRpcException {
-		try {
-			if (CommonXmlRpcClient.DEBUG_XMLRPC) {
-				System.err.println("Calling " + client.getLocation().getUrl() + ": " + method + " " + CoreUtil.toString(parameters)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-
-			AuthenticationCredentials credentials = client.updateCredentials();
-			XmlRpcClientRequest request = new XmlRpcClientRequest(client.getClient().getClientConfig(),
-					getXmlRpcUrl(credentials), method, parameters, monitor);
-			return client.getClient().execute(request);
-		} catch (XmlRpcHttpException e) {
-			handleAuthenticationException(e.code, e.getAuthScheme());
-			// if not handled, re-throw exception
-			throw e;
-		} catch (XmlRpcIllegalContentTypeException e) {
-			throw e;
-		} catch (XmlRpcException e) {
-			// XXX work-around for http://trac-hacks.org/ticket/5848 
-			if ("XML_RPC privileges are required to perform this operation".equals(e.getMessage()) //$NON-NLS-1$
-					|| e.code == XML_FAULT_PERMISSION_DENIED) {
-				handleAuthenticationException(HttpStatus.SC_FORBIDDEN, null);
-				// should never happen as call above should always throw an exception
-				throw new XmlRpcRemoteException(e);
-			} else if (isNoSuchMethodException(e)) {
-				throw new XmlRpcNoSuchMethodException(e);
-			} else {
-				throw new XmlRpcRemoteException(e);
-			}
-		} catch (OperationCanceledException e) {
-			throw e;
-		} catch (Exception e) {
-			throw new XmlRpcException("Unexpected exception", e); //$NON-NLS-1$
-		}
-	}
-
-	protected final CommonXmlRpcClient getClient() {
-		return client;
-	}
-
-	protected Object getMultiCallResult(Object item) {
-		return ((Object[]) item)[0];
-	}
-
-	protected URL getXmlRpcUrl(AuthenticationCredentials credentials) {
-		try {
-			return new URL(client.getLocation().getUrl());
-		} catch (MalformedURLException e) {
-			throw new RuntimeException("Encoding of URL failed", e); //$NON-NLS-1$
-		}
-	}
-
-	protected boolean handleAuthenticationException(int code, AuthScheme authScheme) throws XmlRpcException {
-		if (code == HttpStatus.SC_UNAUTHORIZED) {
-			if (CommonXmlRpcClient.DEBUG_AUTH) {
-				System.err.println(client.getLocation().getUrl() + ": Unauthorized (" + code + ")"); //$NON-NLS-1$ //$NON-NLS-2$ 
-			}
-			client.digestScheme = null;
-			XmlRpcLoginException exception = new XmlRpcLoginException();
-			exception.setNtlmAuthRequested(authScheme instanceof NTLMScheme);
-			throw exception;
-		} else if (code == HttpStatus.SC_FORBIDDEN) {
-			if (CommonXmlRpcClient.DEBUG_AUTH) {
-				System.err.println(client.getLocation().getUrl() + ": Forbidden (" + code + ")"); //$NON-NLS-1$ //$NON-NLS-2$ 
-			}
-			client.digestScheme = null;
-			throw new XmlRpcPermissionDeniedException();
-		} else if (code == HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED) {
-			if (CommonXmlRpcClient.DEBUG_AUTH) {
-				System.err.println(client.getLocation().getUrl() + ": Proxy authentication required (" + code + ")"); //$NON-NLS-1$ //$NON-NLS-2$ 
-			}
-			throw new XmlRpcProxyAuthenticationException();
-		}
-		return false;
-	}
-
-	protected boolean isNoSuchMethodException(XmlRpcException e) {
-		if (RPC_METHOD_NOT_FOUND_PATTERN.matcher(e.getMessage()).find()) {
-			return true;
-		}
-		return false;
-	}
-
-//	protected Object[] multicall(IProgressMonitor monitor, Map<String, Object>... calls) throws XmlRpcException {
-//		Object[] result = (Object[]) call(monitor, "system.multicall", new Object[] { calls }); //$NON-NLS-1$
-//		for (Object item : result) {
-//			checkForException(item);
-//		}
-//		return result;
-//	}
-
-	protected MulticallResult call(IProgressMonitor monitor, Multicall call) throws XmlRpcException {
-		Object[] response = (Object[]) call(monitor, "system.multicall", new Object[] { call.getCalls() }); //$NON-NLS-1$
-		for (Object item : response) {
-			checkForException(item);
-		}
-		return new MulticallResult(response);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcPermissionDeniedException.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcPermissionDeniedException.java
deleted file mode 100644
index 38532d0..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcPermissionDeniedException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import org.apache.xmlrpc.XmlRpcException;
-
-/**
- * Indicates insufficient permissions to execute an operation.
- * 
- * @author Steffen Pingel
- */
-public class XmlRpcPermissionDeniedException extends XmlRpcException {
-
-	private static final long serialVersionUID = -6128773690643367414L;
-
-	public XmlRpcPermissionDeniedException() {
-		super(null);
-	}
-
-	public XmlRpcPermissionDeniedException(String message) {
-		super(message);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcProxyAuthenticationException.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcProxyAuthenticationException.java
deleted file mode 100644
index 3fd5f20..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcProxyAuthenticationException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import org.apache.xmlrpc.XmlRpcException;
-
-public class XmlRpcProxyAuthenticationException extends XmlRpcException {
-
-	private static final long serialVersionUID = 305145749259511429L;
-
-	public XmlRpcProxyAuthenticationException(String message) {
-		super(message);
-	}
-
-	public XmlRpcProxyAuthenticationException() {
-		super(null);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcRemoteException.java b/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcRemoteException.java
deleted file mode 100644
index 76fd033..0000000
--- a/org.eclipse.mylyn.commons.xmlrpc/src/org/eclipse/mylyn/internal/commons/xmlrpc/XmlRpcRemoteException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 Steffen Pingel 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:
- *     Steffen Pingel - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.xmlrpc;
-
-import org.apache.xmlrpc.XmlRpcException;
-
-/**
- * Indicates that an exception on the repository side has been encountered while processing the request.
- * 
- * @author Steffen Pingel
- */
-public class XmlRpcRemoteException extends XmlRpcException {
-
-	private static final long serialVersionUID = -6761365344287289624L;
-
-	public XmlRpcRemoteException() {
-		super(null);
-	}
-
-	public XmlRpcRemoteException(String message) {
-		super(message);
-	}
-
-	public XmlRpcRemoteException(Throwable cause) {
-		super("Remote exception", cause); //$NON-NLS-1$
-	}
-
-	public XmlRpcRemoteException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/.classpath b/org.eclipse.mylyn.discovery.core/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/org.eclipse.mylyn.discovery.core/.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.discovery.core/.cvsignore b/org.eclipse.mylyn.discovery.core/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.discovery.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.discovery.core/.project b/org.eclipse.mylyn.discovery.core/.project
deleted file mode 100644
index 698b41f..0000000
--- a/org.eclipse.mylyn.discovery.core/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.discovery.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.discovery.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.discovery.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1314ffa..0000000
--- a/org.eclipse.mylyn.discovery.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,342 +0,0 @@
-#Tue May 12 20:42:46 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.discovery.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.discovery.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4cbefa9..0000000
--- a/org.eclipse.mylyn.discovery.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Tue May 12 20:42:43 PDT 2009
-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) 2010 Tasktop Technologies 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 * Contributors\:\n *     Tasktop Technologies - initial API and implementation\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.discovery.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.discovery.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.discovery.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.discovery.core/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.discovery.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 5937a85..0000000
--- a/org.eclipse.mylyn.discovery.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,24 +0,0 @@
-#Tue May 20 17:39:22 PDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=2
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-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.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.discovery.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.discovery.core/META-INF/MANIFEST.MF
deleted file mode 100644
index af2bd42..0000000
--- a/org.eclipse.mylyn.discovery.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.discovery.core;singleton:=true
-Bundle-Version: 3.4.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.3.0",
- org.eclipse.mylyn.commons.core;bundle-version="3.1.0",
- org.eclipse.mylyn.commons.net;bundle-version="3.1.0",
- org.eclipse.equinox.p2.repository;bundle-version="1.0.1";resolution:=optional
-Export-Package: org.eclipse.mylyn.internal.discovery.core;x-friends:="org.eclipse.mylyn.discovery.ui",
- org.eclipse.mylyn.internal.discovery.core.model;x-friends:="org.eclipse.mylyn.discovery.ui",
- org.eclipse.mylyn.internal.discovery.core.util;x-friends:="org.eclipse.mylyn.discovery.ui"
diff --git a/org.eclipse.mylyn.discovery.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.mylyn.discovery.core/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index cb88bf3..0000000
--- a/org.eclipse.mylyn.discovery.core/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-#Properties file for org.eclipse.mylyn.discovery.core
-extension-point.name = Connector Discovery
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn Connector Discovery Core
\ No newline at end of file
diff --git a/org.eclipse.mylyn.discovery.core/about.html b/org.eclipse.mylyn.discovery.core/about.html
deleted file mode 100644
index bc6e2b4..0000000
--- a/org.eclipse.mylyn.discovery.core/about.html
+++ /dev/null
@@ -1,28 +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>July 3, 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>
diff --git a/org.eclipse.mylyn.discovery.core/build.properties b/org.eclipse.mylyn.discovery.core/build.properties
deleted file mode 100644
index 624eae2..0000000
--- a/org.eclipse.mylyn.discovery.core/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               xsd/,\
-               schema/,\
-               OSGI-INF/,\
-               OSGI-INF/l10n/
-src.includes = about.html,\
-               schema/,\
-               xsd/
diff --git a/org.eclipse.mylyn.discovery.core/plugin.xml b/org.eclipse.mylyn.discovery.core/plugin.xml
deleted file mode 100644
index e91244b..0000000
--- a/org.eclipse.mylyn.discovery.core/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?><!--
-    Copyright (c) 2009 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
- -->
-<plugin>
-   <extension-point id="connectorDiscovery" name="%extension-point.name" schema="schema/connectorDiscovery.exsd"/>
-
-</plugin>
diff --git a/org.eclipse.mylyn.discovery.core/schema/connectorDiscovery.exsd b/org.eclipse.mylyn.discovery.core/schema/connectorDiscovery.exsd
deleted file mode 100644
index 4505632..0000000
--- a/org.eclipse.mylyn.discovery.core/schema/connectorDiscovery.exsd
+++ /dev/null
@@ -1,434 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.discovery.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.mylyn.discovery.core" id="connectorDiscovery" name="Connector Discovery"/>
-      </appinfo>
-      <documentation>
-         An extension point for contributing to the Mylyn connector discovery mechanism.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="connectorCategory" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="connectorDescriptor" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="certification" minOccurs="0" maxOccurs="unbounded"/>
-         </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="connectorDescriptor">
-      <annotation>
-         <documentation>
-            A description of a connector, including kinds, description, licensing and brand.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="featureFilter" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="icon" minOccurs="0" maxOccurs="1"/>
-            <element ref="overview" minOccurs="0" maxOccurs="1"/>
-            <element ref="iu" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="kind" type="string" use="required">
-            <annotation>
-               <documentation>
-                  must be a comma-delimited list of the following values: &apos;document&apos;, &apos;task&apos;, &apos;vcs&apos;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the connector including the name of the organization that produces the repository if appropriate, for example &apos;Mozilla Bugzilla&apos;.
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="provider" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name of the organization that supplies the connector.
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="license" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The short name of the license, for example &apos;EPL 1.0&apos;, &apos;GPL 2.0&apos;, or &apos;Commercial&apos;.
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  A description of the connector.  Plug-ins should provide a description, especially if the description is not self-evident from the @name and @organization.
-
-Only the first 162 characters of the description are displayed in the UI and line breaks are ignored.
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="siteUrl" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The URL of the update site containing the connector.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the feature that installs this connector
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="categoryId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the id of the connectorCategory in which this connector belongs
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="identifier" basedOn="org.eclipse.mylyn.discovery.core.connectorDiscovery/connectorCategory/@id"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="platformFilter" type="string">
-            <annotation>
-               <documentation>
-                  E.g., &quot;(&amp; (osgi.os=macosx) (osgi.ws=carbon))&quot;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="groupId" type="string">
-            <annotation>
-               <documentation>
-                  The id of the connectorCategory group.  See group/@id for more details.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="identifier" basedOn="org.eclipse.mylyn.discovery.core.connectorDiscovery/connectorDescriptor/@groupId"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="certificationId" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="identifier" basedOn="org.eclipse.mylyn.discovery.core.connectorDiscovery/certification/@id"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="connectorCategory">
-      <annotation>
-         <documentation>
-            a category of connectors, which is a way of organizing connectors in top-level groups.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="icon" minOccurs="0" maxOccurs="1"/>
-            <element ref="overview" minOccurs="0" maxOccurs="1"/>
-            <element ref="group" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  an id that uniquely identifies the category
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the category, as it is displayed in the ui.
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A description of the category
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="relevance" type="string">
-            <annotation>
-               <documentation>
-                  A relevance, which is a number from 0 to 100.  Categories with higher relevance are displayed with preference in the UI.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="icon">
-      <complexType>
-         <attribute name="image16" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="resource"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="image32" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="resource"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="image48" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="resource"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="image64" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="resource"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="image128" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="resource"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="overview">
-      <annotation>
-         <documentation>
-            An overview that provides more detailed information, which may include a summary, url and screenshot.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="summary" type="string">
-            <annotation>
-               <documentation>
-                  A description providing detailed information about the item.  Newlines can be used to format the text into multiple paragraphs if necessary.  Text must fit into an area 320x240, otherwise it will be truncated in the UI.  More lengthy descriptions can be provided on a  web page if required, see @url.
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="url" type="string">
-            <annotation>
-               <documentation>
-                  An URL that points to a web page with more information relevant to the connector or category.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="screenshot" type="string">
-            <annotation>
-               <documentation>
-                  320x240 PNG, JPEG or GIF
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="resource"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="featureFilter">
-      <annotation>
-         <documentation>
-            A means of specifying that a feature must be present in order for the connectorDescriptor to be presented to the user.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="featureId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the feature to test
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="version" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A version specifier, specified in the same manner as version dependencies are specified in an OSGi manifest.  For example: &quot;[3.0,4.0)&quot;
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="group">
-      <annotation>
-         <documentation>
-            groups provide a way to anchor connectors in a grouping with other like entries.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  An identifier that identifies the group.  Must be unique for a particular connectorCategory.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="certification">
-      <complexType>
-         <sequence>
-            <element ref="icon" minOccurs="0" maxOccurs="1"/>
-            <element ref="description"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  An id that uniquely identifies the certification.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name of the certification, as it is displayed in the ui.
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="url" type="string">
-            <annotation>
-               <documentation>
-                  An URL that points to a web page with more information relevant to the certification.
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="description" type="string">
-      <annotation>
-         <appinfo>
-            <meta.element translatable="true"/>
-         </appinfo>
-         <documentation>
-            A textual description.
-         </documentation>
-      </annotation>
-   </element>
-
-   <element name="iu">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the feature that is to be installed.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         3.2
-      </documentation>
-   </annotation>
-
-
-
-
-   <annotation>
-      <appinfo>
-         <meta.section type="copyright"/>
-      </appinfo>
-      <documentation>
-         Copyright (c) 2009 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
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/DiscoveryCore.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/DiscoveryCore.java
deleted file mode 100644
index 7e198be..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/DiscoveryCore.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core;
-
-/**
- * 
- * @author David Green
- */
-public abstract class DiscoveryCore {
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.discovery.core"; //$NON-NLS-1$
-
-	private DiscoveryCore() {
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/AbstractDiscoverySource.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/AbstractDiscoverySource.java
deleted file mode 100644
index e2cd84d..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/AbstractDiscoverySource.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-import java.net.URL;
-
-/**
- * @author David Green
- */
-public abstract class AbstractDiscoverySource {
-	private Policy policy = Policy.defaultPolicy();
-
-	/**
-	 * an identifier that can be used to determine the origin of the source, typically for logging purposes.
-	 */
-	public abstract Object getId();
-
-	/**
-	 * get a resource by an URL relative to the root of the source.
-	 * 
-	 * @param relativeUrl
-	 *            the relative resource name
-	 * @return an URL to the resource, or null if it is known that the resource does not exist.
-	 */
-	public abstract URL getResource(String resourceName);
-
-	public Policy getPolicy() {
-		return policy;
-	}
-
-	public void setPolicy(Policy policy) {
-		this.policy = policy;
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/AbstractDiscoveryStrategy.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/AbstractDiscoveryStrategy.java
deleted file mode 100644
index 0c39b9f..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/AbstractDiscoveryStrategy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * An abstraction of a strategy for discovering connectors and categories. Strategy design pattern. Note that strategies
- * are not reusable and must be disposed.
- * 
- * @author David Green
- */
-public abstract class AbstractDiscoveryStrategy {
-
-	protected List<DiscoveryCategory> categories;
-
-	protected List<DiscoveryConnector> connectors;
-
-	protected List<DiscoveryCertification> certifications;
-
-	/**
-	 * Perform discovery and add discovered items to {@link #getCategories() categories} and {@link #getConnectors()}.
-	 * 
-	 * @param monitor
-	 *            the monitor
-	 */
-	public abstract void performDiscovery(IProgressMonitor monitor) throws CoreException;
-
-	public List<DiscoveryCategory> getCategories() {
-		return categories;
-	}
-
-	public void setCategories(List<DiscoveryCategory> categories) {
-		this.categories = categories;
-	}
-
-	public List<DiscoveryConnector> getConnectors() {
-		return connectors;
-	}
-
-	public void setConnectors(List<DiscoveryConnector> connectors) {
-		this.connectors = connectors;
-	}
-
-	public List<DiscoveryCertification> getCertifications() {
-		return certifications;
-	}
-
-	public void setCertifications(List<DiscoveryCertification> certifications) {
-		this.certifications = certifications;
-	}
-
-	public void dispose() {
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/BundleDiscoverySource.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/BundleDiscoverySource.java
deleted file mode 100644
index 1204cbc..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/BundleDiscoverySource.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-import java.net.URL;
-
-import org.osgi.framework.Bundle;
-
-/**
- * @author David Green
- */
-public class BundleDiscoverySource extends AbstractDiscoverySource {
-
-	private final Bundle bundle;
-
-	public BundleDiscoverySource(Bundle bundle) {
-		if (bundle == null) {
-			throw new IllegalArgumentException();
-		}
-		this.bundle = bundle;
-	}
-
-	@Override
-	public Object getId() {
-		return "bundle:" + bundle.getSymbolicName(); //$NON-NLS-1$
-	}
-
-	@Override
-	public URL getResource(String relativeUrl) {
-		return bundle.getEntry(relativeUrl);
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/BundleDiscoveryStrategy.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/BundleDiscoveryStrategy.java
deleted file mode 100644
index 2f9e74b..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/BundleDiscoveryStrategy.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-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.SubProgressMonitor;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.discovery.core.DiscoveryCore;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-
-/**
- * a strategy for discovering via installed platform {@link Bundle bundles}.
- * 
- * @author David Green
- */
-public class BundleDiscoveryStrategy extends AbstractDiscoveryStrategy {
-
-	@Override
-	public void performDiscovery(IProgressMonitor monitor) throws CoreException {
-		if (connectors == null || categories == null) {
-			throw new IllegalStateException();
-		}
-		IExtensionPoint extensionPoint = getExtensionRegistry().getExtensionPoint(
-				ConnectorDiscoveryExtensionReader.EXTENSION_POINT_ID);
-		IExtension[] extensions = extensionPoint.getExtensions();
-		monitor.beginTask(Messages.BundleDiscoveryStrategy_task_loading_local_extensions, extensions.length == 0 ? 1
-				: extensions.length);
-		try {
-			if (extensions.length > 0) {
-				processExtensions(new SubProgressMonitor(monitor, extensions.length), extensions);
-			}
-		} finally {
-			monitor.done();
-		}
-	}
-
-	protected void processExtensions(IProgressMonitor monitor, IExtension[] extensions) {
-		monitor.beginTask(Messages.BundleDiscoveryStrategy_task_processing_extensions, extensions.length == 0 ? 1
-				: extensions.length);
-		try {
-			ConnectorDiscoveryExtensionReader extensionReader = new ConnectorDiscoveryExtensionReader();
-
-			for (IExtension extension : extensions) {
-				AbstractDiscoverySource discoverySource = computeDiscoverySource(extension.getContributor());
-				IConfigurationElement[] elements = extension.getConfigurationElements();
-				for (IConfigurationElement element : elements) {
-					if (monitor.isCanceled()) {
-						return;
-					}
-					try {
-						if (ConnectorDiscoveryExtensionReader.CONNECTOR_DESCRIPTOR.equals(element.getName())) {
-							DiscoveryConnector descriptor = extensionReader.readConnectorDescriptor(element,
-									DiscoveryConnector.class);
-							descriptor.setSource(discoverySource);
-							connectors.add(descriptor);
-						} else if (ConnectorDiscoveryExtensionReader.CONNECTOR_CATEGORY.equals(element.getName())) {
-							DiscoveryCategory category = extensionReader.readConnectorCategory(element,
-									DiscoveryCategory.class);
-							category.setSource(discoverySource);
-							if (!discoverySource.getPolicy().isPermitCategories()) {
-								StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind(
-										Messages.BundleDiscoveryStrategy_categoryDisallowed, new Object[] {
-												category.getName(), category.getId(),
-												element.getContributor().getName() }), null));
-							} else {
-								categories.add(category);
-							}
-						} else if (ConnectorDiscoveryExtensionReader.CERTIFICATION.equals(element.getName())) {
-							DiscoveryCertification certification = extensionReader.readCertification(element,
-									DiscoveryCertification.class);
-							certification.setSource(discoverySource);
-							certifications.add(certification);
-						} else {
-							throw new ValidationException(NLS.bind(Messages.BundleDiscoveryStrategy_unexpected_element,
-									element.getName()));
-						}
-					} catch (ValidationException e) {
-						StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN,
-								NLS.bind(Messages.BundleDiscoveryStrategy_3, element.getContributor().getName(),
-										e.getMessage()), e));
-					}
-				}
-				monitor.worked(1);
-			}
-		} finally {
-			monitor.done();
-		}
-	}
-
-	protected AbstractDiscoverySource computeDiscoverySource(IContributor contributor) {
-		Policy policy = new Policy(true);
-		BundleDiscoverySource bundleDiscoverySource = new BundleDiscoverySource(
-				Platform.getBundle(contributor.getName()));
-		bundleDiscoverySource.setPolicy(policy);
-		return bundleDiscoverySource;
-	}
-
-	protected IExtensionRegistry getExtensionRegistry() {
-		return Platform.getExtensionRegistry();
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Certification.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Certification.java
deleted file mode 100644
index ea07e1a..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Certification.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-/**
- * A certification for connectors.
- * 
- * @author Steffen Pingel
- */
-public class Certification {
-
-	protected String id;
-
-	protected String name;
-
-	protected String description;
-
-	protected Icon icon;
-
-	protected String url;
-
-	public Certification() {
-	}
-
-	/**
-	 * an id that uniquely identifies the category
-	 */
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * the name of the category, as it is displayed in the ui.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * A description of the category
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public Icon getIcon() {
-		return icon;
-	}
-
-	public void setIcon(Icon icon) {
-		this.icon = icon;
-	}
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public void validate() throws ValidationException {
-		if (id == null || id.length() == 0) {
-			throw new ValidationException(Messages.ConnectorCategory_must_specify_connectorCategory_id);
-		}
-		if (name == null || name.length() == 0) {
-			throw new ValidationException(Messages.ConnectorCategory_must_specify_connectorCategory_name);
-		}
-		if (icon != null) {
-			icon.validate();
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorCategory.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorCategory.java
deleted file mode 100644
index 4ca1b20..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorCategory.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-/**
- * a category of connectors, which is a way of organizing connectors in top-level groups.
- * 
- * @author David Green
- */
-public class ConnectorCategory {
-
-	protected String id;
-
-	protected String name;
-
-	protected String description;
-
-	protected String relevance;
-
-	protected Icon icon;
-
-	protected Overview overview;
-
-	protected java.util.List<Group> group = new java.util.ArrayList<Group>();
-
-	public ConnectorCategory() {
-	}
-
-	/**
-	 * an id that uniquely identifies the category
-	 */
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * the name of the category, as it is displayed in the ui.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * A description of the category
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/**
-	 * A relevance, which is a number from 0 to 100. Categories with higher relevance are displayed with preference in
-	 * the UI.
-	 */
-	public String getRelevance() {
-		return relevance;
-	}
-
-	public void setRelevance(String relevance) {
-		this.relevance = relevance;
-	}
-
-	public Icon getIcon() {
-		return icon;
-	}
-
-	public void setIcon(Icon icon) {
-		this.icon = icon;
-	}
-
-	public Overview getOverview() {
-		return overview;
-	}
-
-	public void setOverview(Overview overview) {
-		this.overview = overview;
-	}
-
-	public java.util.List<Group> getGroup() {
-		return group;
-	}
-
-	public void setGroup(java.util.List<Group> group) {
-		this.group = group;
-	}
-
-	public void validate() throws ValidationException {
-		if (id == null || id.length() == 0) {
-			throw new ValidationException(Messages.ConnectorCategory_must_specify_connectorCategory_id);
-		}
-		if (name == null || name.length() == 0) {
-			throw new ValidationException(Messages.ConnectorCategory_must_specify_connectorCategory_name);
-		}
-		if (description == null || description.length() == 0) {
-			throw new ValidationException("Must specify connectorCategory/@description"); //$NON-NLS-1$
-		}
-		if (icon != null) {
-			icon.validate();
-		}
-		if (relevance != null) {
-			try {
-				int r = Integer.parseInt(relevance, 10);
-				if (r < 0 || r > 100) {
-					throw new NumberFormatException();
-				}
-			} catch (NumberFormatException e) {
-				throw new ValidationException(Messages.ConnectorCategory_connectorCategory_relevance_invalid);
-			}
-		}
-		if (overview != null) {
-			overview.validate();
-		}
-		for (Group groupItem : group) {
-			groupItem.validate();
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDescriptor.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDescriptor.java
deleted file mode 100644
index c99763f..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDescriptor.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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.discovery.core.model;
-
-import java.net.MalformedURLException;
-import java.util.List;
-
-/**
- * A description of a connector, including kind, description, licensing and brand.
- * 
- * @author David Green
- */
-public class ConnectorDescriptor {
-
-	protected java.util.List<ConnectorDescriptorKind> kind = new java.util.ArrayList<ConnectorDescriptorKind>();
-
-	protected String name;
-
-	protected String provider;
-
-	protected String license;
-
-	protected String description;
-
-	protected String siteUrl;
-
-	protected String id;
-
-	protected String categoryId;
-
-	protected String platformFilter;
-
-	protected String groupId;
-
-	protected java.util.List<FeatureFilter> featureFilter = new java.util.ArrayList<FeatureFilter>();
-
-	protected java.util.List<String> installableUnits = new java.util.ArrayList<String>();
-
-	protected Icon icon;
-
-	protected Overview overview;
-
-	protected String certificationId;
-
-	protected boolean installed;
-
-	public ConnectorDescriptor() {
-	}
-
-	/**
-	 * must be one of 'document', 'task', 'vcs'
-	 */
-	public List<ConnectorDescriptorKind> getKind() {
-		return kind;
-	}
-
-	public void setKind(List<ConnectorDescriptorKind> kind) {
-		this.kind = kind;
-	}
-
-	/**
-	 * the name of the connector including the name of the organization that produces the repository if appropriate, for
-	 * example 'Mozilla Bugzilla'.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * The name of the organization that supplies the connector.
-	 */
-	public String getProvider() {
-		return provider;
-	}
-
-	public void setProvider(String provider) {
-		this.provider = provider;
-	}
-
-	/**
-	 * The short name of the license, for example 'EPL 1.0', 'GPL 2.0', or 'Commercial'.
-	 */
-	public String getLicense() {
-		return license;
-	}
-
-	public void setLicense(String license) {
-		this.license = license;
-	}
-
-	/**
-	 * A description of the connector. Plug-ins should provide a description, especially if the description is not
-	 * self-evident from the @name and
-	 * 
-	 * @organization.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/**
-	 * The URL of the update site containing the connector.
-	 */
-	public String getSiteUrl() {
-		return siteUrl;
-	}
-
-	public void setSiteUrl(String siteUrl) {
-		this.siteUrl = siteUrl;
-	}
-
-	/**
-	 * The id of the feature that installs this connector
-	 */
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * the id of the connectorCategory in which this connector belongs
-	 */
-	public String getCategoryId() {
-		return categoryId;
-	}
-
-	public void setCategoryId(String categoryId) {
-		this.categoryId = categoryId;
-	}
-
-	public String getCertificationId() {
-		return certificationId;
-	}
-
-	public void setCertificationId(String certificationId) {
-		this.certificationId = certificationId;
-	}
-
-	/**
-	 * E.g., "(& (osgi.os=macosx) (osgi.ws=carbon))"
-	 */
-	public String getPlatformFilter() {
-		return platformFilter;
-	}
-
-	public void setPlatformFilter(String platformFilter) {
-		this.platformFilter = platformFilter;
-	}
-
-	/**
-	 * The id of the connectorCategory group. See group/@id for more details.
-	 */
-	public String getGroupId() {
-		return groupId;
-	}
-
-	public void setGroupId(String groupId) {
-		this.groupId = groupId;
-	}
-
-	public java.util.List<FeatureFilter> getFeatureFilter() {
-		return featureFilter;
-	}
-
-	public void setFeatureFilter(java.util.List<FeatureFilter> featureFilter) {
-		this.featureFilter = featureFilter;
-	}
-
-	public Icon getIcon() {
-		return icon;
-	}
-
-	public void setIcon(Icon icon) {
-		this.icon = icon;
-	}
-
-	public Overview getOverview() {
-		return overview;
-	}
-
-	public void setOverview(Overview overview) {
-		this.overview = overview;
-	}
-
-	public void validate() throws ValidationException {
-		if (kind == null || kind.isEmpty()) {
-			throw new ValidationException(Messages.ConnectorDescriptor_must_specify_connectorDescriptor_kind);
-		}
-		if (name == null || name.length() == 0) {
-			throw new ValidationException(Messages.ConnectorDescriptor_must_specify_connectorDescriptor_name);
-		}
-		if (provider == null || provider.length() == 0) {
-			throw new ValidationException(Messages.ConnectorDescriptor_must_specify_connectorDescriptor_provider);
-		}
-		if (license == null || license.length() == 0) {
-			throw new ValidationException(Messages.ConnectorDescriptor_must_specify_connectorDescriptor_license);
-		}
-		if (siteUrl == null || siteUrl.length() == 0) {
-			throw new ValidationException(Messages.ConnectorDescriptor_must_specify_connectorDescriptor_siteUrl);
-		}
-		try {
-			new java.net.URL(siteUrl);
-		} catch (MalformedURLException e) {
-			throw new ValidationException(Messages.ConnectorDescriptor_invalid_connectorDescriptor_siteUrl);
-		}
-		if (id == null || id.length() == 0) {
-			throw new ValidationException(Messages.ConnectorDescriptor_must_specify_connectorDescriptor_id);
-		}
-		if (categoryId == null || categoryId.length() == 0) {
-			throw new ValidationException(Messages.ConnectorDescriptor_must_specify_connectorDescriptor_categoryId);
-		}
-		for (FeatureFilter featureFilterItem : featureFilter) {
-			featureFilterItem.validate();
-		}
-		if (icon != null) {
-			icon.validate();
-		}
-		if (overview != null) {
-			overview.validate();
-		}
-	}
-
-	public java.util.List<String> getInstallableUnits() {
-		return installableUnits;
-	}
-
-	public void setInstallableUnits(java.util.List<String> installableUnits) {
-		this.installableUnits = installableUnits;
-	}
-
-	public boolean isInstalled() {
-		return installed;
-	}
-
-	public void setInstalled(boolean installed) {
-		this.installed = installed;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDescriptorKind.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDescriptorKind.java
deleted file mode 100644
index 6b5afc8..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDescriptorKind.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-/**
- * @author David Green
- */
-public enum ConnectorDescriptorKind {
-
-	DOCUMENT("document"), //$NON-NLS-1$
-	TASK("task"), //$NON-NLS-1$
-	VCS("vcs"); //$NON-NLS-1$
-
-	private final String value;
-
-	private ConnectorDescriptorKind(String value) {
-		this.value = value;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * return the enum constant whose {@link #getValue() value} is the same as the given value.
-	 * 
-	 * @param value
-	 *            the string value, or null
-	 * 
-	 * @return the corresponding enum constant or null if the given value was null
-	 * 
-	 * @throws IllegalArgumentException
-	 *             if the given value does not correspond to any enum constant
-	 */
-	public static ConnectorDescriptorKind fromValue(String value) throws IllegalArgumentException {
-		if (value == null) {
-			return null;
-		}
-		for (ConnectorDescriptorKind e : values()) {
-			if (e.getValue().equals(value)) {
-				return e;
-			}
-		}
-		throw new IllegalArgumentException(value);
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscovery.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscovery.java
deleted file mode 100644
index 1d660b1..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscovery.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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.discovery.core.model;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IBundleGroup;
-import org.eclipse.core.runtime.IBundleGroupProvider;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.discovery.core.DiscoveryCore;
-import org.eclipse.mylyn.internal.discovery.core.util.WebUtil;
-import org.eclipse.osgi.service.resolver.VersionRange;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Filter;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.Version;
-
-/**
- * A means of discovering connectors.
- * 
- * @author David Green
- */
-public class ConnectorDiscovery {
-
-	private List<DiscoveryConnector> connectors = Collections.emptyList();
-
-	private List<DiscoveryCategory> categories = Collections.emptyList();
-
-	private List<DiscoveryCertification> certifications = Collections.emptyList();
-
-	private List<DiscoveryConnector> filteredConnectors = Collections.emptyList();
-
-	private final List<AbstractDiscoveryStrategy> discoveryStrategies = new ArrayList<AbstractDiscoveryStrategy>();
-
-	private Dictionary<Object, Object> environment = System.getProperties();
-
-	private boolean verifyUpdateSiteAvailability = false;
-
-	private Map<String, Version> featureToVersion = null;
-
-	public ConnectorDiscovery() {
-	}
-
-	/**
-	 * get the discovery strategies to use.
-	 */
-	public List<AbstractDiscoveryStrategy> getDiscoveryStrategies() {
-		return discoveryStrategies;
-	}
-
-	/**
-	 * Initialize this by performing discovery. Discovery may take a long time as it involves network access.
-	 * PRECONDITION: must add at least one {@link #getDiscoveryStrategies() discovery strategy} prior to calling.
-	 * 
-	 * @return
-	 */
-	public IStatus performDiscovery(IProgressMonitor monitor) {
-		MultiStatus status = new MultiStatus(DiscoveryCore.ID_PLUGIN, 0,
-				Messages.ConnectorDiscovery_Failed_to_discovery_all_Error, null);
-		if (discoveryStrategies.isEmpty()) {
-			throw new IllegalStateException();
-		}
-		connectors = new ArrayList<DiscoveryConnector>();
-		filteredConnectors = new ArrayList<DiscoveryConnector>();
-		categories = new ArrayList<DiscoveryCategory>();
-		certifications = new ArrayList<DiscoveryCertification>();
-
-		final int totalTicks = 100000;
-		final int discoveryTicks = totalTicks - (totalTicks / 10);
-		final int filterTicks = totalTicks - discoveryTicks;
-		monitor.beginTask(Messages.ConnectorDiscovery_task_discovering_connectors, totalTicks);
-		try {
-			for (AbstractDiscoveryStrategy discoveryStrategy : discoveryStrategies) {
-				discoveryStrategy.setCategories(categories);
-				discoveryStrategy.setConnectors(connectors);
-				discoveryStrategy.setCertifications(certifications);
-				try {
-					discoveryStrategy.performDiscovery(new SubProgressMonitor(monitor, discoveryTicks
-							/ discoveryStrategies.size()));
-				} catch (CoreException e) {
-					status.add(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind(
-							Messages.ConnectorDiscovery_Strategy_failed_Error, discoveryStrategy.getClass()
-									.getSimpleName()), e));
-				}
-			}
-
-			filterDescriptors();
-			if (verifyUpdateSiteAvailability) {
-				verifySiteAvailability(new SubProgressMonitor(monitor, filterTicks));
-			}
-			connectCategoriesToDescriptors();
-			connectCertificationsToDescriptors();
-		} finally {
-			monitor.done();
-		}
-		return status;
-	}
-
-	/**
-	 * get the top-level categories
-	 * 
-	 * @return the categories, or an empty list if there are none.
-	 */
-	public List<DiscoveryCategory> getCategories() {
-		return categories;
-	}
-
-	/**
-	 * get the connectors that were discovered and not filtered
-	 * 
-	 * @return the connectors, or an empty list if there are none.
-	 */
-	public List<DiscoveryConnector> getConnectors() {
-		return connectors;
-	}
-
-	/**
-	 * get the connectors that were discovered but filtered
-	 * 
-	 * @return the filtered connectors, or an empty list if there were none.
-	 */
-	public List<DiscoveryConnector> getFilteredConnectors() {
-		return filteredConnectors;
-	}
-
-	/**
-	 * The environment used to resolve {@link ConnectorDescriptor#getPlatformFilter() platform filters}. Defaults to the
-	 * current environment.
-	 */
-	public Dictionary<Object, Object> getEnvironment() {
-		return environment;
-	}
-
-	/**
-	 * The environment used to resolve {@link ConnectorDescriptor#getPlatformFilter() platform filters}. Defaults to the
-	 * current environment.
-	 */
-	public void setEnvironment(Dictionary<Object, Object> environment) {
-		if (environment == null) {
-			throw new IllegalArgumentException();
-		}
-		this.environment = environment;
-	}
-
-	/**
-	 * indicate if update site availability should be verified. The default is false.
-	 * 
-	 * @see DiscoveryConnector#getAvailable()
-	 * @see #verifySiteAvailability(IProgressMonitor)
-	 */
-	public boolean isVerifyUpdateSiteAvailability() {
-		return verifyUpdateSiteAvailability;
-	}
-
-	/**
-	 * indicate if update site availability should be verified. The default is false.
-	 * 
-	 * @see DiscoveryConnector#getAvailable()
-	 * @see #verifySiteAvailability(IProgressMonitor)
-	 */
-	public void setVerifyUpdateSiteAvailability(boolean verifyUpdateSiteAvailability) {
-		this.verifyUpdateSiteAvailability = verifyUpdateSiteAvailability;
-	}
-
-	/**
-	 * <em>not for general use: public for testing purposes only</em> A map of installed features to their version. Used
-	 * to resolve {@link ConnectorDescriptor#getFeatureFilter() feature filters}.
-	 */
-	public Map<String, Version> getFeatureToVersion() {
-		return featureToVersion;
-	}
-
-	/**
-	 * <em>not for general use: public for testing purposes only</em> A map of installed features to their version. Used
-	 * to resolve {@link ConnectorDescriptor#getFeatureFilter() feature filters}.
-	 */
-	public void setFeatureToVersion(Map<String, Version> featureToVersion) {
-		this.featureToVersion = featureToVersion;
-	}
-
-	private void connectCertificationsToDescriptors() {
-		Map<String, DiscoveryCertification> idToCertification = new HashMap<String, DiscoveryCertification>();
-		for (DiscoveryCertification certification : certifications) {
-			DiscoveryCertification previous = idToCertification.put(certification.getId(), certification);
-			if (previous != null) {
-				StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind(
-						"Duplicate certification id ''{0}'': declaring sources: {1}, {2}", //$NON-NLS-1$
-						new Object[] { certification.getId(), certification.getSource().getId(),
-								previous.getSource().getId() })));
-			}
-		}
-
-		for (DiscoveryConnector connector : connectors) {
-			if (connector.getCertificationId() != null) {
-				DiscoveryCertification certification = idToCertification.get(connector.getCertificationId());
-				if (certification != null) {
-					connector.setCertification(certification);
-				} else {
-					StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind(
-							"Unknown category ''{0}'' referenced by connector ''{1}'' declared in {2}", new Object[] { //$NON-NLS-1$
-							connector.getCertificationId(), connector.getId(), connector.getSource().getId() })));
-				}
-			}
-		}
-	}
-
-	private void connectCategoriesToDescriptors() {
-		Map<String, DiscoveryCategory> idToCategory = new HashMap<String, DiscoveryCategory>();
-		for (DiscoveryCategory category : categories) {
-			DiscoveryCategory previous = idToCategory.put(category.getId(), category);
-			if (previous != null) {
-				StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind(
-						Messages.ConnectorDiscovery_duplicate_category_id, new Object[] { category.getId(),
-								category.getSource().getId(), previous.getSource().getId() })));
-			}
-		}
-
-		for (DiscoveryConnector connector : connectors) {
-			DiscoveryCategory category = idToCategory.get(connector.getCategoryId());
-			if (category != null) {
-				category.getConnectors().add(connector);
-				connector.setCategory(category);
-			} else {
-				StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind(
-						Messages.ConnectorDiscovery_bundle_references_unknown_category,
-						new Object[] { connector.getCategoryId(), connector.getId(), connector.getSource().getId() })));
-			}
-		}
-	}
-
-	/**
-	 * eliminate any connectors whose {@link ConnectorDescriptor#getPlatformFilter() platform filters} don't match
-	 */
-	private void filterDescriptors() {
-		for (DiscoveryConnector connector : new ArrayList<DiscoveryConnector>(connectors)) {
-			if (connector.getPlatformFilter() != null && connector.getPlatformFilter().trim().length() > 0) {
-				boolean match = false;
-				try {
-					Filter filter = FrameworkUtil.createFilter(connector.getPlatformFilter());
-					match = filter.match(environment);
-				} catch (InvalidSyntaxException e) {
-					StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind(
-							Messages.ConnectorDiscovery_illegal_filter_syntax,
-							new Object[] { connector.getPlatformFilter(), connector.getId(),
-									connector.getSource().getId() })));
-				}
-				if (!match) {
-					connectors.remove(connector);
-					filteredConnectors.add(connector);
-				}
-			}
-			for (FeatureFilter featureFilter : connector.getFeatureFilter()) {
-				if (featureToVersion == null) {
-					featureToVersion = computeFeatureToVersion();
-				}
-				boolean match = false;
-				Version version = featureToVersion.get(featureFilter.getFeatureId());
-				if (version != null) {
-					VersionRange versionRange = new VersionRange(featureFilter.getVersion());
-					if (versionRange.isIncluded(version)) {
-						match = true;
-					}
-				}
-				if (!match) {
-					connectors.remove(connector);
-					filteredConnectors.add(connector);
-					break;
-				}
-			}
-		}
-	}
-
-	private Map<String, Version> computeFeatureToVersion() {
-		Map<String, Version> featureToVersion = new HashMap<String, Version>();
-		for (IBundleGroupProvider provider : Platform.getBundleGroupProviders()) {
-			for (IBundleGroup bundleGroup : provider.getBundleGroups()) {
-				for (Bundle bundle : bundleGroup.getBundles()) {
-					featureToVersion.put(bundle.getSymbolicName(), bundle.getVersion());
-				}
-			}
-		}
-		return featureToVersion;
-	}
-
-	/**
-	 * Determine update site availability. This may be performed automatically as part of discovery when
-	 * {@link #isVerifyUpdateSiteAvailability()} is true, or it may be invoked later by calling this method.
-	 */
-	public void verifySiteAvailability(IProgressMonitor monitor) {
-		// NOTE: we don't put java.net.URLs in the map since it involves DNS activity when
-		//       computing the hash code.
-		Map<String, Collection<DiscoveryConnector>> urlToDescriptors = new HashMap<String, Collection<DiscoveryConnector>>();
-
-		for (DiscoveryConnector descriptor : connectors) {
-			String url = descriptor.getSiteUrl();
-			if (!url.endsWith("/")) { //$NON-NLS-1$
-				url += "/"; //$NON-NLS-1$
-			}
-			Collection<DiscoveryConnector> collection = urlToDescriptors.get(url);
-			if (collection == null) {
-				collection = new ArrayList<DiscoveryConnector>();
-				urlToDescriptors.put(url, collection);
-			}
-			collection.add(descriptor);
-		}
-		final int totalTicks = urlToDescriptors.size();
-		monitor.beginTask(Messages.ConnectorDiscovery_task_verifyingAvailability, totalTicks);
-		try {
-			if (!urlToDescriptors.isEmpty()) {
-				ExecutorService executorService = Executors.newFixedThreadPool(Math.min(urlToDescriptors.size(), 4));
-				try {
-					List<Future<VerifyUpdateSiteJob>> futures = new ArrayList<Future<VerifyUpdateSiteJob>>(
-							urlToDescriptors.size());
-					for (String url : urlToDescriptors.keySet()) {
-						futures.add(executorService.submit(new VerifyUpdateSiteJob(url)));
-					}
-					for (Future<VerifyUpdateSiteJob> jobFuture : futures) {
-						try {
-							for (;;) {
-								try {
-									VerifyUpdateSiteJob job = jobFuture.get(1L, TimeUnit.SECONDS);
-
-									Collection<DiscoveryConnector> descriptors = urlToDescriptors.get(job.url);
-									for (DiscoveryConnector descriptor : descriptors) {
-										descriptor.setAvailable(job.ok);
-									}
-									break;
-								} catch (TimeoutException e) {
-									if (monitor.isCanceled()) {
-										return;
-									}
-								}
-							}
-						} catch (InterruptedException e) {
-							monitor.setCanceled(true);
-							return;
-						} catch (ExecutionException e) {
-							if (e.getCause() instanceof OperationCanceledException) {
-								monitor.setCanceled(true);
-								return;
-							}
-							IStatus status;
-							if (e.getCause() instanceof CoreException) {
-								status = ((CoreException) e.getCause()).getStatus();
-							} else {
-								status = new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN,
-										Messages.ConnectorDiscovery_unexpected_exception, e.getCause());
-							}
-							StatusHandler.log(status);
-						}
-						monitor.worked(1);
-					}
-				} finally {
-					executorService.shutdownNow();
-				}
-			}
-		} finally {
-			monitor.done();
-		}
-	}
-
-	private static class VerifyUpdateSiteJob implements Callable<VerifyUpdateSiteJob> {
-
-		private final String url;
-
-		private boolean ok = false;
-
-		public VerifyUpdateSiteJob(String url) {
-			this.url = url;
-		}
-
-		public VerifyUpdateSiteJob call() throws Exception {
-			URL baseUrl = new URL(url);
-			List<URI> locations = new ArrayList<URI>();
-			for (String location : new String[] {
-					"content.jar", "content.xml", "compositeContent.jar", "compositeContent.xml", "site.xml" }) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-				locations.add(new URL(baseUrl, location).toURI());
-			}
-			ok = WebUtil.verifyAvailability(locations, true, new NullProgressMonitor());
-			return this;
-		}
-
-	}
-
-	public void dispose() {
-		for (final AbstractDiscoveryStrategy strategy : discoveryStrategies) {
-			SafeRunner.run(new ISafeRunnable() {
-
-				public void run() throws Exception {
-					strategy.dispose();
-				}
-
-				public void handleException(Throwable exception) {
-					StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN,
-							Messages.ConnectorDiscovery_exception_disposing + strategy.getClass().getName(), exception));
-				}
-			});
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscoveryExtensionReader.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscoveryExtensionReader.java
deleted file mode 100644
index 0cdd38c..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscoveryExtensionReader.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Task top 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.discovery.core.model;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
- * Connector Discovery extension point reader, for extension points of type
- * <tt>org.eclipse.mylyn.discovery.core.connectorDiscovery</tt>
- * 
- * @author David Green
- */
-public class ConnectorDiscoveryExtensionReader {
-
-	private static final String P2_FEATURE_GROUP_SUFFIX = ".feature.group"; //$NON-NLS-1$
-
-	public static final String EXTENSION_POINT_ID = "org.eclipse.mylyn.discovery.core.connectorDiscovery"; //$NON-NLS-1$
-
-	public static final String CONNECTOR_DESCRIPTOR = "connectorDescriptor"; //$NON-NLS-1$
-
-	public static final String CONNECTOR_CATEGORY = "connectorCategory"; //$NON-NLS-1$
-
-	public static final String CERTIFICATION = "certification"; //$NON-NLS-1$
-
-	public static final String ICON = "icon"; //$NON-NLS-1$
-
-	public static final String OVERVIEW = "overview"; //$NON-NLS-1$
-
-	public static final String FEATURE_FILTER = "featureFilter"; //$NON-NLS-1$
-
-	public static final String GROUP = "group"; //$NON-NLS-1$
-
-	public ConnectorDescriptor readConnectorDescriptor(IConfigurationElement element) throws ValidationException {
-		return readConnectorDescriptor(element, ConnectorDescriptor.class);
-	}
-
-	public <T extends ConnectorDescriptor> T readConnectorDescriptor(IConfigurationElement element, Class<T> clazz)
-			throws ValidationException {
-		T connectorDescriptor;
-		try {
-			connectorDescriptor = clazz.newInstance();
-		} catch (Exception e) {
-			throw new IllegalStateException(e);
-		}
-
-		try {
-			String kinds = element.getAttribute("kind"); //$NON-NLS-1$
-			if (kinds != null) {
-				String[] akinds = kinds.split("\\s*,\\s*"); //$NON-NLS-1$
-				for (String kind : akinds) {
-					connectorDescriptor.getKind().add(ConnectorDescriptorKind.fromValue(kind));
-				}
-			}
-		} catch (IllegalArgumentException e) {
-			throw new ValidationException(Messages.ConnectorDiscoveryExtensionReader_unexpected_value_kind);
-		}
-		connectorDescriptor.setName(element.getAttribute("name")); //$NON-NLS-1$
-		connectorDescriptor.setProvider(element.getAttribute("provider")); //$NON-NLS-1$
-		connectorDescriptor.setLicense(element.getAttribute("license")); //$NON-NLS-1$
-		connectorDescriptor.setDescription(element.getAttribute("description")); //$NON-NLS-1$
-		connectorDescriptor.setSiteUrl(element.getAttribute("siteUrl")); //$NON-NLS-1$
-		connectorDescriptor.setId(element.getAttribute("id")); //$NON-NLS-1$
-		connectorDescriptor.setCategoryId(element.getAttribute("categoryId")); //$NON-NLS-1$
-		connectorDescriptor.setCertificationId(element.getAttribute("certificationId")); //$NON-NLS-1$
-		connectorDescriptor.setPlatformFilter(element.getAttribute("platformFilter")); //$NON-NLS-1$
-		connectorDescriptor.setGroupId(element.getAttribute("groupId")); //$NON-NLS-1$
-
-		IConfigurationElement[] children = element.getChildren("iu"); //$NON-NLS-1$
-		if (children.length > 0) {
-			for (IConfigurationElement child : children) {
-				connectorDescriptor.getInstallableUnits().add(getFeatureId(child.getAttribute("id"))); //$NON-NLS-1$
-			}
-		} else {
-			// no particular iu specified, use connector id
-			connectorDescriptor.getInstallableUnits().add(getFeatureId(connectorDescriptor.getId()));
-		}
-		for (IConfigurationElement child : element.getChildren("featureFilter")) { //$NON-NLS-1$
-			FeatureFilter featureFilterItem = readFeatureFilter(child);
-			featureFilterItem.setConnectorDescriptor(connectorDescriptor);
-			connectorDescriptor.getFeatureFilter().add(featureFilterItem);
-		}
-		for (IConfigurationElement child : element.getChildren("icon")) { //$NON-NLS-1$
-			Icon iconItem = readIcon(child);
-			if (connectorDescriptor.getIcon() != null) {
-				throw new ValidationException(Messages.ConnectorDiscoveryExtensionReader_unexpected_element_icon);
-			}
-			connectorDescriptor.setIcon(iconItem);
-		}
-		for (IConfigurationElement child : element.getChildren("overview")) { //$NON-NLS-1$
-			Overview overviewItem = readOverview(child);
-			overviewItem.setConnectorDescriptor(connectorDescriptor);
-			if (connectorDescriptor.getOverview() != null) {
-				throw new ValidationException(Messages.ConnectorDiscoveryExtensionReader_unexpected_element_overview);
-			}
-			connectorDescriptor.setOverview(overviewItem);
-		}
-
-		connectorDescriptor.validate();
-
-		return connectorDescriptor;
-	}
-
-	private String getFeatureId(String id) {
-		if (!id.endsWith(P2_FEATURE_GROUP_SUFFIX)) {
-			return id + P2_FEATURE_GROUP_SUFFIX;
-		}
-		return id;
-	}
-
-	public ConnectorCategory readConnectorCategory(IConfigurationElement element) throws ValidationException {
-		return readConnectorCategory(element, ConnectorCategory.class);
-	}
-
-	public <T extends ConnectorCategory> T readConnectorCategory(IConfigurationElement element, Class<T> clazz)
-			throws ValidationException {
-		T connectorCategory;
-		try {
-			connectorCategory = clazz.newInstance();
-		} catch (Exception e) {
-			throw new IllegalStateException(e);
-		}
-
-		connectorCategory.setId(element.getAttribute("id")); //$NON-NLS-1$
-		connectorCategory.setName(element.getAttribute("name")); //$NON-NLS-1$
-		connectorCategory.setDescription(element.getAttribute("description")); //$NON-NLS-1$
-		connectorCategory.setRelevance(element.getAttribute("relevance")); //$NON-NLS-1$
-
-		for (IConfigurationElement child : element.getChildren("icon")) { //$NON-NLS-1$
-			Icon iconItem = readIcon(child);
-			if (connectorCategory.getIcon() != null) {
-				throw new ValidationException(Messages.ConnectorDiscoveryExtensionReader_unexpected_element_icon);
-			}
-			connectorCategory.setIcon(iconItem);
-		}
-		for (IConfigurationElement child : element.getChildren("overview")) { //$NON-NLS-1$
-			Overview overviewItem = readOverview(child);
-			overviewItem.setConnectorCategory(connectorCategory);
-			if (connectorCategory.getOverview() != null) {
-				throw new ValidationException(Messages.ConnectorDiscoveryExtensionReader_unexpected_element_overview);
-			}
-			connectorCategory.setOverview(overviewItem);
-		}
-		for (IConfigurationElement child : element.getChildren("group")) { //$NON-NLS-1$
-			Group groupItem = readGroup(child);
-			groupItem.setConnectorCategory(connectorCategory);
-			connectorCategory.getGroup().add(groupItem);
-		}
-
-		connectorCategory.validate();
-
-		return connectorCategory;
-	}
-
-	public <T extends Certification> T readCertification(IConfigurationElement element, Class<T> clazz)
-			throws ValidationException {
-		T certification;
-		try {
-			certification = clazz.newInstance();
-		} catch (Exception e) {
-			throw new IllegalStateException(e);
-		}
-
-		certification.setId(element.getAttribute("id")); //$NON-NLS-1$
-		certification.setName(element.getAttribute("name")); //$NON-NLS-1$
-		certification.setUrl(element.getAttribute("url")); //$NON-NLS-1$
-
-		for (IConfigurationElement child : element.getChildren("icon")) { //$NON-NLS-1$
-			Icon iconItem = readIcon(child);
-			if (certification.getIcon() != null) {
-				throw new ValidationException(Messages.ConnectorDiscoveryExtensionReader_unexpected_element_icon);
-			}
-			certification.setIcon(iconItem);
-		}
-		for (IConfigurationElement child : element.getChildren("description")) { //$NON-NLS-1$
-			certification.setDescription(child.getValue());
-		}
-		certification.validate();
-
-		return certification;
-	}
-
-	public Icon readIcon(IConfigurationElement element) throws ValidationException {
-		Icon icon = new Icon();
-
-		icon.setImage16(element.getAttribute("image16")); //$NON-NLS-1$
-		icon.setImage32(element.getAttribute("image32")); //$NON-NLS-1$
-		icon.setImage48(element.getAttribute("image48")); //$NON-NLS-1$
-		icon.setImage64(element.getAttribute("image64")); //$NON-NLS-1$
-		icon.setImage128(element.getAttribute("image128")); //$NON-NLS-1$
-
-		icon.validate();
-
-		return icon;
-	}
-
-	public Overview readOverview(IConfigurationElement element) throws ValidationException {
-		Overview overview = new Overview();
-
-		overview.setSummary(element.getAttribute("summary")); //$NON-NLS-1$
-		overview.setUrl(element.getAttribute("url")); //$NON-NLS-1$
-		overview.setScreenshot(element.getAttribute("screenshot")); //$NON-NLS-1$
-
-		overview.validate();
-
-		return overview;
-	}
-
-	public FeatureFilter readFeatureFilter(IConfigurationElement element) throws ValidationException {
-		FeatureFilter featureFilter = new FeatureFilter();
-
-		featureFilter.setFeatureId(element.getAttribute("featureId")); //$NON-NLS-1$
-		featureFilter.setVersion(element.getAttribute("version")); //$NON-NLS-1$
-
-		featureFilter.validate();
-
-		return featureFilter;
-	}
-
-	public Group readGroup(IConfigurationElement element) throws ValidationException {
-		Group group = new Group();
-
-		group.setId(element.getAttribute("id")); //$NON-NLS-1$
-
-		group.validate();
-
-		return group;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Directory.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Directory.java
deleted file mode 100644
index bac747a..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Directory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A directory representing locations of discovery sources.
- * 
- * @author David Green
- */
-public class Directory {
-
-	/**
-	 * an entry in the directory, which represents a specific discovery source. Future versions of this class may
-	 * include policy or other attributes declared by the directory.
-	 */
-	public static final class Entry {
-		private String location;
-
-		private boolean permitCategories;
-
-		public Entry() {
-		}
-
-		/**
-		 * the location of the entry (an URL)
-		 */
-		public String getLocation() {
-			return location;
-		}
-
-		/**
-		 * the location of the entry (an URL)
-		 */
-		public void setLocation(String location) {
-			this.location = location;
-		}
-
-		/**
-		 * indicate if creation of categories by this location is permitted
-		 */
-		public boolean isPermitCategories() {
-			return permitCategories;
-		}
-
-		/**
-		 * indicate if creation of categories by this location is permitted
-		 */
-		public void setPermitCategories(boolean permitCategories) {
-			this.permitCategories = permitCategories;
-		}
-	}
-
-	private final List<Entry> entries = new ArrayList<Entry>();
-
-	public List<Entry> getEntries() {
-		return entries;
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DirectoryParser.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DirectoryParser.java
deleted file mode 100644
index 91343aa..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DirectoryParser.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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.discovery.core.model;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.eclipse.mylyn.internal.discovery.core.model.Directory.Entry;
-import org.eclipse.mylyn.internal.discovery.core.util.DefaultSaxErrorHandler;
-import org.eclipse.mylyn.internal.discovery.core.util.IOWithCauseException;
-import org.eclipse.osgi.util.NLS;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * A parser for {@link Directory directories}.
- * 
- * @author David Green
- */
-public class DirectoryParser {
-
-	public DirectoryParser() {
-		// ignore
-	}
-
-	/**
-	 * Base URI for relative entries.
-	 */
-	URI baseUri;
-
-	public URI getBaseUri() {
-		return baseUri;
-	}
-
-	public void setBaseUri(URI baseUri) {
-		this.baseUri = baseUri;
-	}
-
-	/**
-	 * parse the contents of a directory. The caller must close the given reader.
-	 * 
-	 * @param directoryContents
-	 *            the contents of the directory
-	 * @return a directory with 0 or more entries
-	 * @throws IOException
-	 *             if the directory cannot be read.
-	 */
-	public Directory parse(Reader directoryContents) throws IOException {
-		XMLReader xmlReader;
-		try {
-			xmlReader = XMLReaderFactory.createXMLReader();
-		} catch (SAXException e) {
-			throw new IOWithCauseException(e.getMessage(), e);
-		}
-		xmlReader.setErrorHandler(new DefaultSaxErrorHandler());
-
-		DirectoryContentHandler contentHandler = new DirectoryContentHandler();
-		xmlReader.setContentHandler(contentHandler);
-
-		try {
-			xmlReader.parse(new InputSource(directoryContents));
-		} catch (SAXException e) {
-			throw new IOWithCauseException(e.getMessage(), e);
-		}
-
-		if (contentHandler.directory == null) {
-			throw new IOException(Messages.DirectoryParser_no_directory);
-		}
-
-		return contentHandler.directory;
-	}
-
-	private class DirectoryContentHandler implements ContentHandler {
-
-		Directory directory;
-
-		public void characters(char[] ch, int start, int length) throws SAXException {
-			// ignore
-		}
-
-		public void endDocument() throws SAXException {
-			// ignore
-		}
-
-		public void endElement(String uri, String localName, String qName) throws SAXException {
-			// ignore
-		}
-
-		public void endPrefixMapping(String prefix) throws SAXException {
-			// ignore
-		}
-
-		public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
-			// ignore
-		}
-
-		public void processingInstruction(String target, String data) throws SAXException {
-			// ignore
-		}
-
-		public void setDocumentLocator(Locator locator) {
-			// ignore
-		}
-
-		public void skippedEntity(String name) throws SAXException {
-			// ignore
-		}
-
-		public void startDocument() throws SAXException {
-			// ignore
-		}
-
-		public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
-			if ("directory".equals(localName)) { //$NON-NLS-1$
-				if (directory != null) {
-					unexpectedElement(localName);
-				}
-				directory = new Directory();
-			} else if (directory != null && "entry".equals(localName)) { //$NON-NLS-1$
-				String url = atts.getValue("", "url"); //$NON-NLS-1$ //$NON-NLS-2$
-				if (url != null && url.length() > 0) {
-					try {
-						URI entryUri = new URI(url);
-						if (baseUri != null && !entryUri.isAbsolute()) {
-							url = baseUri.resolve(url).toString();
-						}
-					} catch (URISyntaxException e) {
-						// ignore
-					}
-
-					Entry entry = new Entry();
-					entry.setLocation(url);
-					entry.setPermitCategories(Boolean.parseBoolean(atts.getValue("permitCategories"))); //$NON-NLS-1$
-					directory.getEntries().add(entry);
-				}
-			}
-			// else ignore
-		}
-
-		private void unexpectedElement(String localName) throws SAXException {
-			throw new SAXException(NLS.bind(Messages.DirectoryParser_unexpected_element, localName));
-		}
-
-		public void startPrefixMapping(String prefix, String uri) throws SAXException {
-			// ignore
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryCategory.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryCategory.java
deleted file mode 100644
index 02f3e80..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryCategory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author David Green
- */
-public class DiscoveryCategory extends ConnectorCategory {
-
-	private AbstractDiscoverySource source;
-
-	private final List<DiscoveryConnector> connectors = new ArrayList<DiscoveryConnector>();
-
-	public List<DiscoveryConnector> getConnectors() {
-		return connectors;
-	}
-
-	public AbstractDiscoverySource getSource() {
-		return source;
-	}
-
-	public void setSource(AbstractDiscoverySource source) {
-		this.source = source;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryCertification.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryCertification.java
deleted file mode 100644
index d19baca..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryCertification.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-/**
- * @author Steffen Pingel
- */
-public class DiscoveryCertification extends Certification {
-
-	private AbstractDiscoverySource source;
-
-	public AbstractDiscoverySource getSource() {
-		return source;
-	}
-
-	public void setSource(AbstractDiscoverySource source) {
-		this.source = source;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryConnector.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryConnector.java
deleted file mode 100644
index c3c7dae..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryConnector.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-
-/**
- * @author David Green
- */
-public class DiscoveryConnector extends ConnectorDescriptor {
-	private AbstractDiscoverySource source;
-
-	private DiscoveryCategory category;
-
-	private boolean selected;
-
-	private Boolean available;
-
-	private DiscoveryCertification certification;
-
-	private final PropertyChangeSupport changeSupport;
-
-	public DiscoveryConnector() {
-		changeSupport = new PropertyChangeSupport(this);
-	}
-
-	public DiscoveryCategory getCategory() {
-		return category;
-	}
-
-	public void setCategory(DiscoveryCategory category) {
-		this.category = category;
-	}
-
-	public AbstractDiscoverySource getSource() {
-		return source;
-	}
-
-	public void setSource(AbstractDiscoverySource source) {
-		this.source = source;
-	}
-
-	public DiscoveryCertification getCertification() {
-		return certification;
-	}
-
-	public void setCertification(DiscoveryCertification certification) {
-		this.certification = certification;
-	}
-
-	/**
-	 * support selection
-	 * 
-	 * @return true if the item is selected, otherwise false
-	 */
-	public boolean isSelected() {
-		return selected;
-	}
-
-	/**
-	 * support selection
-	 * 
-	 * @param selected
-	 *            true if the item is selected, otherwise false
-	 */
-	public void setSelected(boolean selected) {
-		this.selected = selected;
-	}
-
-	/**
-	 * indicate if this connector is available
-	 * 
-	 * @return true if available, false if not, or null if availability is unknown
-	 */
-	public Boolean getAvailable() {
-		return available;
-	}
-
-	/**
-	 * indicate if this connector is available
-	 * 
-	 * @param available
-	 *            true if available, false if not, or null if availability is unknown
-	 */
-	public void setAvailable(Boolean available) {
-		if (available != this.available || (available != null && !available.equals(this.available))) {
-			Boolean previous = this.available;
-			this.available = available;
-			changeSupport.firePropertyChange("available", previous, this.available); //$NON-NLS-1$
-		}
-	}
-
-	public void addPropertyChangeListener(PropertyChangeListener listener) {
-		changeSupport.addPropertyChangeListener(listener);
-	}
-
-	public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		changeSupport.addPropertyChangeListener(propertyName, listener);
-	}
-
-	public void removePropertyChangeListener(PropertyChangeListener listener) {
-		changeSupport.removePropertyChangeListener(listener);
-	}
-
-	public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		changeSupport.removePropertyChangeListener(propertyName, listener);
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryRegistryStrategy.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryRegistryStrategy.java
deleted file mode 100644
index 303cfab..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/DiscoveryRegistryStrategy.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
-
-import org.eclipse.core.runtime.IContributor;
-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.core.runtime.spi.IDynamicExtensionRegistry;
-import org.eclipse.core.runtime.spi.RegistryContributor;
-import org.eclipse.core.runtime.spi.RegistryStrategy;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.discovery.core.DiscoveryCore;
-import org.eclipse.mylyn.internal.discovery.core.model.Directory.Entry;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-
-/**
- * @author David Green
- */
-class DiscoveryRegistryStrategy extends RegistryStrategy {
-
-	private final List<JarFile> jars = new ArrayList<JarFile>();
-
-	private final Map<IContributor, File> contributorToJarFile = new HashMap<IContributor, File>();
-
-	private final Map<IContributor, Entry> contributorToDirectoryEntry = new HashMap<IContributor, Entry>();
-
-	private final Object token;
-
-	private Map<File, Entry> bundleFileToDirectoryEntry;
-
-	public DiscoveryRegistryStrategy(File[] storageDirs, boolean[] cacheReadOnly, Object token) {
-		super(storageDirs, cacheReadOnly);
-		this.token = token;
-	}
-
-	@Override
-	public void onStart(IExtensionRegistry registry, boolean loadedFromCache) {
-		super.onStart(registry, loadedFromCache);
-		if (!loadedFromCache) {
-			processDiscoveryCoreBundle(registry);
-			processBundles(registry);
-		}
-	}
-
-	private void processDiscoveryCoreBundle(IExtensionRegistry registry) {
-		// we must add a contribution from the core bundle so that we get the
-		// extension point itself
-		try {
-			Bundle bundle = Platform.getBundle(DiscoveryCore.ID_PLUGIN);
-			IContributor contributor = new RegistryContributor(bundle.getSymbolicName(), bundle.getSymbolicName(),
-					null, null);
-
-			InputStream inputStream = bundle.getEntry("plugin.xml").openStream(); //$NON-NLS-1$
-			try {
-				registry.addContribution(inputStream, contributor, false, bundle.getSymbolicName(), null, token);
-			} finally {
-				inputStream.close();
-			}
-		} catch (IOException e) {
-			throw new IllegalStateException();
-		}
-	}
-
-	private void processBundles(IExtensionRegistry registry) {
-		if (bundleFileToDirectoryEntry == null) {
-			throw new IllegalStateException();
-		}
-		for (java.util.Map.Entry<File, Entry> bundleFile : bundleFileToDirectoryEntry.entrySet()) {
-			try {
-				processBundle(registry, bundleFile.getValue(), bundleFile.getKey());
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind(
-						Messages.DiscoveryRegistryStrategy_cannot_load_bundle, new Object[] {
-								bundleFile.getKey().getName(), bundleFile.getValue().getLocation(), e.getMessage() }),
-						e));
-			}
-		}
-	}
-
-	private void processBundle(IExtensionRegistry registry, Directory.Entry entry, File bundleFile) throws IOException {
-		JarFile jarFile = new JarFile(bundleFile);
-		jars.add(jarFile);
-
-		ZipEntry pluginXmlEntry = jarFile.getEntry("plugin.xml"); //$NON-NLS-1$
-		if (pluginXmlEntry == null) {
-			throw new IOException(Messages.DiscoveryRegistryStrategy_missing_pluginxml);
-		}
-		IContributor contributor = new RegistryContributor(bundleFile.getName(), bundleFile.getName(), null, null);
-		if (((IDynamicExtensionRegistry) registry).hasContributor(contributor)) {
-			jarFile.close();
-			return;
-		}
-		contributorToJarFile.put(contributor, bundleFile);
-		contributorToDirectoryEntry.put(contributor, entry);
-
-		ResourceBundle translationBundle = loadTranslationBundle(jarFile);
-
-		InputStream inputStream = jarFile.getInputStream(pluginXmlEntry);
-		try {
-			registry.addContribution(inputStream, contributor, false, bundleFile.getPath(), translationBundle, token);
-		} finally {
-			inputStream.close();
-		}
-	}
-
-	private ResourceBundle loadTranslationBundle(JarFile jarFile) throws IOException {
-		List<String> bundleNames = computeBundleNames("plugin"); //$NON-NLS-1$
-		for (String bundleName : bundleNames) {
-			ZipEntry entry = jarFile.getEntry(bundleName);
-			if (entry != null) {
-				InputStream inputStream = jarFile.getInputStream(entry);
-				try {
-					PropertyResourceBundle resourceBundle = new PropertyResourceBundle(inputStream);
-					return resourceBundle;
-				} finally {
-					inputStream.close();
-				}
-			}
-		}
-		return null;
-	}
-
-	private List<String> computeBundleNames(String baseName) {
-		String suffix = ".properties"; //$NON-NLS-1$
-		String name = baseName;
-		List<String> bundleNames = new ArrayList<String>();
-		Locale locale = Locale.getDefault();
-		bundleNames.add(name + suffix);
-		if (locale.getLanguage() != null && locale.getLanguage().length() > 0) {
-			name = name + '_' + locale.getLanguage();
-			bundleNames.add(0, name + suffix);
-		}
-		if (locale.getCountry() != null && locale.getCountry().length() > 0) {
-			name = name + '_' + locale.getCountry();
-			bundleNames.add(0, name + suffix);
-		}
-		if (locale.getVariant() != null && locale.getVariant().length() > 0) {
-			name = name + '_' + locale.getVariant();
-			bundleNames.add(0, name + suffix);
-		}
-		return bundleNames;
-	}
-
-	@Override
-	public void onStop(IExtensionRegistry registry) {
-		try {
-			super.onStop(registry);
-		} finally {
-			for (JarFile jar : jars) {
-				try {
-					jar.close();
-				} catch (Exception e) {
-				}
-			}
-			jars.clear();
-		}
-	}
-
-	/**
-	 * get the jar file that corresponds to the given contributor.
-	 * 
-	 * @throws IllegalArgumentException
-	 *             if the given contributor is unknown
-	 */
-	public File getJarFile(IContributor contributor) {
-		File file = contributorToJarFile.get(contributor);
-		if (file == null) {
-			throw new IllegalArgumentException(contributor.getName());
-		}
-		return file;
-	}
-
-	/**
-	 * get the directory entry that corresponds to the given contributor.
-	 * 
-	 * @throws IllegalArgumentException
-	 *             if the given contributor is unknown
-	 */
-	public Entry getDirectoryEntry(IContributor contributor) {
-		Entry entry = contributorToDirectoryEntry.get(contributor);
-		if (entry == null) {
-			throw new IllegalArgumentException(contributor.getName());
-		}
-		return entry;
-	}
-
-	public void setBundles(Map<File, Entry> bundleFileToDirectoryEntry) {
-		this.bundleFileToDirectoryEntry = bundleFileToDirectoryEntry;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/FeatureFilter.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/FeatureFilter.java
deleted file mode 100644
index c60e224..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/FeatureFilter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-/**
- * A means of specifying that a feature must be present in order for the connectorDescriptor to be presented to the
- * user.
- * 
- * @author David Green
- */
-public class FeatureFilter {
-
-	protected String featureId;
-
-	protected String version;
-
-	protected ConnectorDescriptor connectorDescriptor;
-
-	public FeatureFilter() {
-	}
-
-	/**
-	 * The id of the feature to test
-	 */
-	public String getFeatureId() {
-		return featureId;
-	}
-
-	public void setFeatureId(String featureId) {
-		this.featureId = featureId;
-	}
-
-	/**
-	 * A version specifier, specified in the same manner as version dependencies are specified in an OSGi manifest. For
-	 * example: "[3.0,4.0)"
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public ConnectorDescriptor getConnectorDescriptor() {
-		return connectorDescriptor;
-	}
-
-	public void setConnectorDescriptor(ConnectorDescriptor connectorDescriptor) {
-		this.connectorDescriptor = connectorDescriptor;
-	}
-
-	public void validate() throws ValidationException {
-		if (featureId == null || featureId.length() == 0) {
-			throw new ValidationException(Messages.FeatureFilter_must_specify_featureFilter_featureId);
-		}
-		if (version == null || version.length() == 0) {
-			throw new ValidationException(Messages.FeatureFilter_must_specify_featureFilter_version);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Group.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Group.java
deleted file mode 100644
index c3347a3..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Group.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Task top 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.discovery.core.model;
-
-/**
- * groups provide a way to anchor connectors in a grouping with other like entries.
- * 
- * @author David Green
- */
-public class Group {
-
-	protected String id;
-
-	protected ConnectorCategory connectorCategory;
-
-	public Group() {
-	}
-
-	/**
-	 * An identifier that identifies the group. Must be unique for a particular connectorCategory.
-	 */
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ConnectorCategory getConnectorCategory() {
-		return connectorCategory;
-	}
-
-	public void setConnectorCategory(ConnectorCategory connectorCategory) {
-		this.connectorCategory = connectorCategory;
-	}
-
-	public void validate() throws ValidationException {
-		if (id == null || id.length() == 0) {
-			throw new ValidationException(Messages.Group_must_specify_group_id);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Icon.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Icon.java
deleted file mode 100644
index af02b87..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Icon.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-/**
- * @author David Green
- */
-public class Icon {
-
-	protected String image16;
-
-	protected String image32;
-
-	protected String image48;
-
-	protected String image64;
-
-	protected String image128;
-
-	public Icon() {
-	}
-
-	public String getImage16() {
-		return image16;
-	}
-
-	public void setImage16(String image16) {
-		this.image16 = image16;
-	}
-
-	public String getImage32() {
-		return image32;
-	}
-
-	public void setImage32(String image32) {
-		this.image32 = image32;
-	}
-
-	public String getImage48() {
-		return image48;
-	}
-
-	public void setImage48(String image48) {
-		this.image48 = image48;
-	}
-
-	public String getImage64() {
-		return image64;
-	}
-
-	public void setImage64(String image64) {
-		this.image64 = image64;
-	}
-
-	public String getImage128() {
-		return image128;
-	}
-
-	public void setImage128(String image128) {
-		this.image128 = image128;
-	}
-
-	public void validate() throws ValidationException {
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/JarDiscoverySource.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/JarDiscoverySource.java
deleted file mode 100644
index 5c44acd..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/JarDiscoverySource.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
-
-/**
- * 
- * @author David Green
- */
-public class JarDiscoverySource extends AbstractDiscoverySource {
-
-	private final String id;
-
-	private final File jarFile;
-
-	public JarDiscoverySource(String id, File jarFile) {
-		this.id = id;
-		this.jarFile = jarFile;
-	}
-
-	@Override
-	public Object getId() {
-		return id;
-	}
-
-	@Override
-	public URL getResource(String resourceName) {
-		try {
-			String prefix = jarFile.toURI().toURL().toExternalForm();
-
-			return new URL("jar:" + prefix + "!/" + URLEncoder.encode(resourceName, "utf-8")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		} catch (MalformedURLException e) {
-			throw new IllegalStateException(e);
-		} catch (UnsupportedEncodingException e) {
-			throw new IllegalStateException(e);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Messages.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Messages.java
deleted file mode 100644
index d6caba1..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Messages.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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.discovery.core.model;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author David Green
- */
-class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.discovery.core.model.messages"; //$NON-NLS-1$
-
-	public static String BundleDiscoveryStrategy_3;
-
-	public static String BundleDiscoveryStrategy_categoryDisallowed;
-
-	public static String BundleDiscoveryStrategy_task_loading_local_extensions;
-
-	public static String BundleDiscoveryStrategy_task_processing_extensions;
-
-	public static String BundleDiscoveryStrategy_unexpected_element;
-
-	public static String ConnectorCategory_connectorCategory_relevance_invalid;
-
-	public static String ConnectorCategory_must_specify_connectorCategory_id;
-
-	public static String ConnectorCategory_must_specify_connectorCategory_name;
-
-	public static String ConnectorDescriptor_invalid_connectorDescriptor_siteUrl;
-
-	public static String ConnectorDescriptor_must_specify_connectorDescriptor_categoryId;
-
-	public static String ConnectorDescriptor_must_specify_connectorDescriptor_id;
-
-	public static String ConnectorDescriptor_must_specify_connectorDescriptor_kind;
-
-	public static String ConnectorDescriptor_must_specify_connectorDescriptor_license;
-
-	public static String ConnectorDescriptor_must_specify_connectorDescriptor_name;
-
-	public static String ConnectorDescriptor_must_specify_connectorDescriptor_provider;
-
-	public static String ConnectorDescriptor_must_specify_connectorDescriptor_siteUrl;
-
-	public static String ConnectorDiscovery_bundle_references_unknown_category;
-
-	public static String ConnectorDiscovery_duplicate_category_id;
-
-	public static String ConnectorDiscovery_exception_disposing;
-
-	public static String ConnectorDiscovery_Failed_to_discovery_all_Error;
-
-	public static String ConnectorDiscovery_illegal_filter_syntax;
-
-	public static String ConnectorDiscovery_Strategy_failed_Error;
-
-	public static String ConnectorDiscovery_task_discovering_connectors;
-
-	public static String ConnectorDiscovery_task_verifyingAvailability;
-
-	public static String ConnectorDiscovery_unexpected_exception;
-
-	public static String ConnectorDiscoveryExtensionReader_unexpected_element_icon;
-
-	public static String ConnectorDiscoveryExtensionReader_unexpected_element_overview;
-
-	public static String ConnectorDiscoveryExtensionReader_unexpected_value_kind;
-
-	public static String DirectoryParser_no_directory;
-
-	public static String DirectoryParser_unexpected_element;
-
-	public static String DiscoveryRegistryStrategy_cannot_load_bundle;
-
-	public static String DiscoveryRegistryStrategy_missing_pluginxml;
-
-	public static String FeatureFilter_must_specify_featureFilter_featureId;
-
-	public static String FeatureFilter_must_specify_featureFilter_version;
-
-	public static String Group_must_specify_group_id;
-
-	public static String RemoteBundleDiscoveryStrategy_cannot_download_bundle;
-
-	public static String RemoteBundleDiscoveryStrategy_empty_directory;
-
-	public static String RemoteBundleDiscoveryStrategy_io_failure_discovery_directory;
-
-	public static String RemoteBundleDiscoveryStrategy_io_failure_temp_storage;
-
-	public static String RemoteBundleDiscoveryStrategy_task_remote_discovery;
-
-	public static String RemoteBundleDiscoveryStrategy_unexpectedError;
-
-	public static String RemoteBundleDiscoveryStrategy_unknown_host_discovery_directory;
-
-	public static String RemoteBundleDiscoveryStrategy_unrecognized_discovery_url;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Overview.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Overview.java
deleted file mode 100644
index 4f052ec..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Overview.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-/**
- * @author David Green
- */
-public class Overview {
-
-	protected String summary;
-
-	protected String url;
-
-	protected String screenshot;
-
-	protected ConnectorDescriptor connectorDescriptor;
-
-	protected ConnectorCategory connectorCategory;
-
-	public Overview() {
-	}
-
-	/**
-	 * A description providing detailed information about the item. Newlines can be used to format the text into
-	 * multiple paragraphs if necessary. Text must fit into an area 320x240, otherwise it will be truncated in the UI.
-	 * More lengthy descriptions can be provided on a web page if required, see @url.
-	 */
-	public String getSummary() {
-		return summary;
-	}
-
-	public void setSummary(String summary) {
-		this.summary = summary;
-	}
-
-	/**
-	 * An URL that points to a web page with more information relevant to the connector or category.
-	 */
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	/**
-	 * 320x240 PNG, JPEG or GIF
-	 */
-	public String getScreenshot() {
-		return screenshot;
-	}
-
-	public void setScreenshot(String screenshot) {
-		this.screenshot = screenshot;
-	}
-
-	public ConnectorDescriptor getConnectorDescriptor() {
-		return connectorDescriptor;
-	}
-
-	public void setConnectorDescriptor(ConnectorDescriptor connectorDescriptor) {
-		this.connectorDescriptor = connectorDescriptor;
-	}
-
-	public ConnectorCategory getConnectorCategory() {
-		return connectorCategory;
-	}
-
-	public void setConnectorCategory(ConnectorCategory connectorCategory) {
-		this.connectorCategory = connectorCategory;
-	}
-
-	public void validate() throws ValidationException {
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Policy.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Policy.java
deleted file mode 100644
index ee7fe55..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/Policy.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-/**
- * a policy defines what is permitted.
- * 
- * @author David Green
- */
-public class Policy {
-	/**
-	 * Define system property <code>org.eclipse.mylyn.internal.discovery.core.model.Policy.permissive=true</code> to
-	 * allow for categories to be permitted by anyone. For testing purposes.
-	 */
-	private static final boolean PERMISSIVE = Boolean.getBoolean(Policy.class.getName() + ".permissive"); //$NON-NLS-1$
-
-	private static final Policy DEFAULT = new Policy(false);
-
-	private final boolean permitCategories;
-
-	public Policy(boolean permitCategories) {
-		this.permitCategories = permitCategories;
-	}
-
-	public boolean isPermitCategories() {
-		return permitCategories || PERMISSIVE;
-	}
-
-	public static Policy defaultPolicy() {
-		return DEFAULT;
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/RemoteBundleDiscoveryStrategy.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/RemoteBundleDiscoveryStrategy.java
deleted file mode 100644
index 3f4b14d..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/RemoteBundleDiscoveryStrategy.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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.discovery.core.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.eclipse.core.internal.registry.ExtensionRegistry;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.discovery.core.DiscoveryCore;
-import org.eclipse.mylyn.internal.discovery.core.model.Directory.Entry;
-import org.eclipse.mylyn.internal.discovery.core.util.WebUtil;
-import org.eclipse.mylyn.internal.discovery.core.util.WebUtil.TextContentProcessor;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * A discovery strategy that downloads a simple directory of remote jars. The directory is first downloaded, then each
- * remote jar is downloaded.
- * 
- * @author David Green
- */
-@SuppressWarnings("restriction")
-public class RemoteBundleDiscoveryStrategy extends BundleDiscoveryStrategy {
-
-	private String directoryUrl;
-
-	private DiscoveryRegistryStrategy registryStrategy;
-
-	private File temporaryStorage;
-
-	private int maxDiscoveryJarDownloadAttempts = 1;
-
-	@Override
-	public void performDiscovery(IProgressMonitor monitor) throws CoreException {
-		if (connectors == null || categories == null || directoryUrl == null) {
-			throw new IllegalStateException();
-		}
-		if (registryStrategy != null) {
-			throw new IllegalStateException();
-		}
-
-		final int totalTicks = 100000;
-		final int ticksTenPercent = totalTicks / 10;
-		monitor.beginTask(Messages.RemoteBundleDiscoveryStrategy_task_remote_discovery, totalTicks);
-		try {
-			File registryCacheFolder;
-			try {
-				if (temporaryStorage != null && temporaryStorage.exists()) {
-					delete(temporaryStorage);
-				}
-				temporaryStorage = File.createTempFile(RemoteBundleDiscoveryStrategy.class.getSimpleName(), ".tmp"); //$NON-NLS-1$
-				temporaryStorage.delete();
-				if (!temporaryStorage.mkdirs()) {
-					throw new IOException();
-				}
-				registryCacheFolder = new File(temporaryStorage, ".rcache"); //$NON-NLS-1$
-				if (!registryCacheFolder.mkdirs()) {
-					throw new IOException();
-				}
-			} catch (IOException e) {
-				throw new CoreException(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN,
-						Messages.RemoteBundleDiscoveryStrategy_io_failure_temp_storage, e));
-			}
-			if (monitor.isCanceled()) {
-				return;
-			}
-
-			Directory directory;
-
-			try {
-				final Directory[] temp = new Directory[1];
-				final URI uri = new URI(directoryUrl);
-				WebUtil.readResource(uri, new TextContentProcessor() {
-					public void process(Reader reader) throws IOException {
-						DirectoryParser parser = new DirectoryParser();
-						parser.setBaseUri(uri);
-						temp[0] = parser.parse(reader);
-					}
-				}, new SubProgressMonitor(monitor, ticksTenPercent));
-				directory = temp[0];
-				if (directory == null) {
-					throw new IllegalStateException();
-				}
-			} catch (UnknownHostException e) {
-				throw new CoreException(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind(
-						Messages.RemoteBundleDiscoveryStrategy_unknown_host_discovery_directory, e.getMessage()), e));
-			} catch (IOException e) {
-				throw new CoreException(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN,
-						Messages.RemoteBundleDiscoveryStrategy_io_failure_discovery_directory, e));
-			} catch (URISyntaxException e) {
-				throw new CoreException(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN,
-						Messages.RemoteBundleDiscoveryStrategy_io_failure_discovery_directory, e));
-			}
-			if (monitor.isCanceled()) {
-				return;
-			}
-			if (directory.getEntries().isEmpty()) {
-				throw new CoreException(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN,
-						Messages.RemoteBundleDiscoveryStrategy_empty_directory));
-			}
-
-			Map<File, Directory.Entry> bundleFileToDirectoryEntry = new HashMap<File, Directory.Entry>();
-
-			ExecutorService executorService = createExecutorService(directory.getEntries().size());
-			try {
-				List<Future<DownloadBundleJob>> futures = new ArrayList<Future<DownloadBundleJob>>();
-				// submit jobs
-				for (Directory.Entry entry : directory.getEntries()) {
-					futures.add(executorService.submit(new DownloadBundleJob(entry, monitor)));
-				}
-				int futureSize = ticksTenPercent * 4 / directory.getEntries().size();
-				// collect job results
-				for (Future<DownloadBundleJob> job : futures) {
-					try {
-						DownloadBundleJob bundleJob;
-						for (;;) {
-							try {
-								bundleJob = job.get(1L, TimeUnit.SECONDS);
-								break;
-							} catch (TimeoutException e) {
-								if (monitor.isCanceled()) {
-									return;
-								}
-							}
-						}
-						if (bundleJob.file != null) {
-							bundleFileToDirectoryEntry.put(bundleJob.file, bundleJob.entry);
-						}
-						monitor.worked(futureSize);
-					} catch (ExecutionException e) {
-						Throwable cause = e.getCause();
-						if (cause instanceof OperationCanceledException) {
-							monitor.setCanceled(true);
-							return;
-						}
-						IStatus status;
-						if (cause instanceof CoreException) {
-							status = ((CoreException) cause).getStatus();
-						} else {
-							status = new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN,
-									Messages.RemoteBundleDiscoveryStrategy_unexpectedError, cause);
-						}
-						// log errors but continue on
-						StatusHandler.log(status);
-					} catch (InterruptedException e) {
-						monitor.setCanceled(true);
-						return;
-					}
-				}
-			} finally {
-				executorService.shutdownNow();
-			}
-
-			try {
-				registryStrategy = new DiscoveryRegistryStrategy(new File[] { registryCacheFolder },
-						new boolean[] { false }, this);
-				registryStrategy.setBundles(bundleFileToDirectoryEntry);
-				IExtensionRegistry extensionRegistry = new ExtensionRegistry(registryStrategy, this, this);
-				try {
-					IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(ConnectorDiscoveryExtensionReader.EXTENSION_POINT_ID);
-					if (extensionPoint != null) {
-						IExtension[] extensions = extensionPoint.getExtensions();
-						if (extensions.length > 0) {
-							processExtensions(new SubProgressMonitor(monitor, ticksTenPercent * 3), extensions);
-						}
-					}
-				} finally {
-					extensionRegistry.stop(this);
-				}
-			} finally {
-				registryStrategy = null;
-			}
-		} finally {
-			monitor.done();
-		}
-	}
-
-	private class DownloadBundleJob implements Callable<DownloadBundleJob> {
-		private final IProgressMonitor monitor;
-
-		private final Entry entry;
-
-		private File file;
-
-		public DownloadBundleJob(Entry entry, IProgressMonitor monitor) {
-			this.entry = entry;
-			this.monitor = monitor;
-		}
-
-		public DownloadBundleJob call() {
-
-			String bundleUrl = entry.getLocation();
-			for (int attemptCount = 0; attemptCount < maxDiscoveryJarDownloadAttempts; ++attemptCount) {
-				try {
-					if (!bundleUrl.startsWith("http://") && !bundleUrl.startsWith("https://")) { //$NON-NLS-1$//$NON-NLS-2$
-						StatusHandler.log(new Status(IStatus.WARNING, DiscoveryCore.ID_PLUGIN, NLS.bind(
-								Messages.RemoteBundleDiscoveryStrategy_unrecognized_discovery_url, bundleUrl)));
-						continue;
-					}
-					String lastPathElement = bundleUrl.lastIndexOf('/') == -1 ? bundleUrl
-							: bundleUrl.substring(bundleUrl.lastIndexOf('/'));
-					File target = File.createTempFile(
-							lastPathElement.replaceAll("^[a-zA-Z0-9_.]", "_") + "_", ".jar", temporaryStorage); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
-
-					if (monitor.isCanceled()) {
-						break;
-					}
-
-					try {
-						WebUtil.download(new URI(bundleUrl), target, new NullProgressMonitor() {
-							@Override
-							public boolean isCanceled() {
-								return super.isCanceled() || monitor.isCanceled();
-							}
-						}/*don't use sub progress monitor here*/);
-					} catch (URISyntaxException e) {
-					}
-					file = target;
-				} catch (IOException e) {
-					StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind(
-							Messages.RemoteBundleDiscoveryStrategy_cannot_download_bundle, bundleUrl, e.getMessage()),
-							e));
-					if (isUnknownHostException(e)) {
-						break;
-					}
-				}
-			}
-			return this;
-		}
-	}
-
-	private ExecutorService createExecutorService(int size) {
-		final int maxThreads = 4;
-		return Executors.newFixedThreadPool(Math.min(size, maxThreads));
-	}
-
-	/**
-	 * walk the exception chain to determine if the given exception or any of its underlying causes are an
-	 * {@link UnknownHostException}.
-	 * 
-	 * @return true if the exception or one of its causes are {@link UnknownHostException}.
-	 */
-	private boolean isUnknownHostException(Throwable t) {
-		while (t != null) {
-			if (t instanceof UnknownHostException) {
-				return true;
-			}
-			Throwable t2 = t.getCause();
-			if (t2 == t) {
-				break;
-			}
-			t = t2;
-		}
-		return false;
-	}
-
-	private void delete(File file) {
-		if (file.exists()) {
-			if (file.isDirectory()) {
-				File[] children = file.listFiles();
-				if (children != null) {
-					for (File child : children) {
-						delete(child);
-					}
-				}
-			}
-			if (!file.delete()) {
-				// fail quietly
-			}
-		}
-	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-		if (temporaryStorage != null) {
-			delete(temporaryStorage);
-		}
-	}
-
-	public String getDirectoryUrl() {
-		return directoryUrl;
-	}
-
-	public void setDirectoryUrl(String directoryUrl) {
-		this.directoryUrl = directoryUrl;
-	}
-
-	@Override
-	protected AbstractDiscoverySource computeDiscoverySource(IContributor contributor) {
-		Entry directoryEntry = registryStrategy.getDirectoryEntry(contributor);
-		Policy policy = new Policy(directoryEntry.isPermitCategories());
-		JarDiscoverySource discoverySource = new JarDiscoverySource(contributor.getName(),
-				registryStrategy.getJarFile(contributor));
-		discoverySource.setPolicy(policy);
-		return discoverySource;
-	}
-
-	/**
-	 * indicate how many times discovyer jar downloads should be attempted
-	 */
-	public int getMaxDiscoveryJarDownloadAttempts() {
-		return maxDiscoveryJarDownloadAttempts;
-	}
-
-	/**
-	 * indicate how many times discovyer jar downloads should be attempted
-	 * 
-	 * @param maxDiscoveryJarDownloadAttempts
-	 *            a number >= 1
-	 */
-	public void setMaxDiscoveryJarDownloadAttempts(int maxDiscoveryJarDownloadAttempts) {
-		if (maxDiscoveryJarDownloadAttempts < 1 || maxDiscoveryJarDownloadAttempts > 2) {
-			throw new IllegalArgumentException();
-		}
-		this.maxDiscoveryJarDownloadAttempts = maxDiscoveryJarDownloadAttempts;
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ValidationException.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ValidationException.java
deleted file mode 100644
index 1b59235..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ValidationException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.model;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.internal.discovery.core.DiscoveryCore;
-
-/**
- * Indicate that a validation has occurred on the model.
- * 
- * @author David Green
- */
-public class ValidationException extends CoreException {
-
-	private static final long serialVersionUID = -7542361242327905294L;
-
-	public ValidationException(String message) {
-		super(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, message));
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/messages.properties b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/messages.properties
deleted file mode 100644
index d52f41c..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/messages.properties
+++ /dev/null
@@ -1,53 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2010 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
-###############################################################################
-BundleDiscoveryStrategy_3={0}: {1}
-BundleDiscoveryStrategy_categoryDisallowed=Cannot create category ''{0}'' with id ''{1}'' from {2}: disallowed
-BundleDiscoveryStrategy_task_loading_local_extensions=Loading local extensions
-BundleDiscoveryStrategy_task_processing_extensions=Processing extensions
-BundleDiscoveryStrategy_unexpected_element=unexpected element ''{0}''
-ConnectorCategory_connectorCategory_relevance_invalid=connectorCategory/@relevance must be an integer >= 0 and <= 100
-ConnectorCategory_must_specify_connectorCategory_id=Must specify connectorCategory/@id
-ConnectorCategory_must_specify_connectorCategory_name=Must specify connectorCategory/@name
-ConnectorDescriptor_invalid_connectorDescriptor_siteUrl=Invalid connectorDescriptor/@siteUrl
-ConnectorDescriptor_must_specify_connectorDescriptor_categoryId=Must specify connectorDescriptor/@categoryId
-ConnectorDescriptor_must_specify_connectorDescriptor_id=Must specify connectorDescriptor/@id
-ConnectorDescriptor_must_specify_connectorDescriptor_kind=Must specify connectorDescriptor/@kind
-ConnectorDescriptor_must_specify_connectorDescriptor_license=Must specify connectorDescriptor/@license
-ConnectorDescriptor_must_specify_connectorDescriptor_name=Must specify connectorDescriptor/@name
-ConnectorDescriptor_must_specify_connectorDescriptor_provider=Must specify connectorDescriptor/@provider
-ConnectorDescriptor_must_specify_connectorDescriptor_siteUrl=Must specify connectorDescriptor/@siteUrl
-ConnectorDiscovery_bundle_references_unknown_category=Unknown category ''{0}'' referenced by connector ''{1}'' declared in {2}
-ConnectorDiscovery_duplicate_category_id=Duplicate category id ''{0}'': declaring sources: {1}, {2}
-ConnectorDiscovery_exception_disposing=exception disposing 
-ConnectorDiscovery_Failed_to_discovery_all_Error=Failed to discover all connectors.
-ConnectorDiscovery_illegal_filter_syntax=Illegal filter syntax ''{0}'' in connector ''{1}'' declared in {2}
-ConnectorDiscovery_Strategy_failed_Error={0} failed with an error
-ConnectorDiscovery_task_discovering_connectors=Retrieving listing
-ConnectorDiscovery_task_verifyingAvailability=Verifying connector availability
-ConnectorDiscovery_unexpected_exception=Unexpected exception
-ConnectorDiscoveryExtensionReader_unexpected_element_icon=Unexpected element icon
-ConnectorDiscoveryExtensionReader_unexpected_element_overview=Unexpected element overview
-ConnectorDiscoveryExtensionReader_unexpected_value_kind=Unexpected value for kind
-DirectoryParser_no_directory=Unexpected content: no directory available
-DirectoryParser_unexpected_element=Unexpected element ''{0}''
-DiscoveryRegistryStrategy_cannot_load_bundle=Cannot load bundle {0} from url {1}: {2}
-DiscoveryRegistryStrategy_missing_pluginxml=no plugin.xml in bundle
-FeatureFilter_must_specify_featureFilter_featureId=Must specify featureFilter/@featureId
-FeatureFilter_must_specify_featureFilter_version=Must specify featureFilter/@version
-Group_must_specify_group_id=Must specify group/@id
-RemoteBundleDiscoveryStrategy_cannot_download_bundle=Cannot download bundle at {0}: {1}
-RemoteBundleDiscoveryStrategy_empty_directory=Discovery directory is empty
-RemoteBundleDiscoveryStrategy_io_failure_discovery_directory=IO failure: cannot load discovery directory
-RemoteBundleDiscoveryStrategy_io_failure_temp_storage=IO failure: cannot create temporary storage area
-RemoteBundleDiscoveryStrategy_task_remote_discovery=remote discovery
-RemoteBundleDiscoveryStrategy_unexpectedError=Unexpected error
-RemoteBundleDiscoveryStrategy_unknown_host_discovery_directory=Cannot access {0}: unknown host: please check your Internet connection and try again.
-RemoteBundleDiscoveryStrategy_unrecognized_discovery_url=Unrecognized discovery bundle URL: {0}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DefaultSaxErrorHandler.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DefaultSaxErrorHandler.java
deleted file mode 100644
index b3756d9..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DefaultSaxErrorHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.util;
-
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-/**
- * A default implementation of an error handler that throws exceptions on all errors.
- * 
- * @author David Green
- */
-public class DefaultSaxErrorHandler implements ErrorHandler {
-	public void warning(SAXParseException exception) throws SAXException {
-		// ignore
-	}
-
-	public void fatalError(SAXParseException exception) throws SAXException {
-		throw exception;
-	}
-
-	public void error(SAXParseException exception) throws SAXException {
-		throw exception;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryCategoryComparator.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryCategoryComparator.java
deleted file mode 100644
index 26c571c..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryCategoryComparator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.util;
-
-import java.util.Comparator;
-
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCategory;
-
-/**
- * A comparator that orders categories by relevance and name.
- * 
- * @author David Green
- */
-public class DiscoveryCategoryComparator implements Comparator<DiscoveryCategory> {
-
-	public int compare(DiscoveryCategory o1, DiscoveryCategory o2) {
-		if (o1 == o2) {
-			return 0;
-		}
-		String r1 = o1.getRelevance();
-		String r2 = o2.getRelevance();
-		int i;
-		if (r1 != null && r2 != null) {
-			// don't have to worry about format, since they were already validated
-			// note that higher relevance appears first, thus the reverse order of
-			// the comparison.
-			i = new Integer(r2).compareTo(new Integer(r1));
-		} else if (r1 == null) {
-			return 1;
-		} else {
-			return -1;
-		}
-		if (i == 0) {
-			i = o1.getName().compareToIgnoreCase(o2.getName());
-			if (i == 0) {
-				i = o1.getId().compareTo(o2.getId());
-			}
-		}
-		return i;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryConnectorComparator.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryConnectorComparator.java
deleted file mode 100644
index 65d65d4..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/DiscoveryConnectorComparator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.util;
-
-import java.util.Comparator;
-
-import org.eclipse.mylyn.internal.discovery.core.model.ConnectorCategory;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
-import org.eclipse.mylyn.internal.discovery.core.model.Group;
-
-/**
- * a comparator that orders connectors by group and alphabetically by their name
- * 
- * @author David Green
- */
-public class DiscoveryConnectorComparator implements Comparator<DiscoveryConnector> {
-
-	private final ConnectorCategory category;
-
-	public DiscoveryConnectorComparator(ConnectorCategory category) {
-		if (category == null) {
-			throw new IllegalArgumentException();
-		}
-		this.category = category;
-	}
-
-	/**
-	 * compute the index of the group id
-	 * 
-	 * @param groupId
-	 *            the group id or null
-	 * @return the index, or -1 if not found
-	 */
-	private int computeGroupIndex(String groupId) {
-		if (groupId != null) {
-			int index = -1;
-			for (Group group : category.getGroup()) {
-				++index;
-				if (group.getId().equals(groupId)) {
-					return index;
-				}
-			}
-		}
-		return -1;
-	}
-
-	public int compare(DiscoveryConnector o1, DiscoveryConnector o2) {
-		if (o1.getCategory() != category || o2.getCategory() != category) {
-			throw new IllegalArgumentException();
-		}
-		if (o1 == o2) {
-			return 0;
-		}
-		int g1 = computeGroupIndex(o1.getGroupId());
-		int g2 = computeGroupIndex(o2.getGroupId());
-		int i;
-		if (g1 != g2) {
-			if (g1 == -1) {
-				i = 1;
-			} else if (g2 == -1) {
-				i = -1;
-			} else {
-				i = g1 - g2;
-			}
-		} else {
-			i = o1.getName().compareToIgnoreCase(o2.getName());
-			if (i == 0) {
-				i = o1.getId().compareTo(o2.getId());
-			}
-		}
-		return i;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/HttpClientTransportService.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/HttpClientTransportService.java
deleted file mode 100644
index cdf0810..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/HttpClientTransportService.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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.discovery.core.util;
-
-import java.io.BufferedInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.HeadMethod;
-import org.apache.commons.httpclient.util.DateParseException;
-import org.apache.commons.httpclient.util.DateUtil;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.net.Policy;
-import org.eclipse.mylyn.commons.net.WebLocation;
-import org.eclipse.mylyn.internal.discovery.core.DiscoveryCore;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * A utility for accessing web resources.
- * 
- * @author David Green
- * @author Steffen Pingel
- */
-public class HttpClientTransportService implements ITransportService {
-
-	public HttpClientTransportService() {
-	}
-
-	/**
-	 * Download an HTTP-based resource
-	 * 
-	 * @param target
-	 *            the target file to which the content is saved
-	 * @param location
-	 *            the web location of the content
-	 * @param monitor
-	 *            the monitor
-	 * @throws IOException
-	 *             if a network or IO problem occurs
-	 */
-	public IStatus download(java.net.URI uri, OutputStream out, IProgressMonitor monitor) {
-		WebLocation location = new WebLocation(uri.toString());
-		monitor = Policy.monitorFor(monitor);
-		monitor.beginTask(NLS.bind(Messages.WebUtil_task_retrievingUrl, location.getUrl()), IProgressMonitor.UNKNOWN);
-		try {
-			HttpClient client = new HttpClient();
-			org.eclipse.mylyn.commons.net.WebUtil.configureHttpClient(client, ""); //$NON-NLS-1$
-
-			GetMethod method = new GetMethod(location.getUrl());
-			try {
-				HostConfiguration hostConfiguration = org.eclipse.mylyn.commons.net.WebUtil.createHostConfiguration(
-						client, location, monitor);
-				int result = org.eclipse.mylyn.commons.net.WebUtil.execute(client, hostConfiguration, method, monitor);
-				if (result == HttpStatus.SC_OK) {
-					InputStream in = org.eclipse.mylyn.commons.net.WebUtil.getResponseBodyAsStream(method, monitor);
-					try {
-						in = new BufferedInputStream(in);
-						try {
-							int i;
-							while ((i = in.read()) != -1) {
-								out.write(i);
-							}
-							return Status.OK_STATUS;
-						} finally {
-							out.close();
-						}
-					} finally {
-						in.close();
-					}
-				} else {
-					throw new IOException(NLS.bind(Messages.WebUtil_cannotDownload, location.getUrl(), result));
-				}
-			} finally {
-				method.releaseConnection();
-			}
-		} catch (IOException e) {
-			return new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN,
-					NLS.bind("Download of {0} failed", uri.toString())); //$NON-NLS-1$
-		} finally {
-			monitor.done();
-		}
-	}
-
-	/**
-	 * Read a web-based resource at the specified location using the given processor.
-	 * 
-	 * @param location
-	 *            the web location of the content
-	 * @param processor
-	 *            the processor that will handle content
-	 * @param monitor
-	 *            the monitor
-	 * @throws IOException
-	 *             if a network or IO problem occurs
-	 */
-	public InputStream stream(java.net.URI uri, IProgressMonitor monitor) throws IOException, CoreException {
-		WebLocation location = new WebLocation(uri.toString());
-		monitor = Policy.monitorFor(monitor);
-		monitor.beginTask(NLS.bind(Messages.WebUtil_task_retrievingUrl, location.getUrl()), IProgressMonitor.UNKNOWN);
-		try {
-			HttpClient client = new HttpClient();
-			org.eclipse.mylyn.commons.net.WebUtil.configureHttpClient(client, ""); //$NON-NLS-1$
-
-			boolean success = false;
-			GetMethod method = new GetMethod(location.getUrl());
-			try {
-				HostConfiguration hostConfiguration = org.eclipse.mylyn.commons.net.WebUtil.createHostConfiguration(
-						client, location, monitor);
-				int result = org.eclipse.mylyn.commons.net.WebUtil.execute(client, hostConfiguration, method, monitor);
-				if (result == HttpStatus.SC_OK) {
-					InputStream in = org.eclipse.mylyn.commons.net.WebUtil.getResponseBodyAsStream(method, monitor);
-					success = true;
-					return in;
-				} else {
-					throw new IOException(NLS.bind(Messages.WebUtil_cannotDownload, location.getUrl(), result));
-				}
-			} finally {
-				if (!success) {
-					method.releaseConnection();
-				}
-			}
-		} finally {
-			monitor.done();
-		}
-	}
-
-	/**
-	 * Verify availability of resources at the given web locations. Normally this would be done using an HTTP HEAD.
-	 * 
-	 * @param locations
-	 *            the locations of the resource to verify
-	 * @param one
-	 *            indicate if only one of the resources must exist
-	 * @param monitor
-	 *            the monitor
-	 * @return true if the resource exists
-	 */
-	public long getLastModified(java.net.URI uri, IProgressMonitor monitor) throws CoreException, IOException {
-		WebLocation location = new WebLocation(uri.toString());
-		monitor = Policy.monitorFor(monitor);
-		monitor.beginTask(NLS.bind(Messages.WebUtil_task_retrievingUrl, location.getUrl()), IProgressMonitor.UNKNOWN);
-		try {
-			HttpClient client = new HttpClient();
-			org.eclipse.mylyn.commons.net.WebUtil.configureHttpClient(client, ""); //$NON-NLS-1$
-
-			HeadMethod method = new HeadMethod(location.getUrl());
-			try {
-				HostConfiguration hostConfiguration = org.eclipse.mylyn.commons.net.WebUtil.createHostConfiguration(
-						client, location, monitor);
-				int result = org.eclipse.mylyn.commons.net.WebUtil.execute(client, hostConfiguration, method, monitor);
-				if (result == HttpStatus.SC_OK) {
-					Header lastModified = method.getResponseHeader("Last-Modified"); //$NON-NLS-1$
-					if (lastModified != null) {
-						try {
-							return DateUtil.parseDate(lastModified.getValue()).getTime();
-						} catch (DateParseException e) {
-							// fall through
-						}
-					}
-					return 0;
-				} else if (result == HttpStatus.SC_NOT_FOUND) {
-					throw new FileNotFoundException(
-							NLS.bind(Messages.WebUtil_cannotDownload, location.getUrl(), result));
-				} else {
-					throw new IOException(NLS.bind(Messages.WebUtil_cannotDownload, location.getUrl(), result));
-				}
-			} finally {
-				method.releaseConnection();
-			}
-		} finally {
-			monitor.done();
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/IOWithCauseException.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/IOWithCauseException.java
deleted file mode 100644
index f28aed0..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/IOWithCauseException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.util;
-
-import java.io.IOException;
-
-/**
- * An IO Exception that allows for {@link #getCause() a cause}.
- * 
- * @author David Green
- */
-public class IOWithCauseException extends IOException {
-
-	private static final long serialVersionUID = 1L;
-
-	private final Throwable cause;
-
-	public IOWithCauseException(String message, Throwable cause) {
-		super(message);
-		this.cause = cause;
-	}
-
-	public IOWithCauseException(Throwable cause) {
-		this.cause = cause;
-	}
-
-	@Override
-	public Throwable getCause() {
-		return cause;
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/ITransportService.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/ITransportService.java
deleted file mode 100644
index c880a73..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/ITransportService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.discovery.core.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * @author Steffen Pingel
- */
-public interface ITransportService {
-
-	public abstract IStatus download(URI uri, OutputStream out, IProgressMonitor monitor);
-
-	public abstract InputStream stream(URI uri, IProgressMonitor monitor) throws IOException, CoreException;
-
-	public abstract long getLastModified(URI location, IProgressMonitor monitor) throws CoreException, IOException;
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/Messages.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/Messages.java
deleted file mode 100644
index 8db2893..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/Messages.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.core.util;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * 
- * @author David Green
- */
-class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.discovery.core.util.messages"; //$NON-NLS-1$
-
-	public static String WebUtil_cannotDownload;
-
-	public static String WebUtil_task_retrievingUrl;
-
-	public static String WebUtil_task_verifyingUrl;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/P2TransportService.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/P2TransportService.java
deleted file mode 100644
index db52518..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/P2TransportService.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.discovery.core.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URI;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * @author Steffen Pingel
- */
-public class P2TransportService implements ITransportService {
-
-	private Object transport;
-
-	private Method downloadMethod;
-
-	private Method streamMethod;
-
-	private Method getLastModifiedMethod;
-
-	public P2TransportService() throws ClassNotFoundException {
-		try {
-			Class<?> clazz = Class.forName("org.eclipse.equinox.internal.p2.repository.RepositoryTransport"); //$NON-NLS-1$
-			Method getInstanceMethod = clazz.getDeclaredMethod("getInstance"); //$NON-NLS-1$
-			transport = getInstanceMethod.invoke(null);
-			downloadMethod = clazz.getDeclaredMethod("download", URI.class, OutputStream.class, IProgressMonitor.class); //$NON-NLS-1$
-			streamMethod = clazz.getDeclaredMethod("stream", URI.class, IProgressMonitor.class); //$NON-NLS-1$
-			getLastModifiedMethod = clazz.getDeclaredMethod("getLastModified", URI.class, IProgressMonitor.class); //$NON-NLS-1$
-		} catch (LinkageError e) {
-			throw new ClassNotFoundException("Failed to load P2 transport", e); //$NON-NLS-1$
-		} catch (Exception e) {
-			throw new ClassNotFoundException("Failed to load P2 transport", e); //$NON-NLS-1$
-		}
-	}
-
-	public IStatus download(URI uri, OutputStream out, IProgressMonitor monitor) {
-		try {
-			return (IStatus) downloadMethod.invoke(transport, uri, out, monitor);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public InputStream stream(URI uri, IProgressMonitor monitor) throws IOException, CoreException {
-		try {
-			return (InputStream) streamMethod.invoke(transport, uri, monitor);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException(e);
-		} catch (InvocationTargetException e) {
-			if (e.getCause() instanceof CoreException) {
-				throw (CoreException) e.getCause();
-			} else if (e.getCause() instanceof IOException) {
-				throw (IOException) e.getCause();
-			}
-			throw new RuntimeException(e);
-		}
-	}
-
-	public long getLastModified(URI location, IProgressMonitor monitor) throws CoreException, IOException {
-		try {
-			return (Long) getLastModifiedMethod.invoke(transport, location, monitor);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException(e);
-		} catch (InvocationTargetException e) {
-			if (e.getCause() instanceof CoreException) {
-				throw (CoreException) e.getCause();
-			} else if (e.getCause() instanceof IOException) {
-				throw (IOException) e.getCause();
-			}
-			throw new RuntimeException(e);
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/WebUtil.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/WebUtil.java
deleted file mode 100644
index 030509a..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/WebUtil.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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.discovery.core.util;
-
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.net.URI;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.mylyn.commons.net.AbstractWebLocation;
-
-/**
- * A utility for accessing web resources
- * 
- * @author David Green
- */
-public class WebUtil {
-	/**
-	 * implementors are capable of processing character content
-	 * 
-	 * @see WebUtil#readResource(AbstractWebLocation, TextContentProcessor, IProgressMonitor)
-	 */
-	public interface TextContentProcessor {
-		public void process(Reader reader) throws IOException;
-	}
-
-	private static ITransportService transport;
-
-	/**
-	 * Download an HTTP-based resource
-	 * 
-	 * @param target
-	 *            the target file to which the content is saved
-	 * @param location
-	 *            the web location of the content
-	 * @param monitor
-	 *            the monitor
-	 * @return
-	 * @throws IOException
-	 *             if a network or IO problem occurs
-	 */
-	public static IStatus download(URI uri, File target, IProgressMonitor monitor) throws IOException {
-		IStatus result;
-		OutputStream out = new BufferedOutputStream(new FileOutputStream(target));
-		try {
-			result = download(uri, out, monitor);
-		} finally {
-			out.close();
-		}
-		if (!result.isOK()) {
-			target.delete();
-			if (result.getException() instanceof IOException) {
-				throw (IOException) result.getException();
-			}
-			throw new IOWithCauseException(result.getException());
-		}
-		return result;
-	}
-
-	/**
-	 * Read a web-based resource at the specified location using the given processor.
-	 * 
-	 * @param location
-	 *            the web location of the content
-	 * @param processor
-	 *            the processor that will handle content
-	 * @param monitor
-	 *            the monitor
-	 * @throws IOException
-	 *             if a network or IO problem occurs
-	 * @throws CoreException
-	 */
-	public static void readResource(URI uri, TextContentProcessor processor, IProgressMonitor monitor)
-			throws IOException, CoreException {
-		InputStream in = stream(uri, monitor);
-		try {
-			// FIXME how can the charset be determined?
-			BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8")); //$NON-NLS-1$
-			processor.process(reader);
-		} finally {
-			in.close();
-		}
-	}
-
-	/**
-	 * Verify availability of resources at the given web locations. Normally this would be done using an HTTP HEAD.
-	 * 
-	 * @param locations
-	 *            the locations of the resource to verify
-	 * @param one
-	 *            indicate if only one of the resources must exist
-	 * @param monitor
-	 *            the monitor
-	 * @return true if the resource exists
-	 * @throws CoreException
-	 */
-	public static boolean verifyAvailability(List<? extends URI> locations, boolean one, IProgressMonitor monitor)
-			throws IOException, CoreException {
-		if (locations.isEmpty() || locations.size() > 5) {
-			throw new IllegalArgumentException();
-		}
-		int countFound = 0;
-		for (URI location : locations) {
-			try {
-				getLastModified(location, monitor);
-				if (one) {
-					return true;
-				}
-				++countFound;
-			} catch (FileNotFoundException e) {
-				if (!one) {
-					return false;
-				}
-				continue;
-			}
-		}
-		return countFound == locations.size();
-	}
-
-	public static synchronized ITransportService getTransport() {
-		if (transport == null) {
-			if (Platform.isRunning()) {
-				try {
-					transport = new P2TransportService();
-				} catch (ClassNotFoundException e) {
-					// fall back to HttpClientTransport
-				}
-			}
-			if (transport == null) {
-				transport = new HttpClientTransportService();
-			}
-		}
-		return transport;
-	}
-
-	public static IStatus download(URI uri, OutputStream out, IProgressMonitor monitor) {
-		return getTransport().download(uri, out, monitor);
-	}
-
-	public static InputStream stream(URI uri, IProgressMonitor monitor) throws IOException, CoreException {
-		return getTransport().stream(uri, monitor);
-	}
-
-	private static long getLastModified(URI location, IProgressMonitor monitor) throws CoreException, IOException {
-		return getTransport().getLastModified(location, monitor);
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/messages.properties b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/messages.properties
deleted file mode 100644
index b9a6066..0000000
--- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/util/messages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-WebUtil_cannotDownload=Cannot download {0}: HTTP response {1}
-WebUtil_task_retrievingUrl=Retrieving {0}
-WebUtil_task_verifyingUrl=Verifying {0}
diff --git a/org.eclipse.mylyn.discovery.core/xsd/directory.xsd b/org.eclipse.mylyn.discovery.core/xsd/directory.xsd
deleted file mode 100644
index 8ffd96c..0000000
--- a/org.eclipse.mylyn.discovery.core/xsd/directory.xsd
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:tns="http://www.eclipse.org/mylyn/discovery/directory/" 
-	xmlns="http://www.w3.org/2001/XMLSchema" 
-	targetNamespace="http://www.eclipse.org/mylyn/discovery/directory/">
-	
-	<annotation>
-		<documentation>
-		Describes the XML format used by a Mylyn discovery directory.
-		</documentation>
-	</annotation>
-	
-	<complexType name="OpenAttrsComplex">
-		<annotation>
-			<documentation>extend this type to allow for attributes from other namespaces</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="anyType">
-				<anyAttribute namespace="##other" processContents="lax"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	
-	
-    <element name="directory">
-    	<complexType>
-    		<complexContent>
-				<extension base="tns:OpenAttrsComplex">
-		    		<sequence>
-		    			<element ref="tns:entry" minOccurs="0" maxOccurs="unbounded"/>
-		    		</sequence>
-    			</extension>
-    		</complexContent>
-    	</complexType>
-    </element>
-    
-    <element name="entry">
-		<complexType>
- 			<complexContent>
-				<extension base="tns:OpenAttrsComplex">
-					<attribute name="url" type="anyURI"/>
-					<attribute name="permitCategories" type="boolean"/>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-</schema>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.discovery.tests/.classpath b/org.eclipse.mylyn.discovery.tests/.classpath
deleted file mode 100644
index 7caa4f1..0000000
--- a/org.eclipse.mylyn.discovery.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.discovery.tests/.cvsignore b/org.eclipse.mylyn.discovery.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.discovery.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.discovery.tests/.project b/org.eclipse.mylyn.discovery.tests/.project
deleted file mode 100644
index d74cb84..0000000
--- a/org.eclipse.mylyn.discovery.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.discovery.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.discovery.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index eac04e2..0000000
--- a/org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,334 +0,0 @@
-#Thu May 27 19:02:55 PDT 2010
-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.unusedLocal=preserve
-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.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.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.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_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_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_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.discovery.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8d68e73..0000000
--- a/org.eclipse.mylyn.discovery.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) 2010 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.discovery.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.discovery.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.discovery.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 5937a85..0000000
--- a/org.eclipse.mylyn.discovery.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,24 +0,0 @@
-#Tue May 20 17:39:22 PDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=2
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-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.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.discovery.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.discovery.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 954a33e..0000000
--- a/org.eclipse.mylyn.discovery.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.discovery.tests;singleton:=true
-Bundle-Version: 3.4.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.mylyn.discovery.core;bundle-version="1.0.0",
- org.eclipse.mylyn.discovery.ui;bundle-version="1.0.0",
- org.junit,
- org.eclipse.core.runtime;bundle-version="3.1.0",
- org.eclipse.ui;bundle-version="3.1.0"
-Export-Package: org.eclipse.mylyn.discovery.tests;x-internal:=true,
- org.eclipse.mylyn.discovery.tests.core;x-internal:=true,
- org.eclipse.mylyn.discovery.tests.core.mock;x-internal:=true,
- org.eclipse.mylyn.discovery.tests.core.util;x-internal:=true
diff --git a/org.eclipse.mylyn.discovery.tests/OSGI-INF/l10n/bundle.properties b/org.eclipse.mylyn.discovery.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 5c63386..0000000
--- a/org.eclipse.mylyn.discovery.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 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
-###############################################################################
-#Properties file for org.eclipse.mylyn.discovery.tests
-Bundle-Name = Mylyn Connector Discovery Tests
-connectorCategory.description = a category for testing purposes
-connectorCategory.name = Test Category
-certification.name = Test Certification
-certification.url = http://eclipse.org/mylyn
-certification.description = Description
\ No newline at end of file
diff --git a/org.eclipse.mylyn.discovery.tests/about.html b/org.eclipse.mylyn.discovery.tests/about.html
deleted file mode 100644
index bc6e2b4..0000000
--- a/org.eclipse.mylyn.discovery.tests/about.html
+++ /dev/null
@@ -1,28 +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>July 3, 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>
diff --git a/org.eclipse.mylyn.discovery.tests/build.properties b/org.eclipse.mylyn.discovery.tests/build.properties
deleted file mode 100644
index 9da4bcf..0000000
--- a/org.eclipse.mylyn.discovery.tests/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.xml,\
-               OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.mylyn.discovery.tests/images/bugzilla.gif b/org.eclipse.mylyn.discovery.tests/images/bugzilla.gif
deleted file mode 100644
index ec6d66c..0000000
--- a/org.eclipse.mylyn.discovery.tests/images/bugzilla.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.tests/plugin.xml b/org.eclipse.mylyn.discovery.tests/plugin.xml
deleted file mode 100644
index d123ea4..0000000
--- a/org.eclipse.mylyn.discovery.tests/plugin.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?><!--
-    Copyright (c) 2009 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
- -->
-
-<plugin>
-   <extension
-         point="org.eclipse.mylyn.discovery.core.connectorDiscovery">
-      <connectorCategory
-            description="%connectorCategory.description"
-            id="org.eclipse.mylyn.discovery.tests.connectorCategory1"
-            name="%connectorCategory.name">
-      </connectorCategory>
-      <connectorDescriptor
-            categoryId="org.eclipse.mylyn.discovery.tests.connectorCategory1"
-            description="a fictitious test connector that does nothing"
-            id="org.eclipse.mylyn.discovery.tests.connectorDescriptor1"
-            kind="task"
-            license="UTL (Unit Test License)"
-            name="Test Connector"
-            provider="UnitTesting"
-            siteUrl="http://foo.nodomain/site">
-      </connectorDescriptor>
-      <connectorDescriptor
-            categoryId="org.eclipse.mylyn.discovery.tests.connectorCategory1"
-            description="Trac Connector"
-            id="org.eclipse.mylyn.discovery.test1"
-            kind="task"
-            license="License"
-            name="Installable Test Connector"
-            provider="Eclipse Mylyn"
-            siteUrl="http://localhost/discovery/">
-      </connectorDescriptor>
-      <connectorDescriptor
-            categoryId="org.eclipse.mylyn.discovery.tests.connectorCategory1"
-            description="Trac Connector"
-            id="org.eclipse.mylyn.discovery.2tests"
-            kind="task"
-            license="License"
-            name="2 Installable Test Connector"
-            provider="Eclipse Mylyn"
-            siteUrl="http://localhost/discovery/">
-         <iu
-               id="org.eclipse.mylyn.discovery.test1">
-         </iu>
-         <iu
-               id="org.eclipse.mylyn.discovery.test2">
-         </iu>
-      </connectorDescriptor>
-      <certification
-            id="org.eclipse.mylyn.discovery.tests.certification1"
-            name="%certification.name"
-            url="%certification.url">
-         <description>
-            %certification.description
-         </description>
-      </certification>
-   </extension>
-
-</plugin>
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/AllDiscoveryTests.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/AllDiscoveryTests.java
deleted file mode 100644
index b1c5116..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/AllDiscoveryTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.mylyn.discovery.tests.core.BundleDiscoveryStrategyTest;
-import org.eclipse.mylyn.discovery.tests.core.ConnectorDiscoveryRemoteTest;
-import org.eclipse.mylyn.discovery.tests.core.ConnectorDiscoveryTest;
-import org.eclipse.mylyn.discovery.tests.core.DirectoryParserTest;
-import org.eclipse.mylyn.discovery.tests.core.RemoteBundleDiscoveryStrategyTest;
-
-/**
- * @author Steffen Pingel
- */
-public class AllDiscoveryTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Tests for org.eclipse.mylyn.discovery");
-		suite.addTestSuite(ConnectorDiscoveryTest.class);
-		suite.addTestSuite(DirectoryParserTest.class);
-		suite.addTestSuite(BundleDiscoveryStrategyTest.class);
-		suite.addTestSuite(RemoteBundleDiscoveryStrategyTest.class);
-		suite.addTestSuite(ConnectorDiscoveryRemoteTest.class);
-		return suite;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/DiscoveryTestConstants.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/DiscoveryTestConstants.java
deleted file mode 100644
index 10d6d70..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/DiscoveryTestConstants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.tests;
-
-/**
- * @author David Green
- */
-public abstract class DiscoveryTestConstants {
-
-	/**
-	 * the URL of the mylyn discovery directory, may be overridden using the system property
-	 * <tt>mylyn.discovery.directory</tt>
-	 */
-	public static final String DEFAULT_MYLYN_DISCOVERY_URL = System.getProperty("mylyn.discovery.directory",
-			"http://www.eclipse.org/mylyn/discovery/directory-3.3.xml");
-
-	private DiscoveryTestConstants() {
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/BundleDiscoveryStrategyTest.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/BundleDiscoveryStrategyTest.java
deleted file mode 100644
index a1ceb9d..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/BundleDiscoveryStrategyTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.discovery.tests.core.mock.MockBundleDiscoveryStrategy;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCategory;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCertification;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
-import org.eclipse.mylyn.internal.discovery.core.model.Policy;
-
-/**
- * @author David Green
- */
-public class BundleDiscoveryStrategyTest extends TestCase {
-
-	private MockBundleDiscoveryStrategy discoveryStrategy;
-
-	private final List<DiscoveryCategory> categories = new ArrayList<DiscoveryCategory>();
-
-	private final List<DiscoveryConnector> connectors = new ArrayList<DiscoveryConnector>();
-
-	private final List<DiscoveryCertification> certifications = new ArrayList<DiscoveryCertification>();
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		discoveryStrategy = new MockBundleDiscoveryStrategy();
-		discoveryStrategy.setPolicy(new Policy(true));
-		discoveryStrategy.setCategories(categories);
-		discoveryStrategy.setConnectors(connectors);
-		discoveryStrategy.setCertifications(certifications);
-	}
-
-	public void testDiscovery() throws CoreException {
-		discoveryStrategy.performDiscovery(new NullProgressMonitor());
-
-		assertFalse(categories.isEmpty());
-		assertFalse(connectors.isEmpty());
-		DiscoveryCategory category = findCategoryById("org.eclipse.mylyn.discovery.tests.connectorCategory1");
-		assertNotNull(category);
-		DiscoveryConnector connector = findConnectorById("org.eclipse.mylyn.discovery.tests.connectorDescriptor1");
-		assertNotNull(connector);
-		DiscoveryCertification certification = findCertificationById("org.eclipse.mylyn.discovery.tests.certification1");
-		assertNotNull(certification);
-	}
-
-	public void testDiscoveryNoCategoriesPolicy() throws CoreException {
-		discoveryStrategy.setPolicy(new Policy(false));
-		discoveryStrategy.performDiscovery(new NullProgressMonitor());
-
-		assertTrue(categories.isEmpty());
-	}
-
-	private DiscoveryConnector findConnectorById(String id) {
-		for (DiscoveryConnector descriptor : connectors) {
-			if (id.equals(descriptor.getId())) {
-				return descriptor;
-			}
-		}
-		return null;
-	}
-
-	private DiscoveryCategory findCategoryById(String id) {
-		for (DiscoveryCategory descriptor : categories) {
-			if (id.equals(descriptor.getId())) {
-				return descriptor;
-			}
-		}
-		return null;
-	}
-
-	private DiscoveryCertification findCertificationById(String id) {
-		for (DiscoveryCertification descriptor : certifications) {
-			if (id.equals(descriptor.getId())) {
-				return descriptor;
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryRemoteTest.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryRemoteTest.java
deleted file mode 100644
index 47ca691..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryRemoteTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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.discovery.tests.core;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.discovery.tests.DiscoveryTestConstants;
-import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDiscovery;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
-import org.eclipse.mylyn.internal.discovery.core.model.RemoteBundleDiscoveryStrategy;
-
-/**
- * A test that uses the real discovery directory and verifies that it works, and that all referenced update sites appear
- * to be available.
- * 
- * @author David Green
- */
-public class ConnectorDiscoveryRemoteTest extends TestCase {
-
-	private ConnectorDiscovery connectorDiscovery;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		connectorDiscovery = new ConnectorDiscovery();
-		connectorDiscovery.setVerifyUpdateSiteAvailability(false);
-
-		connectorDiscovery.getDiscoveryStrategies().clear();
-		RemoteBundleDiscoveryStrategy remoteStrategy = new RemoteBundleDiscoveryStrategy();
-		remoteStrategy.setDirectoryUrl(DiscoveryTestConstants.DEFAULT_MYLYN_DISCOVERY_URL);
-		connectorDiscovery.getDiscoveryStrategies().add(remoteStrategy);
-	}
-
-	public void testRemoteDirectory() throws CoreException {
-		connectorDiscovery.performDiscovery(new NullProgressMonitor());
-
-		assertFalse(connectorDiscovery.getCategories().isEmpty());
-		assertFalse(connectorDiscovery.getConnectors().isEmpty());
-	}
-
-	public void testVerifyAvailability() throws CoreException {
-		connectorDiscovery.performDiscovery(new NullProgressMonitor());
-		for (DiscoveryConnector connector : connectorDiscovery.getConnectors()) {
-			assertNull(connector.getAvailable());
-		}
-		connectorDiscovery.verifySiteAvailability(new NullProgressMonitor());
-
-		assertFalse(connectorDiscovery.getConnectors().isEmpty());
-
-		int unavailableCount = 0;
-		for (DiscoveryConnector connector : connectorDiscovery.getConnectors()) {
-			assertNotNull("Failed to verify availability for " + connector.getId(), connector.getAvailable());
-			if (!connector.getAvailable()) {
-				++unavailableCount;
-			}
-		}
-		if (unavailableCount > 0) {
-			fail(String.format("%s unavailable: %s", unavailableCount, computeUnavailableConnetorDescriptorNames()));
-		}
-	}
-
-	private String computeUnavailableConnetorDescriptorNames() {
-		String message = "";
-		for (DiscoveryConnector connector : connectorDiscovery.getConnectors()) {
-			if (!connector.getAvailable()) {
-				if (message.length() > 0) {
-					message += ", ";
-				}
-				message += connector.getName();
-			}
-		}
-		return message;
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryTest.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryTest.java
deleted file mode 100644
index 62962f1..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/ConnectorDiscoveryTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.tests.core;
-
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.discovery.tests.core.mock.DiscoveryConnectorMockFactory;
-import org.eclipse.mylyn.discovery.tests.core.mock.MockDiscoveryStrategy;
-import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDiscovery;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
-import org.osgi.framework.Version;
-
-/**
- * @author David Green
- */
-public class ConnectorDiscoveryTest extends TestCase {
-
-	private ConnectorDiscovery connectorDiscovery;
-
-	private MockDiscoveryStrategy mockDiscoveryStrategy;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		connectorDiscovery = new ConnectorDiscovery();
-		mockDiscoveryStrategy = new MockDiscoveryStrategy();
-		connectorDiscovery.getDiscoveryStrategies().add(mockDiscoveryStrategy);
-	}
-
-	public void testPlatformFilter_None() throws CoreException {
-		connectorDiscovery.performDiscovery(new NullProgressMonitor());
-		assertEquals(mockDiscoveryStrategy.getConnectorCount(), connectorDiscovery.getConnectors().size());
-	}
-
-	public void testPlatformFilter_NegativeMatch() throws CoreException {
-		mockDiscoveryStrategy.setConnectorMockFactory(new DiscoveryConnectorMockFactory() {
-			@Override
-			protected void populateMockData() {
-				super.populateMockData();
-				platformFilter("(& (osgi.os=macosx) (osgi.ws=carbon))");
-			}
-		});
-		// test to ensure that all non-matching platform filters are not discovered
-		Dictionary<Object, Object> environment = new Properties();
-		environment.put("osgi.os", "win32");
-		environment.put("osgi.ws", "windows");
-		connectorDiscovery.setEnvironment(environment);
-		connectorDiscovery.performDiscovery(new NullProgressMonitor());
-
-		assertTrue(connectorDiscovery.getConnectors().isEmpty());
-	}
-
-	public void testPlatformFilter_PositiveMatch() throws CoreException {
-		mockDiscoveryStrategy.setConnectorMockFactory(new DiscoveryConnectorMockFactory() {
-			@Override
-			protected void populateMockData() {
-				super.populateMockData();
-				platformFilter("(& (osgi.os=macosx) (osgi.ws=carbon))");
-			}
-		});
-		Dictionary<Object, Object> environment = new Properties();
-
-		// test to ensure that all matching platform filters are discovered
-		environment.put("osgi.os", "macosx");
-		environment.put("osgi.ws", "carbon");
-		connectorDiscovery.setEnvironment(environment);
-		connectorDiscovery.performDiscovery(new NullProgressMonitor());
-
-		assertFalse(connectorDiscovery.getConnectors().isEmpty());
-		assertEquals(mockDiscoveryStrategy.getConnectorCount(), connectorDiscovery.getConnectors().size());
-	}
-
-	public void testFeatureFilter_PositiveMatch() throws CoreException {
-		mockDiscoveryStrategy.setConnectorMockFactory(new DiscoveryConnectorMockFactory() {
-			@Override
-			protected void populateMockData() {
-				super.populateMockData();
-				featureFilter("com.foo.bar.feature", "[1.0,2.0)");
-			}
-		});
-		Map<String, Version> featureToVersion = new HashMap<String, Version>();
-		featureToVersion.put("com.foo.bar.feature", new Version("1.1"));
-		connectorDiscovery.setFeatureToVersion(featureToVersion);
-		connectorDiscovery.performDiscovery(new NullProgressMonitor());
-
-		assertFalse(connectorDiscovery.getConnectors().isEmpty());
-		assertEquals(mockDiscoveryStrategy.getConnectorCount(), connectorDiscovery.getConnectors().size());
-	}
-
-	public void testFeatureFilter_NegativeMatch_VersionMismatch() throws CoreException {
-		mockDiscoveryStrategy.setConnectorMockFactory(new DiscoveryConnectorMockFactory() {
-			@Override
-			protected void populateMockData() {
-				super.populateMockData();
-				featureFilter("com.foo.bar.feature", "[1.2,2.0)");
-			}
-		});
-		Map<String, Version> featureToVersion = new HashMap<String, Version>();
-		featureToVersion.put("com.foo.bar.feature", new Version("1.1"));
-		connectorDiscovery.setFeatureToVersion(featureToVersion);
-		connectorDiscovery.performDiscovery(new NullProgressMonitor());
-
-		assertTrue(connectorDiscovery.getConnectors().isEmpty());
-	}
-
-	public void testFeatureFilter_NegativeMatch_NotPresent() throws CoreException {
-		mockDiscoveryStrategy.setConnectorMockFactory(new DiscoveryConnectorMockFactory() {
-			@Override
-			protected void populateMockData() {
-				super.populateMockData();
-				featureFilter("com.foo.bar.feature", "[1.2,2.0)");
-			}
-		});
-		Map<String, Version> featureToVersion = new HashMap<String, Version>();
-		connectorDiscovery.setFeatureToVersion(featureToVersion);
-		connectorDiscovery.performDiscovery(new NullProgressMonitor());
-
-		assertTrue(connectorDiscovery.getConnectors().isEmpty());
-	}
-
-	public void testCategorization() throws CoreException {
-		connectorDiscovery.performDiscovery(new NullProgressMonitor());
-		assertTrue(!connectorDiscovery.getConnectors().isEmpty());
-		assertTrue(!connectorDiscovery.getCategories().isEmpty());
-
-		for (DiscoveryConnector connector : connectorDiscovery.getConnectors()) {
-			assertNotNull(connector.getCategory());
-			assertEquals(connector.getCategoryId(), connector.getCategory().getId());
-			assertTrue(connector.getCategory().getConnectors().contains(connector));
-		}
-	}
-
-	public void testMultipleStrategies() throws CoreException {
-		MockDiscoveryStrategy strategy = new MockDiscoveryStrategy();
-		strategy.setConnectorMockFactory(mockDiscoveryStrategy.getConnectorMockFactory());
-		strategy.setCategoryMockFactory(mockDiscoveryStrategy.getCategoryMockFactory());
-		connectorDiscovery.getDiscoveryStrategies().add(strategy);
-
-		connectorDiscovery.performDiscovery(new NullProgressMonitor());
-
-		assertEquals(mockDiscoveryStrategy.getConnectorMockFactory().getCreatedCount(),
-				connectorDiscovery.getConnectors().size());
-		assertEquals(mockDiscoveryStrategy.getCategoryMockFactory().getCreatedCount(),
-				connectorDiscovery.getCategories().size());
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/DirectoryParserTest.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/DirectoryParserTest.java
deleted file mode 100644
index d50092d..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/DirectoryParserTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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.discovery.tests.core;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.discovery.core.model.Directory;
-import org.eclipse.mylyn.internal.discovery.core.model.DirectoryParser;
-
-/**
- * @author David Green
- */
-public class DirectoryParserTest extends TestCase {
-
-	private DirectoryParser parser;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		parser = new DirectoryParser();
-	}
-
-	public void testParse() throws IOException {
-		Directory directory = parser.parse(new StringReader(
-				"<directory xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\"http://foo.bar.nodomain/baz.jar\"/></directory>"));
-		assertNotNull(directory);
-		assertEquals(1, directory.getEntries().size());
-		assertEquals("http://foo.bar.nodomain/baz.jar", directory.getEntries().get(0).getLocation());
-	}
-
-	public void testParseBadFormat() throws IOException {
-		try {
-			parser.parse(new StringReader(
-					"<directory2 xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\"http://foo.bar.nodomain/baz.jar\"/></directory2>"));
-			fail("Expected exception");
-		} catch (IOException e) {
-			// expected
-		}
-	}
-
-	public void testParseMalformed() throws IOException {
-		try {
-			parser.parse(new StringReader(
-					"<directory xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\"http://foo.bar.nodomain/baz.jar\">"));
-			fail("Expected exception");
-		} catch (IOException e) {
-			// expected
-		}
-	}
-
-	public void testParseUnexpectedElementsAndAttributes() throws IOException {
-		Directory directory = parser.parse(new StringReader(
-				"<directory xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\"http://foo.bar.nodomain/baz.jar\" id=\"asdf\"><baz/></entry><foo/></directory>"));
-		assertNotNull(directory);
-		assertEquals(1, directory.getEntries().size());
-		assertEquals("http://foo.bar.nodomain/baz.jar", directory.getEntries().get(0).getLocation());
-	}
-
-	public void testParseNoNS() throws IOException {
-		Directory directory = parser.parse(new StringReader(
-				"<directory><entry url=\"http://foo.bar.nodomain/baz.jar\"/></directory>"));
-		assertNotNull(directory);
-		assertEquals(1, directory.getEntries().size());
-		assertEquals("http://foo.bar.nodomain/baz.jar", directory.getEntries().get(0).getLocation());
-	}
-
-	public void testParsePermitCategoriesTrue() throws IOException {
-		Directory directory = parser.parse(new StringReader(
-				"<directory xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\"http://foo.bar.nodomain/baz.jar\" permitCategories=\"true\"/></directory>"));
-		assertNotNull(directory);
-		assertEquals(1, directory.getEntries().size());
-		assertEquals(true, directory.getEntries().get(0).isPermitCategories());
-	}
-
-	public void testParsePermitCategoriesFalse() throws IOException {
-		Directory directory = parser.parse(new StringReader(
-				"<directory xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\"http://foo.bar.nodomain/baz.jar\" permitCategories=\"false\"/></directory>"));
-		assertNotNull(directory);
-		assertEquals(1, directory.getEntries().size());
-		assertEquals(false, directory.getEntries().get(0).isPermitCategories());
-	}
-
-	public void testParsePermitCategoriesNotSpecified() throws IOException {
-		Directory directory = parser.parse(new StringReader(
-				"<directory xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\"http://foo.bar.nodomain/baz.jar\"/></directory>"));
-		assertNotNull(directory);
-		assertEquals(1, directory.getEntries().size());
-		assertEquals(false, directory.getEntries().get(0).isPermitCategories());
-	}
-
-	public void testParsePermitCategoriesSpecifiedBadly() throws IOException {
-		Directory directory = parser.parse(new StringReader(
-				"<directory xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\"http://foo.bar.nodomain/baz.jar\" permitCategories=\"\"/></directory>"));
-		assertNotNull(directory);
-		assertEquals(1, directory.getEntries().size());
-		assertEquals(false, directory.getEntries().get(0).isPermitCategories());
-	}
-
-	public void testParsePermitCategoriesSpecifiedBadly2() throws IOException {
-		Directory directory = parser.parse(new StringReader(
-				"<directory xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\"http://foo.bar.nodomain/baz.jar\" permitCategories=\"asdf\"/></directory>"));
-		assertNotNull(directory);
-		assertEquals(1, directory.getEntries().size());
-		assertEquals(false, directory.getEntries().get(0).isPermitCategories());
-	}
-
-	public void testParseBaseRelativeUrl() throws IOException, URISyntaxException {
-		parser.setBaseUri(new URI("http://base.uri/location/directory.xml"));
-		Directory directory = parser.parse(new StringReader(
-				"<directory xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\"parent/baz.jar\"/><entry url=\"http://absolute/bar.jar\"/></directory>"));
-		assertNotNull(directory);
-		assertEquals(2, directory.getEntries().size());
-		assertEquals("http://base.uri/location/parent/baz.jar", directory.getEntries().get(0).getLocation());
-		assertEquals("http://absolute/bar.jar", directory.getEntries().get(1).getLocation());
-	}
-
-	public void testParseRootUrl() throws IOException, URISyntaxException {
-		parser.setBaseUri(new URI("http://base.uri/location/directory.xml"));
-		Directory directory = parser.parse(new StringReader(
-				"<directory xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\"/baz.jar\"/></directory>"));
-		assertNotNull(directory);
-		assertEquals(1, directory.getEntries().size());
-		assertEquals("http://base.uri/baz.jar", directory.getEntries().get(0).getLocation());
-	}
-
-	public void testParseBaseInvalidRelativeUrl() throws IOException, URISyntaxException {
-		parser.setBaseUri(new URI("http://base.uri/location/directory.xml"));
-		Directory directory = parser.parse(new StringReader(
-				"<directory xmlns=\"http://www.eclipse.org/mylyn/discovery/directory/\"><entry url=\":/baz.jar\"/><entry url=\"http://absolute/bar.jar\"/></directory>"));
-		assertNotNull(directory);
-		assertEquals(2, directory.getEntries().size());
-		assertEquals(":/baz.jar", directory.getEntries().get(0).getLocation());
-		assertEquals("http://absolute/bar.jar", directory.getEntries().get(1).getLocation());
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/RemoteBundleDiscoveryStrategyTest.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/RemoteBundleDiscoveryStrategyTest.java
deleted file mode 100644
index 0582a3a..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/RemoteBundleDiscoveryStrategyTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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.discovery.tests.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.discovery.tests.DiscoveryTestConstants;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCategory;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCertification;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
-import org.eclipse.mylyn.internal.discovery.core.model.RemoteBundleDiscoveryStrategy;
-
-/**
- * @author David Green
- */
-public class RemoteBundleDiscoveryStrategyTest extends TestCase {
-
-	private RemoteBundleDiscoveryStrategy discoveryStrategy;
-
-	@Override
-	protected void setUp() throws Exception {
-		discoveryStrategy = new RemoteBundleDiscoveryStrategy();
-		discoveryStrategy.setDirectoryUrl(DiscoveryTestConstants.DEFAULT_MYLYN_DISCOVERY_URL);
-		discoveryStrategy.setCategories(new ArrayList<DiscoveryCategory>());
-		discoveryStrategy.setConnectors(new ArrayList<DiscoveryConnector>());
-		discoveryStrategy.setCertifications(new ArrayList<DiscoveryCertification>());
-	}
-
-	public void testPerformDiscovery() throws CoreException, IOException {
-		discoveryStrategy.performDiscovery(new NullProgressMonitor());
-		assertFalse(discoveryStrategy.getCategories().isEmpty());
-		for (DiscoveryCategory category : discoveryStrategy.getCategories()) {
-//			System.out.println(String.format("%s: %s: %s", category.getId(), category.getName(),
-//					category.getDescription()));
-			assertNotNull(category.getId());
-			assertNotNull(category.getName());
-			assertNotNull(category.getDescription());
-		}
-		assertFalse(discoveryStrategy.getConnectors().isEmpty());
-		for (DiscoveryConnector connector : discoveryStrategy.getConnectors()) {
-//			System.out.println(String.format("%s: %s: %s", connector.getId(), connector.getName(),
-//					connector.getDescription()));
-			assertNotNull(connector.getId());
-			assertNotNull(connector.getKind());
-			assertNotNull(connector.getName());
-			assertNotNull(connector.getDescription());
-
-			// we _know_ that the bundle must have a plugin.xml... so verify that the source is working correctly
-			assertNotNull(connector.getSource());
-			URL pluginXmlUrl = connector.getSource().getResource("plugin.xml");
-//			System.out.println("URL: " + pluginXmlUrl);
-			InputStream in = pluginXmlUrl.openStream();
-			assertNotNull(in);
-			in.close();
-		}
-
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/AbstractMockFactory.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/AbstractMockFactory.java
deleted file mode 100644
index de8f9da..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/AbstractMockFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.tests.core.mock;
-
-/**
- * 
- * @author David Green
- */
-public abstract class AbstractMockFactory<MockType> {
-
-	protected int seed = 0;
-
-	private MockType mockObject;
-
-	protected MockDiscoverySource source = new MockDiscoverySource();
-
-	public final MockType get() {
-		MockType object = getMockObject();
-		mockObject = null;
-		return object;
-	}
-
-	public final MockType getMockObject() {
-		if (mockObject == null) {
-			++seed;
-			mockObject = createMockObject();
-			populateMockData();
-		}
-		return mockObject;
-	}
-
-	protected abstract void populateMockData();
-
-	protected abstract MockType createMockObject();
-
-	/**
-	 * get the number of objects created by this factory
-	 */
-	public int getCreatedCount() {
-		return seed;
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/DiscoveryCategoryMockFactory.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/DiscoveryCategoryMockFactory.java
deleted file mode 100644
index e93c4c6..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/DiscoveryCategoryMockFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.tests.core.mock;
-
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCategory;
-import org.eclipse.mylyn.internal.discovery.core.model.Icon;
-
-/**
- * @author David Green
- */
-public class DiscoveryCategoryMockFactory extends AbstractMockFactory<DiscoveryCategory> {
-
-	DiscoveryCategory category;
-
-	@Override
-	protected DiscoveryCategory createMockObject() {
-		return new DiscoveryCategory();
-	}
-
-	@Override
-	protected void populateMockData() {
-		// mock up some data
-
-		getMockObject().setSource(source);
-
-		name("Category " + seed).id(DiscoveryCategoryMockFactory.class.getPackage().getName() + ".connector" + seed)
-				.description("A category of things, " + seed);
-
-		Icon icon = new Icon();
-		icon.setImage128("images/ico128.png");
-		icon.setImage16("images/ico16.png");
-		icon.setImage32("images/ico32.png");
-		icon.setImage64("images/ico64.png");
-
-		getMockObject().setIcon(icon);
-	}
-
-	public DiscoveryCategoryMockFactory description(String description) {
-		getMockObject().setDescription(description);
-		return this;
-	}
-
-	public DiscoveryCategoryMockFactory icon(Icon icon) {
-		getMockObject().setIcon(icon);
-		return this;
-	}
-
-	public DiscoveryCategoryMockFactory id(String id) {
-		getMockObject().setId(id);
-		return this;
-	}
-
-	public DiscoveryCategoryMockFactory name(String name) {
-		getMockObject().setName(name);
-		return this;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/DiscoveryConnectorMockFactory.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/DiscoveryConnectorMockFactory.java
deleted file mode 100644
index c7ae37e..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/DiscoveryConnectorMockFactory.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.tests.core.mock;
-
-import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDescriptorKind;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
-import org.eclipse.mylyn.internal.discovery.core.model.FeatureFilter;
-import org.eclipse.mylyn.internal.discovery.core.model.Icon;
-import org.eclipse.mylyn.internal.discovery.core.model.Overview;
-
-/**
- * @author David Green
- */
-public class DiscoveryConnectorMockFactory extends AbstractMockFactory<DiscoveryConnector> {
-
-	public DiscoveryConnectorMockFactory() {
-	}
-
-	@Override
-	protected void populateMockData() {
-
-		// mock up some data
-
-		getMockObject().setSource(source);
-
-		name("Connector " + seed).id(DiscoveryConnectorMockFactory.class.getPackage().getName() + ".connector" + seed)
-				.siteUrl("http://example.nodomain/some/path/updateSite3.x/")
-				.kind(ConnectorDescriptorKind.TASK)
-				.license(seed % 2 == 0 ? "EPL 1.0" : "APL 2.0")
-				.description("a connector for the Example Task System versions 1.0 - 5.3")
-				.categoryId("example")
-				.provider("Testing 123 Inc.");
-
-		Icon icon = new Icon();
-		icon.setImage128("images/ico128.png");
-		icon.setImage16("images/ico16.png");
-		icon.setImage32("images/ico32.png");
-		icon.setImage64("images/ico64.png");
-
-		Overview overview = new Overview();
-		overview.setScreenshot("images/screenshot-main.png");
-		overview.setSummary("some long text that summarizes the connector");
-		overview.setUrl("http://example.nodomain/some/path/updateSite3.x/overview.html");
-
-		icon(icon).overview(overview);
-		overview.setConnectorDescriptor(getMockObject());
-	}
-
-	@Override
-	protected DiscoveryConnector createMockObject() {
-		return new DiscoveryConnector();
-	}
-
-	public DiscoveryConnectorMockFactory categoryId(String categoryId) {
-		getMockObject().setCategoryId(categoryId);
-		return this;
-	}
-
-	public DiscoveryConnectorMockFactory description(String description) {
-		getMockObject().setDescription(description);
-		return this;
-	}
-
-	public DiscoveryConnectorMockFactory icon(Icon icon) {
-		getMockObject().setIcon(icon);
-		return this;
-	}
-
-	public DiscoveryConnectorMockFactory id(String id) {
-		getMockObject().setId(id);
-		return this;
-	}
-
-	public DiscoveryConnectorMockFactory kind(ConnectorDescriptorKind kind) {
-		getMockObject().getKind().add(kind);
-		return this;
-	}
-
-	public DiscoveryConnectorMockFactory license(String license) {
-		getMockObject().setLicense(license);
-		return this;
-	}
-
-	public DiscoveryConnectorMockFactory name(String name) {
-		getMockObject().setName(name);
-		return this;
-	}
-
-	public DiscoveryConnectorMockFactory overview(Overview overview) {
-		getMockObject().setOverview(overview);
-		return this;
-	}
-
-	public DiscoveryConnectorMockFactory platformFilter(String platformFilter) {
-		getMockObject().setPlatformFilter(platformFilter);
-		return this;
-	}
-
-	public DiscoveryConnectorMockFactory provider(String provider) {
-		getMockObject().setProvider(provider);
-		return this;
-	}
-
-	public DiscoveryConnectorMockFactory siteUrl(String siteUrl) {
-		getMockObject().setSiteUrl(siteUrl);
-		return this;
-	}
-
-	public DiscoveryConnectorMockFactory featureFilter(String featureId, String versionRange) {
-		FeatureFilter featureFilter = new FeatureFilter();
-		featureFilter.setConnectorDescriptor(getMockObject());
-		featureFilter.setFeatureId(featureId);
-		featureFilter.setVersion(versionRange);
-		getMockObject().getFeatureFilter().add(featureFilter);
-		return this;
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockBundleDiscoveryStrategy.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockBundleDiscoveryStrategy.java
deleted file mode 100644
index 2d40a7c..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockBundleDiscoveryStrategy.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.tests.core.mock;
-
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.mylyn.internal.discovery.core.model.AbstractDiscoverySource;
-import org.eclipse.mylyn.internal.discovery.core.model.BundleDiscoveryStrategy;
-import org.eclipse.mylyn.internal.discovery.core.model.Policy;
-
-/**
- * a discovery strategy for bundles where the policy can be arbitrarily set
- * 
- * @author David Green
- */
-public class MockBundleDiscoveryStrategy extends BundleDiscoveryStrategy {
-	private Policy policy = Policy.defaultPolicy();
-
-	@Override
-	protected AbstractDiscoverySource computeDiscoverySource(IContributor contributor) {
-		AbstractDiscoverySource discoverySource = super.computeDiscoverySource(contributor);
-		discoverySource.setPolicy(policy);
-		return discoverySource;
-	}
-
-	public Policy getPolicy() {
-		return policy;
-	}
-
-	public void setPolicy(Policy policy) {
-		this.policy = policy;
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockDiscoverySource.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockDiscoverySource.java
deleted file mode 100644
index a84dd05..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockDiscoverySource.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.tests.core.mock;
-
-import java.net.URL;
-
-import org.eclipse.mylyn.internal.discovery.core.model.AbstractDiscoverySource;
-
-/**
- * @author David Green
- */
-public class MockDiscoverySource extends AbstractDiscoverySource {
-
-	@Override
-	public Object getId() {
-		return "mock:mock";
-	}
-
-	@Override
-	public URL getResource(String resourceName) {
-		return null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockDiscoveryStrategy.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockDiscoveryStrategy.java
deleted file mode 100644
index aab0ec2..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/mock/MockDiscoveryStrategy.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.discovery.tests.core.mock;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.mylyn.internal.discovery.core.model.AbstractDiscoveryStrategy;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCategory;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
-
-/**
- * @author David Green
- */
-public class MockDiscoveryStrategy extends AbstractDiscoveryStrategy {
-
-	private int connectorCount = 15;
-
-	private int categoryCount = 5;
-
-	protected DiscoveryConnectorMockFactory connectorMockFactory = new DiscoveryConnectorMockFactory();
-
-	protected DiscoveryCategoryMockFactory categoryMockFactory = new DiscoveryCategoryMockFactory();
-
-	@Override
-	public void performDiscovery(IProgressMonitor monitor) throws CoreException {
-		for (int x = 0; x < categoryCount; ++x) {
-			DiscoveryCategory mockCategory = createDiscoveryCategory();
-			getCategories().add(mockCategory);
-		}
-		for (int x = 0; x < connectorCount; ++x) {
-			DiscoveryConnector mockConnector = createDiscoveryConnector();
-			// put the connector in a category
-			if (!getCategories().isEmpty()) {
-				int categoryIndex = x % getCategories().size();
-				mockConnector.setCategoryId(getCategories().get(categoryIndex).getId());
-			}
-			getConnectors().add(mockConnector);
-		}
-	}
-
-	protected DiscoveryCategory createDiscoveryCategory() {
-		return categoryMockFactory.get();
-	}
-
-	protected DiscoveryConnector createDiscoveryConnector() {
-		return connectorMockFactory.get();
-	}
-
-	public DiscoveryCategoryMockFactory getCategoryMockFactory() {
-		return categoryMockFactory;
-	}
-
-	public void setCategoryMockFactory(DiscoveryCategoryMockFactory categoryMockFactory) {
-		this.categoryMockFactory = categoryMockFactory;
-	}
-
-	public DiscoveryConnectorMockFactory getConnectorMockFactory() {
-		return connectorMockFactory;
-	}
-
-	public void setConnectorMockFactory(DiscoveryConnectorMockFactory connectorMockFactory) {
-		this.connectorMockFactory = connectorMockFactory;
-	}
-
-	public int getConnectorCount() {
-		return connectorCount;
-	}
-
-	public void setConnectorCount(int connectorCount) {
-		this.connectorCount = connectorCount;
-	}
-
-	public int getCategoryCount() {
-		return categoryCount;
-	}
-
-	public void setCategoryCount(int categoryCount) {
-		this.categoryCount = categoryCount;
-	}
-
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryCategoryComparatorTest.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryCategoryComparatorTest.java
deleted file mode 100644
index af1703e..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryCategoryComparatorTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.discovery.tests.core.util;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCategory;
-import org.eclipse.mylyn.internal.discovery.core.util.DiscoveryCategoryComparator;
-
-public class DiscoveryCategoryComparatorTest extends TestCase {
-
-	private DiscoveryCategoryComparator comparator;
-
-	private DiscoveryCategory category1;
-
-	private DiscoveryCategory category2;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		comparator = new DiscoveryCategoryComparator();
-		category1 = new DiscoveryCategory();
-		category2 = new DiscoveryCategory();
-	}
-
-	public void testSortByRelevanceInequal() {
-		category1.setRelevance("100");
-		category2.setRelevance("50");
-		assertEquals(-1, comparator.compare(category1, category2));
-		assertEquals(1, comparator.compare(category2, category1));
-	}
-
-	public void testSortByRelevanceOneNotSpecified() {
-		category1.setRelevance("10");
-		assertEquals(-1, comparator.compare(category1, category2));
-		assertEquals(1, comparator.compare(category2, category1));
-	}
-
-	public void testSortByRelevanceSame() {
-		category1.setRelevance("10");
-		category1.setName("test");
-		category1.setId("1");
-		category2.setRelevance("10");
-		category2.setName("test");
-		category2.setId("1");
-		assertEquals(0, comparator.compare(category1, category2));
-		assertEquals(0, comparator.compare(category2, category1));
-	}
-
-	public void testSortByRelevanceSameIdsDiffer() {
-		category1.setRelevance("10");
-		category1.setName("test");
-		category1.setId("a");
-		category2.setRelevance("10");
-		category2.setName("test");
-		category2.setId("b");
-		assertEquals(-1, comparator.compare(category1, category2));
-		assertEquals(1, comparator.compare(category2, category1));
-	}
-
-	public void testSortByRelevanceSameNamesDiffer() {
-		category1.setRelevance("10");
-		category1.setName("a");
-		category1.setId("a");
-		category2.setRelevance("10");
-		category2.setName("b");
-		category2.setId("a");
-		assertEquals(-1, comparator.compare(category1, category2));
-		assertEquals(1, comparator.compare(category2, category1));
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryConnectorComparatorTest.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryConnectorComparatorTest.java
deleted file mode 100644
index 5ce7127..0000000
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryConnectorComparatorTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.discovery.tests.core.util;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCategory;
-import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
-import org.eclipse.mylyn.internal.discovery.core.model.Group;
-import org.eclipse.mylyn.internal.discovery.core.util.DiscoveryConnectorComparator;
-
-public class DiscoveryConnectorComparatorTest extends TestCase {
-
-	private DiscoveryCategory category;
-
-	private DiscoveryConnectorComparator comparator;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		category = new DiscoveryCategory();
-		comparator = new DiscoveryConnectorComparator(category);
-	}
-
-	private Group addGroup(String id) {
-		Group group = new Group();
-		group.setId(id);
-		category.getGroup().add(group);
-		return group;
-	}
-
-	private DiscoveryConnector addConnectorDescriptor(String id, String name, String groupId) {
-		DiscoveryConnector connector = new DiscoveryConnector();
-		connector.setId(id);
-		connector.setName(name);
-		connector.setGroupId(groupId);
-		connector.setCategory(category);
-		category.getConnectors().add(connector);
-		return connector;
-	}
-
-	public void testOrderByGroup() {
-		addGroup("1");
-		addGroup("2");
-		DiscoveryConnector t1 = addConnectorDescriptor("b", "btest", "2");
-		DiscoveryConnector t2 = addConnectorDescriptor("a", "atest", "2");
-		DiscoveryConnector t3 = addConnectorDescriptor("c", "ctest", "1");
-		DiscoveryConnector t4 = addConnectorDescriptor("d", "dtest", "1");
-		DiscoveryConnector t5 = addConnectorDescriptor("0", "0test", null);
-
-		assertEquals(-1, comparator.compare(t2, t1));
-		assertEquals(1, comparator.compare(t1, t2));
-		assertEquals(-1, comparator.compare(t3, t4));
-		assertEquals(1, comparator.compare(t4, t3));
-
-		assertEquals(-1, comparator.compare(t1, t5));
-		assertEquals(1, comparator.compare(t5, t1));
-		assertEquals(-1, comparator.compare(t2, t5));
-		assertEquals(1, comparator.compare(t5, t2));
-		assertEquals(-1, comparator.compare(t3, t5));
-		assertEquals(1, comparator.compare(t5, t3));
-		assertEquals(-1, comparator.compare(t4, t5));
-		assertEquals(1, comparator.compare(t5, t4));
-
-		assertEquals(-1, comparator.compare(t3, t1));
-		assertEquals(1, comparator.compare(t1, t3));
-		assertEquals(-1, comparator.compare(t3, t2));
-		assertEquals(1, comparator.compare(t2, t3));
-
-		assertEquals(-1, comparator.compare(t4, t1));
-		assertEquals(1, comparator.compare(t1, t4));
-		assertEquals(-1, comparator.compare(t4, t2));
-		assertEquals(1, comparator.compare(t2, t4));
-	}
-}
diff --git a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/.project b/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/.project
deleted file mode 100644
index 8d09332..0000000
--- a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.discovery.test1-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/build.properties b/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/feature.xml b/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/feature.xml
deleted file mode 100644
index e5b89e0..0000000
--- a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test1-feature/feature.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.mylyn.discovery.test1"
-      label="Discovery Test Feature 1"
-      version="1.0.0.qualifier"
-      provider-name="Eclipse Mylyn">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-</feature>
diff --git a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/.project b/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/.project
deleted file mode 100644
index 647d36d..0000000
--- a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.discovery.test2-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/build.properties b/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/feature.xml b/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/feature.xml
deleted file mode 100644
index f2f089a..0000000
--- a/org.eclipse.mylyn.discovery.tests/testdata/org.eclipse.mylyn.discovery.test2-feature/feature.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.mylyn.discovery.test2"
-      label="Discovery Test Feature 2"
-      version="1.0.0.qualifier"
-      provider-name="Eclipse Mylyn">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.mylyn.discovery.test1"
-         version="0.0.0"/>
-
-</feature>
diff --git a/org.eclipse.mylyn.discovery.tests/testdata/update/artifacts.jar b/org.eclipse.mylyn.discovery.tests/testdata/update/artifacts.jar
deleted file mode 100644
index 7a37f6f..0000000
--- a/org.eclipse.mylyn.discovery.tests/testdata/update/artifacts.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.tests/testdata/update/content.jar b/org.eclipse.mylyn.discovery.tests/testdata/update/content.jar
deleted file mode 100644
index 78e190b..0000000
--- a/org.eclipse.mylyn.discovery.tests/testdata/update/content.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.tests/testdata/update/features/org.eclipse.mylyn.discovery.test1_1.0.0.201001200403.jar b/org.eclipse.mylyn.discovery.tests/testdata/update/features/org.eclipse.mylyn.discovery.test1_1.0.0.201001200403.jar
deleted file mode 100644
index 4ede525..0000000
--- a/org.eclipse.mylyn.discovery.tests/testdata/update/features/org.eclipse.mylyn.discovery.test1_1.0.0.201001200403.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery.tests/testdata/update/features/org.eclipse.mylyn.discovery.test2_1.0.0.201001200403.jar b/org.eclipse.mylyn.discovery.tests/testdata/update/features/org.eclipse.mylyn.discovery.test2_1.0.0.201001200403.jar
deleted file mode 100644
index 52b43d8..0000000
--- a/org.eclipse.mylyn.discovery.tests/testdata/update/features/org.eclipse.mylyn.discovery.test2_1.0.0.201001200403.jar
+++ /dev/null
Binary files differ
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 8d68e73..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) 2010 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 5e7f2bd..0000000
--- a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
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 f196c95..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.4.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 a815cd2..0000000
--- a/org.eclipse.mylyn.monitor.core/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-#Properties file for org.eclipse.mylyn.monitor.core
-Bundle-Vendor = Eclipse Mylyn
-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 a3cae5c..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, 2009 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 f7e3638..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/messages.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-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 58eead0..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/InteractionEvent.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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) {
-		this(kind, structureKind, handle, originId, navigatedRelation, delta, interestContribution,
-				Calendar.getInstance().getTime());
-	}
-
-	private InteractionEvent(Kind kind, String structureKind, String handle, String originId, String navigatedRelation,
-			String delta, float interestContribution, Date startDate) {
-		this(kind, structureKind, handle, originId, navigatedRelation, delta, interestContribution, startDate,
-				startDate);
-	}
-
-	/**
-	 * 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 != null) ? structureKind.intern() : null;
-		this.structureHandle = (handle != null) ? handle.intern() : null;
-		this.originId = originId.intern();
-		this.navigation = (navigatedRelation != null) ? navigatedRelation.intern() : null;
-		this.delta = (delta != null) ? delta.intern() : null;
-		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 8d68e73..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) 2010 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 5e7f2bd..0000000
--- a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
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 6857bbf..0000000
--- a/org.eclipse.mylyn.monitor.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Monitor Tests
-Bundle-SymbolicName: org.eclipse.mylyn.monitor.tests;singleton:=true
-Bundle-Version: 3.4.0.qualifier
-Bundle-Vendor: Eclipse Mylyn
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.jface,
- org.eclipse.ui.workbench,
- org.eclipse.mylyn.commons.tests,
- 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-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 f7c1c8c..0000000
--- a/org.eclipse.mylyn.monitor.tests/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 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 e35af8e..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/ContextParsingTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.mylyn.commons.tests.support.CommonTestUtil;
-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;
-
-/**
- * @author Mik Kersten
- */
-public class ContextParsingTest extends TestCase {
-
-	private List<InteractionEvent> events;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		File file = CommonTestUtil.getFile(this, "testdata/usage-parsing.zip");
-		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 395dfee..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/DataOverviewCollectorTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.jobs.IJobChangeListener;
-import org.eclipse.mylyn.commons.tests.support.CommonTestUtil;
-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;
-
-/**
- * @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 = CommonTestUtil.getFile(this,
-				"testdata/USAGE-1.1.1-usage-1-2005-12-05-1-1-1.zip");
-		interactionHistoryFiles.add(firstInteractionHistoryFile);
-		File secondInteractionHistoryFile = CommonTestUtil.getFile(this,
-				"testdata/USAGE-1.1.1-usage-2-2005-12-05-1-1-1.zip");
-		interactionHistoryFiles.add(secondInteractionHistoryFile);
-
-		// Initialize fake logger
-		File logFile = File.createTempFile("test-log", ".xml");
-		logFile.deleteOnExit();
-		try {
-			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, (IJobChangeListener) null);
-		} finally {
-			// 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/tests/ActivityContextManagerTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/ActivityContextManagerTest.java
deleted file mode 100644
index bc639bb..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/ActivityContextManagerTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.util.Arrays;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.monitor.ui.ActivityContextManager;
-import org.eclipse.mylyn.monitor.ui.AbstractUserActivityMonitor;
-
-/**
- * @author Steffen Pingel
- */
-public class ActivityContextManagerTest extends TestCase {
-
-	private class StubMonitor extends AbstractUserActivityMonitor {
-
-		private boolean started;
-
-		private boolean fail;
-
-		private boolean enabled = true;
-
-		@Override
-		public boolean isEnabled() {
-			return enabled;
-		}
-
-		@Override
-		public void start() {
-			started = true;
-		}
-
-		@Override
-		public void stop() {
-			started = false;
-		}
-
-		@Override
-		public long getLastInteractionTime() {
-			if (fail) {
-				throw new LinkageError();
-			}
-			return super.getLastInteractionTime();
-		}
-
-	}
-
-	private StubMonitor monitor1;
-
-	private StubMonitor monitor2;
-
-	private ActivityContextManager manager;
-
-	@Override
-	protected void setUp() throws Exception {
-		monitor1 = new StubMonitor();
-		monitor2 = new StubMonitor();
-		manager = new ActivityContextManager(Arrays.asList(new AbstractUserActivityMonitor[] { monitor1, monitor2 }));
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		if (manager != null) {
-			manager.stop();
-		}
-	};
-
-	public void testStartStop() {
-		manager.start();
-		assertTrue(monitor1.started);
-		assertTrue(monitor2.started);
-		manager.stop();
-		assertFalse(monitor1.started);
-		assertFalse(monitor2.started);
-	}
-
-	public void testGetInactivityTimeout() {
-		monitor1.setLastEventTime(1);
-		monitor2.setLastEventTime(2);
-		assertEquals(1, manager.getLastInteractionTime());
-		assertEquals(1, manager.getLastInteractionTime());
-	}
-
-	public void testGetInactivityTimeoutFailure() {
-		monitor1.setLastEventTime(1);
-		monitor2.setLastEventTime(2);
-		manager.start();
-		assertEquals(1, manager.getLastInteractionTime());
-		monitor1.fail = true;
-		assertEquals(2, manager.getLastInteractionTime());
-		manager.stop();
-		// the first monitor should have been disabled
-		assertTrue(monitor1.started);
-		assertFalse(monitor2.started);
-	}
-
-	public void testEnabled() {
-		monitor1.enabled = false;
-		monitor1.setLastEventTime(1);
-		monitor2.setLastEventTime(2);
-		assertEquals(2, manager.getLastInteractionTime());
-		monitor2.enabled = false;
-		assertEquals(-1, manager.getLastInteractionTime());
-	}
-
-}
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 525b7e5..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/AllMonitorTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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(CheckActivityJobTest.class);
-		suite.addTestSuite(InteractionLoggerTest.class);
-		suite.addTestSuite(StatisticsLoggingTest.class);
-		suite.addTestSuite(MonitorTest.class);
-		suite.addTestSuite(InteractionEventExternalizationTest.class);
-		suite.addTestSuite(MonitorPackagingTest.class);
-		suite.addTestSuite(MultiWindowMonitorTest.class);
-		suite.addTestSuite(ActivityContextManagerTest.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 a151e16..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/CheckActivityJobTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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() - 201;
-		job.setInactivityTimeout(200);
-		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();
-		long slept = System.currentTimeMillis() - callback.lastEventTime;
-		assertTrue(job.isActive());
-		assertTrue("expected less than 5 < activeTime < 40, got " + callback.activeTime + " (slept " + slept + " ms)",
-				callback.activeTime > 5 && callback.activeTime < 40);
-	}
-
-	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
-		long slept = System.currentTimeMillis() - callback.lastEventTime;
-		assertTrue("expected less than 10 < activeTime < 20, got " + callback.activeTime + " (slept " + slept + " ms)",
-				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 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 801ca54..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/InteractionEventExternalizationTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.getDefault().getPreferenceStore().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.getDefault().getPreferenceStore().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 30dc43c..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorPackagingTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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);
-		try {
-			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());
-		} finally {
-			zf.close();
-		}
-
-		// 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 e80327c..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.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 MockSelectionMonitor selectionMonitor;
-
-	private final KeybindingCommandMonitor commandMonitor = new KeybindingCommandMonitor();
-
-	private final PerspectiveChangeMonitor perspectiveMonitor = new PerspectiveChangeMonitor();
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		selectionMonitor = new MockSelectionMonitor();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (selectionMonitor != null) {
-			selectionMonitor.dispose();
-		}
-	}
-
-	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();
-	}
-
-	@SuppressWarnings({ "deprecation", "rawtypes" })
-	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/MultiWindowMonitorTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MultiWindowMonitorTest.java
deleted file mode 100644
index 6b66146..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MultiWindowMonitorTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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 MockSelectionMonitor selectionMonitor;
-
-	private IWorkbenchWindow window1;
-
-	private IWorkbenchWindow window2;
-
-	private IWorkbenchWindow window3;
-
-	private IWorkbenchWindow window4;
-
-	private boolean monitoringWasEnabled;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		selectionMonitor = new MockSelectionMonitor();
-		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();
-		}
-		if (selectionMonitor != null) {
-			selectionMonitor.dispose();
-		}
-	}
-
-	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 67b048e..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/AllMonitorUsageTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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);
-		suite.addTestSuite(InteractionEventLoggerTest.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 11f735e..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/DefaultPreferenceConfigTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.getDefault().getPreferenceStore().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 5359036..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/FileDisplayDialogTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.mylyn.commons.tests.support.CommonTestUtil;
-import org.eclipse.mylyn.internal.monitor.usage.FileDisplayDialog;
-
-/**
- * @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 = CommonTestUtil.getFile(this, "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/src/org/eclipse/mylyn/monitor/tests/usage/tests/InteractionEventLoggerTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/InteractionEventLoggerTest.java
deleted file mode 100644
index 50dc7b2..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/InteractionEventLoggerTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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:
- *     Emerson Murphy-Hill
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests.usage.tests;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.text.DateFormat;
-import java.util.Calendar;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.mylyn.commons.tests.support.CommonTestUtil;
-import org.eclipse.mylyn.internal.monitor.usage.InteractionEventLogger;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Shawn Minto
- */
-public class InteractionEventLoggerTest extends TestCase {
-
-	private final Calendar c = Calendar.getInstance();
-
-	private final DateFormat dateFormat = InteractionEventLogger.dateFormat();
-
-	private final Random random = new Random();
-
-	private File createBigDummyFile() throws IOException {
-		File monitorFile = File.createTempFile("interaction_history_temp", ".xml");
-
-		BufferedWriter out = new BufferedWriter(new FileWriter(monitorFile));
-		try {
-			for (int i = 0; i < 20000; i++) {
-				out.write("<interactionEvent>");
-				out.newLine();
-				out.write("<kind>selection</kind>");
-				out.newLine();
-				out.write("<date>");
-				writeRandomDate(out);
-				out.write("</date>");
-				out.newLine();
-				out.write("<endDate>");
-				writeRandomDate(out);
-				out.write("</endDate>");
-				out.newLine();
-				out.write("<originId>");
-				writeRandomString(out);
-				out.write("</originId>");
-				out.newLine();
-				out.write("<structureKind>");
-				writeRandomString(out);
-				out.write("</structureKind>");
-				out.newLine();
-				out.write("<structureHandle>");
-				writeRandomString(out);
-				out.write("</structureHandle>");
-				out.newLine();
-				out.write("<navigation>null</navigation>");
-				out.newLine();
-				out.write("<delta>false</delta>");
-				out.newLine();
-				out.write("</interactionEvent>");
-				out.newLine();
-			}
-		} finally {
-			out.close();
-		}
-		return monitorFile;
-	}
-
-	private void runWith(final File monitorFile) throws InvocationTargetException, InterruptedException {
-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());
-		dialog.run(true, true, new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor monitor) {
-				monitor.beginTask("Running test job", 1);
-				InteractionEventLogger l = new InteractionEventLogger(null);
-				l.getHistoryFromFile(monitorFile, new SubProgressMonitor(monitor, 1));
-				monitor.done();
-			}
-		});
-	}
-
-	public void testLoggerProgress() throws Exception {
-		runWith(CommonTestUtil.getFile(this, "testdata/monitor-log.xml"));
-	}
-
-	public void testLoggerProgressBig() throws Exception {
-		File file = createBigDummyFile();
-		file.deleteOnExit();
-		runWith(file);
-		file.delete();
-	}
-
-	public void testLoggerProgressZip() throws Exception {
-		runWith(CommonTestUtil.getFile(this, "testdata/usage-parsing.zip"));
-	}
-
-	private void writeRandomDate(BufferedWriter out) throws IOException {
-		c.setTimeInMillis(random.nextLong());
-		out.write(dateFormat.format(c.getTime()));
-	}
-
-	private void writeRandomString(BufferedWriter out) throws IOException {
-		for (int j = 0; j < 3; j++) {
-			out.write(Math.random() + "");
-		}
-	}
-
-}
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 135df2f..0000000
--- a/org.eclipse.mylyn.monitor.tests/test-log.xml
+++ /dev/null
@@ -1,1110 +0,0 @@
-<!--
-    Copyright (c) 2009 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
- -->
-<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 fd764f3..0000000
--- a/org.eclipse.mylyn.monitor.tests/testdata/monitor-log.xml
+++ /dev/null
@@ -1,14486 +0,0 @@
-<!--
-    Copyright (c) 2009 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
- -->
-<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 8d68e73..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) 2010 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 5e7f2bd..0000000
--- a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
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 23ccb46..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.4.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 a28fbfc..0000000
--- a/org.eclipse.mylyn.monitor.ui/build-user.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
-    Copyright (c) 2009 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
- -->
-<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 bf1dca3..0000000
--- a/org.eclipse.mylyn.monitor.ui/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2009 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 bd81ffb..0000000
--- a/org.eclipse.mylyn.monitor.ui/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-#Properties file for org.eclipse.mylyn.monitor.ui
-Bundle-Vendor = Eclipse Mylyn
-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 963f4fb..0000000
--- a/org.eclipse.mylyn.monitor.ui/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?><!--
-    Copyright (c) 2009 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
- -->
-
-<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 c0371f3..0000000
--- a/org.eclipse.mylyn.monitor.ui/schema/user.exsd
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.monitor.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<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">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <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>
-         2.0
-      </documentation>
-   </annotation>
-
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2009 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
-      </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 714c30f..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityContextManager.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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.Date;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-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.osgi.util.NLS;
-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 volatile String lastInteractionOrigin;
-
-	private IWorkingSet[] workingSets;
-
-	private final List<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(List<AbstractUserActivityMonitor> monitors) {
-		this.activityMonitors = new CopyOnWriteArrayList<AbstractUserActivityMonitor>(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.getLastInteractionTime();
-			}
-
-			public void active() {
-				ActivityContextManager.this.fireActive();
-			}
-		});
-		checkJob.setSystem(true);
-		checkJob.setPriority(Job.INTERACTIVE);
-	}
-
-	void init(List<AbstractUserActivityMonitor> monitors) {
-		this.activityMonitors.addAll(monitors);
-	}
-
-	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 (final AbstractUserActivityMonitor monitor : activityMonitors) {
-			SafeRunner.run(new ISafeRunnable() {
-				public void handleException(Throwable e) {
-					disableFailedMonitor(monitor, e);
-				}
-
-				public void run() throws Exception {
-					monitor.start();
-				}
-			});
-		}
-		updateWorkingSetSelection();
-		PlatformUI.getWorkbench().getWorkingSetManager().addPropertyChangeListener(WORKING_SET_CHANGE_LISTENER);
-		checkJob.reschedule();
-	}
-
-	public void stop() {
-		checkJob.cancel();
-		for (final AbstractUserActivityMonitor monitor : activityMonitors) {
-			SafeRunner.run(new ISafeRunnable() {
-				public void handleException(Throwable e) {
-					disableFailedMonitor(monitor, e);
-				}
-
-				public void run() throws Exception {
-					monitor.stop();
-				}
-			});
-		}
-		if (Platform.isRunning()) {
-			PlatformUI.getWorkbench().getWorkingSetManager().removePropertyChangeListener(WORKING_SET_CHANGE_LISTENER);
-		}
-	}
-
-	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 = lastInteractionOrigin;
-			if (origin == null) {
-				origin = InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH;
-			}
-
-			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();
-		}
-	}
-
-	public long getLastInteractionTime() {
-		for (final AbstractUserActivityMonitor monitor : activityMonitors) {
-			final boolean[] success = new boolean[1];
-			final long[] result = new long[1];
-			SafeRunner.run(new ISafeRunnable() {
-				public void handleException(Throwable e) {
-					disableFailedMonitor(monitor, e);
-				}
-
-				public void run() throws Exception {
-					if (monitor.isEnabled()) {
-						result[0] = monitor.getLastInteractionTime();
-						lastInteractionOrigin = monitor.getOriginId();
-						success[0] = true;
-					}
-				}
-			});
-			if (success[0]) {
-				return result[0];
-			}
-		}
-		return -1;
-	}
-
-	private void disableFailedMonitor(AbstractUserActivityMonitor monitor, Throwable e) {
-		StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, NLS.bind(
-				"Activity monitor ''{0}'' was disabled due to a failure", monitor.getClass()), e)); //$NON-NLS-1$
-		activityMonitors.remove(monitor);
-	}
-
-	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/CheckActivityJob.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/CheckActivityJob.java
deleted file mode 100644
index 8b892a5..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/CheckActivityJob.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * 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() && !PlatformUI.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 a599d9a..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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.StatusHandler;
-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.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 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 ACTIVITY_TRACKING_ENABLED = "org.eclipse.mylyn.monitor.activity.tracking.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(ACTIVITY_TRACKING_ENABLED)) {
-				setActivityTrackingEnabled(getPreferenceStore().getBoolean(ACTIVITY_TRACKING_ENABLED));
-			}
-		}
-	};
-
-	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;
-			}
-		}
-	};
-
-	private boolean activityTrackingEnabled;
-
-	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);
-		getPreferenceStore().setDefault(ACTIVITY_TRACKING_ENABLED, false);
-
-		this.activityContextManager = new ActivityContextManager(new ArrayList<AbstractUserActivityMonitor>(0));
-
-		// 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 (activityContextManager != null) {
-				activityContextManager.stop();
-			}
-			if (Platform.isRunning()) {
-				getPreferenceStore().removePropertyChangeListener(PROPERTY_LISTENER);
-				if (getWorkbench() != null && !getWorkbench().isClosing()) {
-					getWorkbench().removeWindowListener(WINDOW_LISTENER);
-
-					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 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) {
-						// TODO set id for monitor to identify instance
-						monitors.add(0, (AbstractUserActivityMonitor) activityTimer);
-					}
-				}
-			} catch (Throwable e) {
-				StatusHandler.log(new Status(IStatus.ERROR, MonitorUiPlugin.ID_PLUGIN, "Could not load activity timer", //$NON-NLS-1$
-						e));
-			}
-		}
-	}
-
-	public ActivityContextManager 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);
-
-			IWorkbenchWindow[] windows = getWorkbench().getWorkbenchWindows();
-			if (windows.length > 0) {
-				launchingWorkbenchWindow = windows[0];
-			}
-			for (IWorkbenchWindow window : windows) {
-				addListenersToWindow(window);
-			}
-
-			// disabled, there is currently no need for this event
-//			String productId = InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH;
-//			if (Platform.getProduct() != null) {
-//				productId = Platform.getProduct().getId();
-//			}
-//			ContextCorePlugin.getContextManager().processActivityMetaContextEvent(
-//					new InteractionEvent(InteractionEvent.Kind.ATTENTION,
-//							InteractionContextManager.ACTIVITY_STRUCTUREKIND_LIFECYCLE, productId,
-//							InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH, null,
-//							InteractionContextManager.ACTIVITY_DELTA_STARTED, 1f));
-
-			monitors.add(new WorkbenchUserActivityMonitor());
-			new MonitorUiExtensionPointReader().initExtensions();
-
-			activityContextManager.init(monitors);
-
-			updateActivityTimout();
-
-			activityContextManager.start();
-			setActivityTrackingEnabled(getPreferenceStore().getBoolean(ACTIVITY_TRACKING_ENABLED));
-
-			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);
-		}
-	}
-
-	public void setActivityTrackingEnabled(boolean b) {
-		this.activityTrackingEnabled = b;
-	}
-
-	public boolean isActivityTrackingEnabled() {
-		return activityTrackingEnabled;
-	}
-
-	/**
-	 * Returns true, if other activity monitors than {@link WorkbenchUserActivityMonitor} have been registered.
-	 */
-	public boolean isTrackingOsTime() {
-		return monitors.size() > 1;
-	}
-
-}
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 9e87e6d..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, 2010 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.util.IPropertyChangeListener;
-import org.eclipse.jface.util.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/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 e445bdf..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/WorkbenchUserActivityMonitor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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;
-
-	public WorkbenchUserActivityMonitor() {
-	}
-
-	@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 0bd9fb7..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 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
-###############################################################################
-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 4ef8fdc..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractUserInteractionMonitor.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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 850b115..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IActivityContextManager.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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 1a8f115..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/MonitorUi.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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();
-	}
-
-	/**
-	 * This call returns the first workbench window that when Monitor UI was started. It is not guaranteed that this
-	 * window still exists.
-	 * 
-	 * @deprecated
-	 */
-	@Deprecated
-	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/.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 5ac8d1b..0000000
--- a/org.eclipse.mylyn/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<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>
-	</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 8d68e73..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) 2010 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 5e7f2bd..0000000
--- a/org.eclipse.mylyn/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
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 64d8e42..0000000
--- a/org.eclipse.mylyn/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn;singleton:=true
-Bundle-Version: 3.4.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-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 fe2d760..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, 2010 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 dc13acd..0000000
--- a/org.eclipse.mylyn/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 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
-###############################################################################
-#Properties file for org.eclipse.mylyn
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn