This commit was manufactured by cvs2svn to create branch 'cdt_6_0'.

Sprout from master 2009-06-16 21:37:21 UTC vkong 'fix legal, provider info'
Delete:
    org.eclipse.mylyn.bugzilla.ide/.classpath
    org.eclipse.mylyn.bugzilla.ide/.cvsignore
    org.eclipse.mylyn.bugzilla.ide/.project
    org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.bugzilla.ide/META-INF/MANIFEST.MF
    org.eclipse.mylyn.bugzilla.ide/about.html
    org.eclipse.mylyn.bugzilla.ide/build.properties
    org.eclipse.mylyn.bugzilla.ide/icons/branding32/eclipse.png
    org.eclipse.mylyn.bugzilla.ide/plugin.properties
    org.eclipse.mylyn.bugzilla.ide/plugin.xml
    org.eclipse.mylyn.context-feature/.project
    org.eclipse.mylyn.context-feature/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.context-feature/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.context-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.context-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.context-feature/about.html
    org.eclipse.mylyn.context-feature/build.properties
    org.eclipse.mylyn.context-feature/epl-v10.html
    org.eclipse.mylyn.context-feature/feature.properties
    org.eclipse.mylyn.context-feature/feature.xml
    org.eclipse.mylyn.context-feature/license.html
    org.eclipse.mylyn.context.core/.classpath
    org.eclipse.mylyn.context.core/.cvsignore
    org.eclipse.mylyn.context.core/.project
    org.eclipse.mylyn.context.core/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.context.core/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.context.core/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.context.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.context.core/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.context.core/META-INF/MANIFEST.MF
    org.eclipse.mylyn.context.core/about.html
    org.eclipse.mylyn.context.core/build-user.xml
    org.eclipse.mylyn.context.core/build.properties
    org.eclipse.mylyn.context.core/plugin.properties
    org.eclipse.mylyn.context.core/plugin.xml
    org.eclipse.mylyn.context.core/schema/bridges.exsd
    org.eclipse.mylyn.context.core/schema/internalBridges.exsd
    org.eclipse.mylyn.context.core/schema/relationProviders.exsd
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/AbstractContextListener.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/AbstractContextStructureBridge.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/ContextChangeEvent.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/ContextCore.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IContextStore.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IDegreeOfInterest.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IImplicitlyIntersting.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContext.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContextManager.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContextScaling.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionElement.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionObject.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionRelation.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/InterestComparator.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/AbstractRelationProvider.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/AggregateInteractionEvent.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeContextElement.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeDegreeOfInterest.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeInteractionContext.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/ContextCorePlugin.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/DegreeOfInterest.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/DegreeOfSeparation.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IActiveSearchListener.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IActiveSearchOperation.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IContextStoreListener.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IDegreeOfSeparation.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IInteractionContextReader.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IInteractionContextWriter.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IRelationsListener.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContext.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextElement.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextExternalizer.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextManager.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextRelation.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextScaling.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/LegacyActivityAdaptor.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/LocalContextStore.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextContentHandler.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextReader.java
    org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextWriter.java
    org.eclipse.mylyn.context.tests/.classpath
    org.eclipse.mylyn.context.tests/.cvsignore
    org.eclipse.mylyn.context.tests/.project
    org.eclipse.mylyn.context.tests/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.context.tests/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.context.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.context.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.context.tests/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF
    org.eclipse.mylyn.context.tests/about.html
    org.eclipse.mylyn.context.tests/build.properties
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/AbstractContextTest.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/AllContextTests.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextExternalizerTest.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextTest.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextTestsPlugin.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/DegreeOfInterestTest.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionContextListeningTest.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionContextTest.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionEventTest.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ScalingFactorsTest.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ShadowsBridgeTest.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/UiTestUtil.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/DomContextReader.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/DomContextWriter.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/FileTool.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/ResourceHelper.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/TestMonitor.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/TestUtil.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/search/ISearchPluginTest.java
    org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/search/TestActiveSearchListener.java
    org.eclipse.mylyn.context.tests/testdata/externalizer/testcontext.xml.zip
    org.eclipse.mylyn.context.tests/testdata/projects/project1.zip
    org.eclipse.mylyn.context.tests/testdata/projects/project2.zip
    org.eclipse.mylyn.context.ui/.classpath
    org.eclipse.mylyn.context.ui/.cvsignore
    org.eclipse.mylyn.context.ui/.project
    org.eclipse.mylyn.context.ui/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.context.ui/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.context.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.context.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.context.ui/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.context.ui/META-INF/MANIFEST.MF
    org.eclipse.mylyn.context.ui/about.html
    org.eclipse.mylyn.context.ui/build-user.xml
    org.eclipse.mylyn.context.ui/build.properties
    org.eclipse.mylyn.context.ui/icons/elcl16/blank.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/bug-refresh.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/bug.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/capture-pause.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/capture-resume.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/color-palette.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/context-clear.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/context-transfer.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/delete.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/edge-inheritance.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/edge-read.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/edge-reference.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/edge-write.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/file-xml.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/file_obj.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/fldr_obj.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/focus-disabled.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/focus.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/import-zip.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/interest-decrease.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/interest-folding.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/interest-increase.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/interest-landmark.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/interest-working-set.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/link-with-editor.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/mylyn-overlay.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/refresh.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/remove.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/stop_all-color.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/stop_all.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/synched.gif
    org.eclipse.mylyn.context.ui/icons/elcl16/web-document.gif
    org.eclipse.mylyn.context.ui/icons/etool16/content-assist-separator.gif
    org.eclipse.mylyn.context.ui/icons/etool16/context-attach.gif
    org.eclipse.mylyn.context.ui/icons/etool16/context-retrieve.gif
    org.eclipse.mylyn.context.ui/icons/etool16/qualify-names.gif
    org.eclipse.mylyn.context.ui/icons/etool16/wizard-feedback.gif
    org.eclipse.mylyn.context.ui/icons/etool16/wizard-study.gif
    org.eclipse.mylyn.context.ui/icons/eview16/active-search.gif
    org.eclipse.mylyn.context.ui/icons/eview16/focus-disabled.gif
    org.eclipse.mylyn.context.ui/icons/eview16/focus-tasklist.gif
    org.eclipse.mylyn.context.ui/icons/eview16/focus.gif
    org.eclipse.mylyn.context.ui/icons/eview16/overlay-mylyn.gif
    org.eclipse.mylyn.context.ui/icons/wizban/banner-prefs.gif
    org.eclipse.mylyn.context.ui/plugin.properties
    org.eclipse.mylyn.context.ui/plugin.xml
    org.eclipse.mylyn.context.ui/schema/bridges.exsd
    org.eclipse.mylyn.context.ui/schema/startup.exsd
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractAutoFocusViewAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractContextUiBridge.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractFocusViewAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/ContextUi.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/IContextAwareEditor.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/IContextUiStartup.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/InterestFilter.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/InterestSorter.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/AbstractContextLabelProvider.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ActiveViewSelectionDragAdapter.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/BrowseFilteredListener.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ColorMap.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContentOutlineManager.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextEditorManager.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextPerspectiveManager.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextUiImages.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextUiPlugin.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextWorkingSetManager.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/DoiOrderSorter.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/FocusedViewerManager.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/HighlighterImageDescriptor.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/IContextUiPreferenceContstants.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/InterestDecorator.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/InterestDecoratorLightweight.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/Messages.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskContextWorkingSetPage.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskStructureBridge.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskUiBridge.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/UiUtil.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/AbstractInterestManipulationAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextActiveActionFilter.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextAttachAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextClearAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextCopyAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextRetrieveAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/FocusOutlineAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/FocusTaskListAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/InterestDecrementAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/InterestIncrementAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/Messages.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/OpenPrefsAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/OpenQuickContextPopupDialogAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/TaskContextAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ToggleDecorateInterestLevelAction.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/messages.properties
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/AbstractTaskAttachmentCommandHandler.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/AttachContextHandler.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/ClearContextHandler.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/CopyContextHandler.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/FocusViewHandler.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/Messages.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/RetrieveContextAttachmentHandler.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/RetrieveContextHandler.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/messages.properties
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ContextEditorFormPage.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ContextPageFactory.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/InvisibleContextElementsPart.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/Messages.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ScalableInterestFilter.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/messages.properties
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/messages.properties
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/ContextUiPreferencePage.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/Messages.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/messages.properties
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/ContextNodeOpenListener.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/Messages.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/QuickContextPopupDialog.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/QuickOutlinePatternAndInterestFilter.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/messages.properties
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextAttachWizard.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextAttachWizardPage.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextRetrieveWizard.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextRetrieveWizardPage.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/Messages.java
    org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/messages.properties
    org.eclipse.mylyn.ide-feature/.project
    org.eclipse.mylyn.ide-feature/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.ide-feature/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.ide-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.ide-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.ide-feature/about.html
    org.eclipse.mylyn.ide-feature/build.properties
    org.eclipse.mylyn.ide-feature/epl-v10.html
    org.eclipse.mylyn.ide-feature/feature.properties
    org.eclipse.mylyn.ide-feature/feature.xml
    org.eclipse.mylyn.ide-feature/license.html
    org.eclipse.mylyn.ide.ant/.classpath
    org.eclipse.mylyn.ide.ant/.cvsignore
    org.eclipse.mylyn.ide.ant/.project
    org.eclipse.mylyn.ide.ant/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.ide.ant/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.ide.ant/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.ide.ant/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.ide.ant/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.ide.ant/META-INF/MANIFEST.MF
    org.eclipse.mylyn.ide.ant/about.html
    org.eclipse.mylyn.ide.ant/build.properties
    org.eclipse.mylyn.ide.ant/icons/elcl16/edge-ref-xml.gif
    org.eclipse.mylyn.ide.ant/icons/elcl16/file-xml.gif
    org.eclipse.mylyn.ide.ant/icons/elcl16/focus-disabled.gif
    org.eclipse.mylyn.ide.ant/icons/elcl16/focus.gif
    org.eclipse.mylyn.ide.ant/icons/elcl16/interest-decrease.gif
    org.eclipse.mylyn.ide.ant/icons/elcl16/interest-increase.gif
    org.eclipse.mylyn.ide.ant/plugin.properties
    org.eclipse.mylyn.ide.ant/plugin.xml
    org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntContextLabelProvider.java
    org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntEditingMonitor.java
    org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntStructureBridge.java
    org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntUiBridge.java
    org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntUiBridgePlugin.java
    org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/Messages.java
    org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/messages.properties
    org.eclipse.mylyn.ide.tests/.classpath
    org.eclipse.mylyn.ide.tests/.cvsignore
    org.eclipse.mylyn.ide.tests/.project
    org.eclipse.mylyn.ide.tests/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.ide.tests/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.ide.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.ide.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.ide.tests/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.ide.tests/META-INF/MANIFEST.MF
    org.eclipse.mylyn.ide.tests/about.html
    org.eclipse.mylyn.ide.tests/build.properties
    org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/AllIdeTests.java
    org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/IdePreferencesTest.java
    org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/IdeStartupTest.java
    org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/OpenCorrespondingTaskActionTest.java
    org.eclipse.mylyn.ide.ui/.classpath
    org.eclipse.mylyn.ide.ui/.cvsignore
    org.eclipse.mylyn.ide.ui/.project
    org.eclipse.mylyn.ide.ui/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.ide.ui/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.ide.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.ide.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.ide.ui/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
    org.eclipse.mylyn.ide.ui/about.html
    org.eclipse.mylyn.ide.ui/build-user.xml
    org.eclipse.mylyn.ide.ui/build.properties
    org.eclipse.mylyn.ide.ui/doc/book.css
    org.eclipse.mylyn.ide.ui/doc/concepts.html
    org.eclipse.mylyn.ide.ui/doc/navigation.html
    org.eclipse.mylyn.ide.ui/doc/toc.xml
    org.eclipse.mylyn.ide.ui/icons/elcl16/edge-ref-xml.gif
    org.eclipse.mylyn.ide.ui/icons/elcl16/file-xml.gif
    org.eclipse.mylyn.ide.ui/icons/elcl16/focus-disabled.gif
    org.eclipse.mylyn.ide.ui/icons/elcl16/focus.gif
    org.eclipse.mylyn.ide.ui/icons/elcl16/interest-decrease.gif
    org.eclipse.mylyn.ide.ui/icons/elcl16/interest-increase.gif
    org.eclipse.mylyn.ide.ui/icons/elcl16/task-repository.gif
    org.eclipse.mylyn.ide.ui/icons/etool16/task-repository-new.gif
    org.eclipse.mylyn.ide.ui/plugin.properties
    org.eclipse.mylyn.ide.ui/plugin.xml
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractMarkerInterestFilter.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/IdeUiBridgePlugin.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/IdeUiUtil.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerInterestFilter.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewLabelProvider.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewerInterestSorter.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/XmlNodeHelper.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusAllMarkersViewAction.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusBookmarkMarkersViewAction.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProblemsListAction.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProjectExplorerAction.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusResourceNavigatorAction.java
    org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusTaskMarkersViewAction.java
    org.eclipse.mylyn.java-feature/.project
    org.eclipse.mylyn.java-feature/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.java-feature/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.java-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.java-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.java-feature/about.html
    org.eclipse.mylyn.java-feature/build.properties
    org.eclipse.mylyn.java-feature/epl-v10.html
    org.eclipse.mylyn.java-feature/feature.properties
    org.eclipse.mylyn.java-feature/feature.xml
    org.eclipse.mylyn.java-feature/license.html
    org.eclipse.mylyn.java.tasks/.classpath
    org.eclipse.mylyn.java.tasks/.cvsignore
    org.eclipse.mylyn.java.tasks/.project
    org.eclipse.mylyn.java.tasks/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.java.tasks/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.java.tasks/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.java.tasks/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.java.tasks/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.java.tasks/META-INF/MANIFEST.MF
    org.eclipse.mylyn.java.tasks/about.html
    org.eclipse.mylyn.java.tasks/build.properties
    org.eclipse.mylyn.java.tasks/icons/etool16/task-new.gif
    org.eclipse.mylyn.java.tasks/plugin.properties
    org.eclipse.mylyn.java.tasks/plugin.xml
    org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/JavaStackTraceFileHyperlink.java
    org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/JavaStackTraceHyperlinkDetector.java
    org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/Messages.java
    org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/NewTaskFromJunitResultViewAction.java
    org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/messages.properties
    org.eclipse.mylyn.java.tests/.classpath
    org.eclipse.mylyn.java.tests/.cvsignore
    org.eclipse.mylyn.java.tests/.project
    org.eclipse.mylyn.java.tests/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.java.tests/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.java.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.java.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.java.tests/.settings/org.eclipse.pde.api.tools.prefs
    org.eclipse.mylyn.java.tests/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.java.tests/META-INF/MANIFEST.MF
    org.eclipse.mylyn.java.tests/about.html
    org.eclipse.mylyn.java.tests/build.properties
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/AbstractJavaContextTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/AllJavaTests.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ContentOutlineRefreshTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ContentSpecificContextTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/EditorManagerTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/FocusViewActionTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InteractionContextManagerTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InterestFilterTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InterestManipulationTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaEditingMonitorTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaStructureTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/PackageExplorerRefreshTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ProblemsListTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/RefactoringTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ResourceStructureMappingTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TestJavaProject.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TestProject.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TypeHistoryManagerTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/ActiveSearchNotifier.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JUnitReferencesSearchPluginTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaImplementorsSearchPluginTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaReadAccessSearchPluginTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaReferencesSearchTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaWriteAccessSearchPluginTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/SearchPluginTestHelper.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/WorkspaceSetupHelper.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/ResultUpdaterTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlResultUpdaterSearchListener.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlSearchPluginTest.java
    org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlTestActiveSearchListener.java
    org.eclipse.mylyn.java.ui/.classpath
    org.eclipse.mylyn.java.ui/.cvsignore
    org.eclipse.mylyn.java.ui/.project
    org.eclipse.mylyn.java.ui/.settings/.api_filters
    org.eclipse.mylyn.java.ui/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.java.ui/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.java.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.java.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.java.ui/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.java.ui/META-INF/MANIFEST.MF
    org.eclipse.mylyn.java.ui/about.html
    org.eclipse.mylyn.java.ui/build-user.xml
    org.eclipse.mylyn.java.ui/build.properties
    org.eclipse.mylyn.java.ui/doc/active-views.html
    org.eclipse.mylyn.java.ui/doc/book.css
    org.eclipse.mylyn.java.ui/doc/editing.html
    org.eclipse.mylyn.java.ui/doc/images/active-hierarchy.gif
    org.eclipse.mylyn.java.ui/doc/images/active-search.gif
    org.eclipse.mylyn.java.ui/doc/images/interest-error.gif
    org.eclipse.mylyn.java.ui/doc/java.html
    org.eclipse.mylyn.java.ui/doc/navigation.html
    org.eclipse.mylyn.java.ui/doc/toc.xml
    org.eclipse.mylyn.java.ui/icons/elcl16/edge-ref-java.gif
    org.eclipse.mylyn.java.ui/icons/elcl16/edge-ref-junit.gif
    org.eclipse.mylyn.java.ui/icons/elcl16/focus-browsing.gif
    org.eclipse.mylyn.java.ui/icons/elcl16/focus-disabled.gif
    org.eclipse.mylyn.java.ui/icons/elcl16/focus.gif
    org.eclipse.mylyn.java.ui/icons/elcl16/interest-decrease.gif
    org.eclipse.mylyn.java.ui/icons/elcl16/interest-folding.gif
    org.eclipse.mylyn.java.ui/icons/elcl16/interest-increase.gif
    org.eclipse.mylyn.java.ui/icons/elcl16/mylyn-overlay.gif
    org.eclipse.mylyn.java.ui/icons/elcl16/proposals-other.gif
    org.eclipse.mylyn.java.ui/icons/elcl16/proposals-type.gif
    org.eclipse.mylyn.java.ui/icons/elcl16/templateprop_co.gif
    org.eclipse.mylyn.java.ui/icons/etool16/browse-filtered.gif
    org.eclipse.mylyn.java.ui/icons/etool16/junit-tab.gif
    org.eclipse.mylyn.java.ui/icons/etool16/launch-junit-pde.gif
    org.eclipse.mylyn.java.ui/icons/etool16/launch-junit.gif
    org.eclipse.mylyn.java.ui/icons/etool16/link-with-editor.gif
    org.eclipse.mylyn.java.ui/icons/etool16/no-scroll.gif
    org.eclipse.mylyn.java.ui/icons/etool16/wizard-prefs.gif
    org.eclipse.mylyn.java.ui/icons/eview16/active-hierarchy.gif
    org.eclipse.mylyn.java.ui/icons/wizban/banner-prefs.gif
    org.eclipse.mylyn.java.ui/plugin.properties
    org.eclipse.mylyn.java.ui/plugin.xml
    org.eclipse.mylyn.java.ui/schema/javaEditorContributor.exsd
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/ActiveFoldingEditorTracker.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/BreakpointsInterestFilter.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/InterestUpdateDeltaListener.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaDebugStructureBridge.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaDeclarationsFilter.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaEditingMonitor.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaStructureBridge.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiBridge.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiBridgePlugin.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiUtil.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/LandmarkMarkerManager.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/TypeHistoryManager.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FilterMembersAction.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBreakpointsViewAction.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBrowsingPerspectiveAction.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusDebugViewAction.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusPackageExplorerAction.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/Messages.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/ShowFilteredChildrenAction.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/ToggleActiveFoldingAction.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/messages.properties
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/AbstractEditorHyperlinkDetector.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/ActiveFoldingListener.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/AutoFoldPreferenceBlock.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaAllProposalComputer.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaNoTypeProposalComputer.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaProposalProcessor.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaSourceViewerConfiguration.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaTypeProposalComputer.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/Messages.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/messages.properties
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/InteractionContextTestUtil.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/Messages.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitLaunchConfiguration.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitMainTab.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitTabGroup.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/messages.properties
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/AbstractJavaRelationProvider.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JUnitReferencesProvider.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaActiveSearchResultUpdater.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaImplementorsProvider.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaReadAccessProvider.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaReferencesProvider.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaWriteAccessProvider.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/Messages.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/XmlActiveSearchUpdater.java
    org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/messages.properties
    org.eclipse.mylyn.pde-feature/.project
    org.eclipse.mylyn.pde-feature/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.pde-feature/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.pde-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.pde-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.pde-feature/about.html
    org.eclipse.mylyn.pde-feature/build.properties
    org.eclipse.mylyn.pde-feature/epl-v10.html
    org.eclipse.mylyn.pde-feature/feature.properties
    org.eclipse.mylyn.pde-feature/feature.xml
    org.eclipse.mylyn.pde-feature/license.html
    org.eclipse.mylyn.pde.ui/.classpath
    org.eclipse.mylyn.pde.ui/.cvsignore
    org.eclipse.mylyn.pde.ui/.project
    org.eclipse.mylyn.pde.ui/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.pde.ui/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.pde.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.pde.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.pde.ui/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
    org.eclipse.mylyn.pde.ui/about.html
    org.eclipse.mylyn.pde.ui/build.properties
    org.eclipse.mylyn.pde.ui/icons/elcl16/edge-ref-xml.gif
    org.eclipse.mylyn.pde.ui/icons/elcl16/file-xml.gif
    org.eclipse.mylyn.pde.ui/icons/elcl16/focus-disabled.gif
    org.eclipse.mylyn.pde.ui/icons/elcl16/focus.gif
    org.eclipse.mylyn.pde.ui/icons/elcl16/interest-decrease.gif
    org.eclipse.mylyn.pde.ui/icons/elcl16/interest-increase.gif
    org.eclipse.mylyn.pde.ui/plugin.properties
    org.eclipse.mylyn.pde.ui/plugin.xml
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/FocusedApiToolsJavadocCompletionProposalComputer.java
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/Messages.java
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeContextLabelProvider.java
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeStructureBridge.java
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeUiBridge.java
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeUiBridgePlugin.java
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/XmlJavaRelationProvider.java
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/Messages.java
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitLaunchConfiguration.java
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitTabGroup.java
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/messages.properties
    org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/messages.properties
    org.eclipse.mylyn.resources.tests/.classpath
    org.eclipse.mylyn.resources.tests/.cvsignore
    org.eclipse.mylyn.resources.tests/.project
    org.eclipse.mylyn.resources.tests/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.resources.tests/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.resources.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.resources.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.resources.tests/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.resources.tests/META-INF/MANIFEST.MF
    org.eclipse.mylyn.resources.tests/about.html
    org.eclipse.mylyn.resources.tests/build.properties
    org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/AbstractResourceContextTest.java
    org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/AllResourcesTests.java
    org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceChangeMonitorTest.java
    org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceContextTest.java
    org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceTestUtil.java
    org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/TestProject.java
    org.eclipse.mylyn.resources.ui/.classpath
    org.eclipse.mylyn.resources.ui/.cvsignore
    org.eclipse.mylyn.resources.ui/.project
    org.eclipse.mylyn.resources.ui/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.resources.ui/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.resources.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.resources.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.resources.ui/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
    org.eclipse.mylyn.resources.ui/about.html
    org.eclipse.mylyn.resources.ui/build-user.xml
    org.eclipse.mylyn.resources.ui/build.properties
    org.eclipse.mylyn.resources.ui/doc/ant.html
    org.eclipse.mylyn.resources.ui/doc/book.css
    org.eclipse.mylyn.resources.ui/doc/pde.html
    org.eclipse.mylyn.resources.ui/doc/toc.xml
    org.eclipse.mylyn.resources.ui/doc/xml.html
    org.eclipse.mylyn.resources.ui/icons/elcl16/edge-ref-xml.gif
    org.eclipse.mylyn.resources.ui/icons/elcl16/focus-disabled.gif
    org.eclipse.mylyn.resources.ui/icons/elcl16/focus.gif
    org.eclipse.mylyn.resources.ui/icons/elcl16/interest-decrease.gif
    org.eclipse.mylyn.resources.ui/icons/elcl16/interest-increase.gif
    org.eclipse.mylyn.resources.ui/plugin.properties
    org.eclipse.mylyn.resources.ui/plugin.xml
    org.eclipse.mylyn.resources.ui/schema/changeMonitoring.exsd
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/EditorInteractionMonitor.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/Messages.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceChangeMonitor.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceContextLabelProvider.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceInteractionMonitor.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceInterestUpdater.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceStructureBridge.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceUiBridge.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiBridgePlugin.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiExtensionPointReader.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiPreferenceInitializer.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/messages.properties
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/FocusedResourcesPreferencePage.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/Messages.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/messages.properties
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/resources/ui/FocusCommonNavigatorAction.java
    org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/resources/ui/ResourcesUi.java
    org.eclipse.mylyn.team-feature/.project
    org.eclipse.mylyn.team-feature/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.team-feature/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.team-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.team-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.team-feature/about.html
    org.eclipse.mylyn.team-feature/build.properties
    org.eclipse.mylyn.team-feature/epl-v10.html
    org.eclipse.mylyn.team-feature/feature.properties
    org.eclipse.mylyn.team-feature/feature.xml
    org.eclipse.mylyn.team-feature/license.html
    org.eclipse.mylyn.team.cvs/.classpath
    org.eclipse.mylyn.team.cvs/.project
    org.eclipse.mylyn.team.cvs/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.team.cvs/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.team.cvs/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.team.cvs/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.team.cvs/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF
    org.eclipse.mylyn.team.cvs/about.html
    org.eclipse.mylyn.team.cvs/build.properties
    org.eclipse.mylyn.team.cvs/plugin.properties
    org.eclipse.mylyn.team.cvs/plugin.xml
    org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CommitContextWizard.java
    org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsActiveChangeSetProvider.java
    org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsChangeSetAdapterFactory.java
    org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsChangeSetResourceMappingAdapterFactory.java
    org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsCommitWorkflowProvider.java
    org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsContextChangeSet.java
    org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsLinkedTaskInfoAdapterFactory.java
    org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/Messages.java
    org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/messages.properties
    org.eclipse.mylyn.team.tests/.classpath
    org.eclipse.mylyn.team.tests/.project
    org.eclipse.mylyn.team.tests/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.team.tests/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.team.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.team.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.team.tests/.settings/org.eclipse.pde.api.tools.prefs
    org.eclipse.mylyn.team.tests/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.team.tests/META-INF/MANIFEST.MF
    org.eclipse.mylyn.team.tests/about.html
    org.eclipse.mylyn.team.tests/build.properties
    org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/AllTeamTests.java
    org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/ChangeSetManagerTest.java
    org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/CommitTemplateTest.java
    org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/TeamPropertiesLinkProviderTest.java
    org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/TestSyncViewRefresh.java
    org.eclipse.mylyn.team.ui/.classpath
    org.eclipse.mylyn.team.ui/.cvsignore
    org.eclipse.mylyn.team.ui/.project
    org.eclipse.mylyn.team.ui/.settings/.api_filters
    org.eclipse.mylyn.team.ui/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.team.ui/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.team.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.team.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.team.ui/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.team.ui/META-INF/MANIFEST.MF
    org.eclipse.mylyn.team.ui/about.html
    org.eclipse.mylyn.team.ui/build.properties
    org.eclipse.mylyn.team.ui/icons/elcl16/apply-patch.gif
    org.eclipse.mylyn.team.ui/icons/elcl16/context-add.gif
    org.eclipse.mylyn.team.ui/icons/elcl16/context-commit.gif
    org.eclipse.mylyn.team.ui/icons/elcl16/interest-increase.gif
    org.eclipse.mylyn.team.ui/icons/elcl16/task-repository.gif
    org.eclipse.mylyn.team.ui/plugin.properties
    org.eclipse.mylyn.team.ui/plugin.xml
    org.eclipse.mylyn.team.ui/schema/changeSets.exsd
    org.eclipse.mylyn.team.ui/schema/commitTemplates.exsd
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/AbstractCommitWorkflowProvider.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextActiveChangeSetManager.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextChangeSet.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextChangeSetDecorator.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamExtensionPointReader.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamUiPlugin.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/LinkedTaskInfo.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/LinkedTaskInfoAdapterFactory.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/Messages.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/AddToTaskContextAction.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/ApplyPatchAction.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/CommitContextAction.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/Messages.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/OpenCorrespondingTaskAction.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/TaskResourceMappingActionProvider.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/messages.properties
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/messages.properties
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/FocusedTeamPreferencePage.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/Messages.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/messages.properties
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/Messages.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/ProjectTeamPage.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/TeamPropertiesLinkProvider.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/messages.properties
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateVariables.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/Messages.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/TemplateHandlerContentProposalProvider.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/messages.properties
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractActiveChangeSetProvider.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractCommitTemplateVariable.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractContextChangeSetManager.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractTaskReference.java
    org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/IContextChangeSet.java
diff --git a/org.eclipse.mylyn.bugzilla.ide/.classpath b/org.eclipse.mylyn.bugzilla.ide/.classpath
deleted file mode 100644
index c66ff04..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/.classpath
+++ /dev/null
@@ -1,14 +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/views/log/*"/>
-		</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.bugzilla.ide/.cvsignore b/org.eclipse.mylyn.bugzilla.ide/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.bugzilla.ide/.project b/org.eclipse.mylyn.bugzilla.ide/.project
deleted file mode 100644
index a46e60e..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.bugzilla.ide</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.bugzilla.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/.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.bugzilla.ide/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/.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.bugzilla.ide/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.bugzilla.ide/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/.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.bugzilla.ide/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.ide/META-INF/MANIFEST.MF
deleted file mode 100644
index ed2b5eb..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.bugzilla.ide;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Require-Bundle: org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.mylyn.bugzilla.ide/about.html b/org.eclipse.mylyn.bugzilla.ide/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/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.bugzilla.ide/build.properties b/org.eclipse.mylyn.bugzilla.ide/build.properties
deleted file mode 100644
index 0e0c4f7..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/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/,\
-               plugin.xml,\
-               about.html,\
-               .,\
-               plugin.properties,\
-               build.properties,\
-               icons/
-src.includes = about.html
-jre.compilation.profile = J2SE-1.5
diff --git a/org.eclipse.mylyn.bugzilla.ide/icons/branding32/eclipse.png b/org.eclipse.mylyn.bugzilla.ide/icons/branding32/eclipse.png
deleted file mode 100644
index 568fac1..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/icons/branding32/eclipse.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.bugzilla.ide/plugin.properties b/org.eclipse.mylyn.bugzilla.ide/plugin.properties
deleted file mode 100644
index 6620798..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/plugin.properties
+++ /dev/null
@@ -1,10 +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
-###############################################################################
-
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn Bugzilla IDE Extensions
diff --git a/org.eclipse.mylyn.bugzilla.ide/plugin.xml b/org.eclipse.mylyn.bugzilla.ide/plugin.xml
deleted file mode 100644
index 59d3915..0000000
--- a/org.eclipse.mylyn.bugzilla.ide/plugin.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-	<extension point="org.eclipse.mylyn.tasks.core.templates">
-		<repository addAutomatically="true" characterEncoding="ISO-8859-1"
-			label="Eclipse.org" repositoryKind="bugzilla" urlRepository="https://bugs.eclipse.org/bugs"
-			version="3.0" />
-	</extension>
-	<extension point="org.eclipse.mylyn.tasks.bugs.support">
-    <category
-          description="Commercial support"
-          id="org.eclipse.mylyn.tasks.bugs.commercial"
-          name="Commercial Support"
-          weight="500">
-    </category>
-		<category description="Community supported open source projects"
-			id="org.eclipse.mylyn.tasks.bugs.openSource" name="Open Source Community"
-			weight="900" />
-		<provider categoryId="org.eclipse.mylyn.tasks.bugs.openSource"
-			description="Eclipse open source community bug tracker" icon="icons/branding32/eclipse.png"
-			id="org.eclipse" name="Eclipse.org" url="http://eclipse.org/" />
-		<mapping namespace="org.eclipse">
-			<repository kind="bugzilla" url="https://bugs.eclipse.org/bugs">
-			</repository>
-		</mapping>
-		<product featureId="org.eclipse.mylyn_feature" id="org.eclipse.mylyn"
-			pluginId="org.eclipse.mylyn" providerId="org.eclipse" url="http://eclipse.org/mylyn/support/" />
-		<mapping namespace="org.eclipse.mylyn" productId="org.eclipse.mylyn">
-			<property name="product" value="Mylyn">
-			</property>
-		</mapping>
-		<mapping namespace="org.eclipse.mylyn.tasks" productId="org.eclipse.mylyn">
-			<property name="component" value="Tasks"/>
-		</mapping>
-		<mapping namespace="org.eclipse.mylyn.wikitext" productId="org.eclipse.mylyn">
-			<property name="component" value="WikiText"/>
-		</mapping>
-		<product featureId="org.eclipse.pde" id="org.eclipse.pde"
-			providerId="org.eclipse" />
-		<mapping namespace="org.eclipse.pde" productId="org.eclipse.pde">
-			<property name="product" value="PDE">
-			</property>
-		</mapping>
-		<product featureId="org.eclipse.platform" id="org.eclipse.platform"
-			providerId="org.eclipse" />
-		<mapping namespace="org.eclipse.platform" productId="org.eclipse.platform">
-			<property name="product" value="Platform">
-			</property>
-		</mapping>
-		<product featureId="org.eclipse.cvs" id="org.eclipse.cvs"
-			providerId="org.eclipse">
-		</product>
-		<mapping namespace="org.eclipse.team.cvs" productId="org.eclipse.cvs">
-			<property name="product" value="Platform">
-			</property>
-			<property name="component" value="CVS">
-			</property>
-		</mapping>
-		<product featureId="org.eclipse.jdt" id="org.eclipse.jdt"
-			providerId="org.eclipse" />
-		<mapping namespace="org.eclipse.jdt" productId="org.eclipse.jdt">
-			<property name="product" value="JDT">
-			</property>
-		</mapping>
-		<!--
-		<product id="org.eclipse.epp.package.java" providerId="org.eclipse" featureId="org.eclipse.epp.package.java.feature" />
-		<mapping namespace="org.eclipse.epp.package.java" productId="org.eclipse.epp.package.java">
-			<property name="product" value="EPP"/>
-			<property name="component" value="java-package"/>
-		</mapping>
-		<product id="org.eclipse.epp.usagedata" providerId="org.eclipse" featureId="org.eclipse.epp.usagedata.feature" />
-		<mapping namespace="org.eclipse.epp.package.java" productId="org.eclipse.epp.package.java">
-			<property name="product" value="EPP"/>
-			<property name="component" value="Usage Data Collector"/>
-		</mapping>
-		-->
-		<product id="org.eclipse.wst.xml_ui" providerId="org.eclipse" featureId="org.eclipse.wst.xml_ui.feature" />
-		<mapping namespace="org.eclipse.wst" productId="org.eclipse.wst.xml_ui">
-			<property name="product" value="Web Tools"/>
-			<property name="component" value="Web Standard Tools"/>
-		</mapping>
-	</extension>
-</plugin>
diff --git a/org.eclipse.mylyn.context-feature/.project b/org.eclipse.mylyn.context-feature/.project
deleted file mode 100644
index 229144d..0000000
--- a/org.eclipse.mylyn.context-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.context-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.context-feature/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.context-feature/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7b6172c..0000000
--- a/org.eclipse.mylyn.context-feature/.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.context-feature/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.context-feature/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.context-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) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.context-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.context-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 4c9ebcf..0000000
--- a/org.eclipse.mylyn.context-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:51 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.context-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.context-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 09d573c..0000000
--- a/org.eclipse.mylyn.context-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Dec 20 14:08:39 PST 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.context-feature/about.html b/org.eclipse.mylyn.context-feature/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.context-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.context-feature/build.properties b/org.eclipse.mylyn.context-feature/build.properties
deleted file mode 100644
index dcaa2fa..0000000
--- a/org.eclipse.mylyn.context-feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.properties,\
-               feature.xml,\
-               epl-v10.html,\
-               license.html,\
-               about.html
-src.includes = about.html
diff --git a/org.eclipse.mylyn.context-feature/epl-v10.html b/org.eclipse.mylyn.context-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.mylyn.context-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.context-feature/feature.properties b/org.eclipse.mylyn.context-feature/feature.properties
deleted file mode 100644
index 7f0a384..0000000
--- a/org.eclipse.mylyn.context-feature/feature.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-featureName=Mylyn Task-Focused Interface (Recommended)
-description=Provides the Mylyn Task-Focused Interface.
-providerName=Eclipse Mylyn
-copyright=Copyright (c) 2004, 2008 Tasktop Technologies and others. All rights reserved.
-updateSiteName=Mylyn for Eclipse 3.4
-license=\
-Eclipse Foundation Software User Agreement\n\
-\n\
-March 17, 2005\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). 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.\n\
-Applicable Licenses\n\
-\n\
-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 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS modules ("Modules") and made available as downloadable archives ("Downloads").\n\
-\n\
-    * Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
-    * Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java\u2122 ARchive) in a directory named "plugins".\n\
-    * 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 "features". Within a Feature, files named "feature.xml" may contain a list of the names and version 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 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 contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module 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 Eclipse Update Manager, you must agree to a license ("Feature Update License") 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 "license" property of files named "feature.properties" 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.\n\
-\n\
-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):\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\
-    * IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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 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.\n\
-Cryptography\n\
-\n\
-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&apos;s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
diff --git a/org.eclipse.mylyn.context-feature/feature.xml b/org.eclipse.mylyn.context-feature/feature.xml
deleted file mode 100644
index f8e260f..0000000
--- a/org.eclipse.mylyn.context-feature/feature.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.mylyn.context_feature"
-      label="%featureName"
-      version="3.2.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>
-
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.ui.navigator"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.mylyn.commons.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.context.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.monitor.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.monitor.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.tasks.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.tasks.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.compare"/>
-      <import feature="org.eclipse.mylyn_feature" version="3.2.0.qualifier" match="perfect"/>
-      <import plugin="org.eclipse.mylyn.context.ui" version="3.0.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.mylyn.context.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.resources.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.mylyn.context-feature/license.html b/org.eclipse.mylyn.context-feature/license.html
deleted file mode 100644
index 15a10cf..0000000
--- a/org.eclipse.mylyn.context-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">

-<title>Eclipse.org Software User Agreement</title>

-</head>

-

-<body lang="EN-US" link=blue vlink=purple>

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>March 17, 2005</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.org CVS repository (&quot;Repository&quot;) in CVS

-   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 Eclipse Update Manager, 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>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</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>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>

-   

-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   

-</body>

-</html>

diff --git a/org.eclipse.mylyn.context.core/.classpath b/org.eclipse.mylyn.context.core/.classpath
deleted file mode 100644
index 0d08413..0000000
--- a/org.eclipse.mylyn.context.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"/>
-	<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">
-		<accessrules>
-			<accessrule kind="nonaccessible" pattern="com/sun/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.context.core/.cvsignore b/org.eclipse.mylyn.context.core/.cvsignore
deleted file mode 100644
index 4a98758..0000000
--- a/org.eclipse.mylyn.context.core/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-.fbwarnings
diff --git a/org.eclipse.mylyn.context.core/.project b/org.eclipse.mylyn.context.core/.project
deleted file mode 100644
index df03d73..0000000
--- a/org.eclipse.mylyn.context.core/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.context.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.context.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.context.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.context.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.context.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.context.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.context.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.context.core/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.context.core/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.context.core/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.context.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.context.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.context.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.context.core/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.context.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.context.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.context.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.core/META-INF/MANIFEST.MF
deleted file mode 100644
index c6a1d4f..0000000
--- a/org.eclipse.mylyn.context.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.context.core;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Activator: org.eclipse.mylyn.internal.context.core.ContextCorePlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- 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.context.core,
- org.eclipse.mylyn.internal.context.core;x-friends:="org.eclipse.mylyn.context.ui"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .
diff --git a/org.eclipse.mylyn.context.core/about.html b/org.eclipse.mylyn.context.core/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.context.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.context.core/build-user.xml b/org.eclipse.mylyn.context.core/build-user.xml
deleted file mode 100644
index 6097713..0000000
--- a/org.eclipse.mylyn.context.core/build-user.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<target name="help">
-    <echo message="Please run: $ ant -v -projecthelp"/>
-</target>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.context.core/build.properties b/org.eclipse.mylyn.context.core/build.properties
deleted file mode 100644
index 9ba2c22..0000000
--- a/org.eclipse.mylyn.context.core/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 Tasktop Technologies and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-bin.includes = plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               META-INF/,\
-               .
-src.includes = about.html,\
-               schema/
-jre.compilation.profile = J2SE-1.5
-source.. = src/
diff --git a/org.eclipse.mylyn.context.core/plugin.properties b/org.eclipse.mylyn.context.core/plugin.properties
deleted file mode 100644
index 87ff943..0000000
--- a/org.eclipse.mylyn.context.core/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name = Mylyn Context Core
-Bundle-Vendor = Eclipse Mylyn
diff --git a/org.eclipse.mylyn.context.core/plugin.xml b/org.eclipse.mylyn.context.core/plugin.xml
deleted file mode 100644
index e09de97..0000000
--- a/org.eclipse.mylyn.context.core/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="bridges" name="bridges" schema="schema/bridges.exsd"/>
-   <extension-point id="internalBridges" name="Internal Bridges" schema="schema/internalBridges.exsd"/>
-   <extension-point id="relationProviders" name="relationProviders" schema="schema/relationProviders.exsd"/>
-</plugin>
diff --git a/org.eclipse.mylyn.context.core/schema/bridges.exsd b/org.eclipse.mylyn.context.core/schema/bridges.exsd
deleted file mode 100644
index a1aa230..0000000
--- a/org.eclipse.mylyn.context.core/schema/bridges.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.context.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.mylyn.context.core" id="bridges" name="bridges"/>
-      </appInfo>
-      <documentation>
-         Structure Bridges connect the interaction context model to domain-specific artifacts, such as the Java classes and methods being worked on by a programmer.  For more information please see: http://wiki.eclipse.org/index.php/Mylyn_Integrator_Reference#Context_API
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="structureBridge" 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="structureBridge">
-      <complexType>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.mylyn.context.core.AbstractContextStructureBridge"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="parentContentType" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-
-
-
-
-</schema>
diff --git a/org.eclipse.mylyn.context.core/schema/internalBridges.exsd b/org.eclipse.mylyn.context.core/schema/internalBridges.exsd
deleted file mode 100644
index 2ee4579..0000000
--- a/org.eclipse.mylyn.context.core/schema/internalBridges.exsd
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.context.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.mylyn.context.core" id="internalBridges" name="Internal Bridges"/>
-      </appInfo>
-      <documentation>
-         Bridges extension point for internal use only.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="shadow"/>
-         </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="shadow">
-      <annotation>
-         <documentation>
-            Signifies that one bridge shadows another.  The bridge specified in shadowedByContent (if it exists) will always be used instead of the bridge specified in baseContent.
-
-The values correspond to the &quot;name&quot; attribute of the bridge.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="baseContent" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The bridge to be hidden by shadowedByContent.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="shadowedByContent" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The bridge that hides baseContent.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         3.0
-      </documentation>
-   </annotation>
-
-
-
-
-
-</schema>
diff --git a/org.eclipse.mylyn.context.core/schema/relationProviders.exsd b/org.eclipse.mylyn.context.core/schema/relationProviders.exsd
deleted file mode 100644
index cab85fd..0000000
--- a/org.eclipse.mylyn.context.core/schema/relationProviders.exsd
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.context.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.mylyn.context.core" id="relationProviders" name="relationProviders"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element internal="true" />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="provider"/>
-         </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="provider">
-      <complexType>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.mylyn.context.core.AbstractRelationProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="contentType" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiinfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/AbstractContextListener.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/AbstractContextListener.java
deleted file mode 100644
index ef87af3..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/AbstractContextListener.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.core;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-
-/**
- * Override {@link #contextChanged(ContextChangeEvent)} to be notified of context change events.
- * 
- * @author Mik Kersten
- * @author Shawn Minto
- * @since 3.0
- */
-public abstract class AbstractContextListener {
-
-	/**
-	 * Invoked before the context is activated.
-	 * 
-	 * @since 3.0
-	 * @deprecated use {@link #contextChanged(ContextChangeEvent)} instead
-	 */
-	@Deprecated
-	public void contextPreActivated(IInteractionContext context) {
-	}
-
-	/**
-	 * Invoked after the context is activated.
-	 * 
-	 * @since 3.0
-	 * @deprecated use {@link #contextChanged(ContextChangeEvent)} instead
-	 */
-	@Deprecated
-	public void contextActivated(IInteractionContext context) {
-	}
-
-	/**
-	 * Invoked after the context is deactivated.
-	 * 
-	 * @since 3.0
-	 * @deprecated use {@link #contextChanged(ContextChangeEvent)} instead
-	 */
-	@Deprecated
-	public void contextDeactivated(IInteractionContext context) {
-	}
-
-	/**
-	 * The context has been cleared, typically done by the user.
-	 * 
-	 * @since 3.0
-	 * @deprecated use {@link #contextChanged(ContextChangeEvent)} instead
-	 */
-	@Deprecated
-	public void contextCleared(IInteractionContext context) {
-	}
-
-	/**
-	 * The interest level of one or more elements has changed. The last element in the list is the element invoking the
-	 * change.
-	 * 
-	 * @since 3.0
-	 * @deprecated use {@link #contextChanged(ContextChangeEvent)} instead
-	 */
-	@Deprecated
-	public void interestChanged(List<IInteractionElement> elements) {
-	}
-
-	/**
-	 * An element with landmark interest has been added to the context.
-	 * 
-	 * @since 3.0
-	 * @deprecated use {@link #contextChanged(ContextChangeEvent)} instead
-	 */
-	@Deprecated
-	public void landmarkAdded(IInteractionElement element) {
-	}
-
-	/**
-	 * An element with landmark interest has been removed from the task context.
-	 * 
-	 * @since 3.0
-	 * @deprecated use {@link #contextChanged(ContextChangeEvent)} instead
-	 */
-	@Deprecated
-	public void landmarkRemoved(IInteractionElement element) {
-	}
-
-	/**
-	 * One or more elements have been deleted from the task context.
-	 * 
-	 * @since 3.0
-	 * @deprecated use {@link #contextChanged(ContextChangeEvent)} instead
-	 */
-	@Deprecated
-	public void elementsDeleted(List<IInteractionElement> elements) {
-	}
-
-	/**
-	 * @since 3.2
-	 */
-	public void contextChanged(ContextChangeEvent event) {
-		switch (event.getEventKind()) {
-		case PRE_ACTIVATED:
-			contextPreActivated(event.getContext());
-			break;
-		case ACTIVATED:
-			contextActivated(event.getContext());
-			break;
-		case DEACTIVATED:
-			contextDeactivated(event.getContext());
-			break;
-		case CLEARED:
-			contextCleared(event.getContext());
-			break;
-		case INTEREST_CHANGED:
-			interestChanged(event.getElements());
-			break;
-		case LANDMARKS_ADDED:
-			for (IInteractionElement element : event.getElements()) {
-				landmarkAdded(element);
-			}
-			break;
-		case LANDMARKS_REMOVED:
-			for (IInteractionElement element : event.getElements()) {
-				landmarkRemoved(element);
-			}
-			break;
-		case ELEMENTS_DELETED:
-			elementsDeleted(event.getElements());
-			break;
-		default:
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN,
-					"Unknown context changed event type")); //$NON-NLS-1$
-		}
-
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/AbstractContextStructureBridge.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/AbstractContextStructureBridge.java
deleted file mode 100644
index 4aa343b..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/AbstractContextStructureBridge.java
+++ /dev/null
@@ -1,104 +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.context.core;
-
-import java.util.List;
-
-/**
- * Maps between domain elements (e.g. Java) and interaction context model elements.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public abstract class AbstractContextStructureBridge {
-
-	protected String parentContentType = null;
-
-	/**
-	 * Used for delagating to when the parent of an element is known by another bridge.
-	 */
-	public void setParentContentType(String contentType) {
-		this.parentContentType = contentType;
-	}
-
-	public abstract String getContentType();
-
-	/**
-	 * A workspace-unique and robust String identifier for a structured element. For example, in Java these are the
-	 * IJavaElement's handle identifier. For XML, this could be an xpath, but due to the fact that xpaths rely on
-	 * element ordering for identity they are not robust to element order switching.
-	 * 
-	 * @return null if the given object does not participate in the task context
-	 */
-	public abstract String getHandleIdentifier(Object object);
-
-	/**
-	 * @since 3.2
-	 * @param allowChildBridgeHandles
-	 *            true if the structure bridge can return the object handle for a child bridge (for the
-	 *            ResourceStructureBridge)
-	 */
-	public String getParentHandle(String handle, boolean allowChildBridgeHandles) {
-		return getParentHandle(handle);
-	}
-
-	/**
-	 * @return The handle identifier of the element that is the parent of this element in the containment hierarchy, or
-	 *         null if no such parent exists.
-	 */
-	public abstract String getParentHandle(String handle);
-
-	public abstract Object getObjectForHandle(String handle);
-
-	public abstract List<String> getChildHandles(String handle);
-
-	/**
-	 * @return The name or a null String(""). Can't be null since the views displaying the context can't handle null
-	 *         names
-	 */
-	public abstract String getLabel(Object object);
-
-	public abstract boolean canBeLandmark(String handle);
-
-	public abstract boolean acceptsObject(Object object);
-
-	/**
-	 * @return false for objects that can not be filtered
-	 */
-	public abstract boolean canFilter(Object element);
-
-	/**
-	 * @return true if this is a resource that can be opened by an editor (i.e. false for a directory, or a Java method)
-	 */
-	public abstract boolean isDocument(String handle);
-
-	/**
-	 * TODO 4.0: either remove of make marker coupling explicit
-	 * 
-	 * @param resource
-	 *            can be anything that has an element accessible via an offset, e.g. a file with a character offset
-	 */
-	public abstract String getHandleForOffsetInObject(Object resource, int offset);
-
-	/**
-	 * Used for switching kinds based on parent handles
-	 */
-	public abstract String getContentType(String elementHandle);
-
-	public String getParentContentType() {
-		return parentContentType;
-	}
-
-	public Object getAdaptedParent(Object object) {
-		return null;
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/ContextChangeEvent.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/ContextChangeEvent.java
deleted file mode 100644
index 9f48a41..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/ContextChangeEvent.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.mylyn.context.core;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-
-/**
- * @author Shawn Minto
- * @since 3.2
- */
-public class ContextChangeEvent {
-
-	/**
-	 * @author Shawn Minto
-	 * @since 3.2
-	 */
-	public enum ContextChangeKind {
-		PRE_ACTIVATED, ACTIVATED, DEACTIVATED, CLEARED, INTEREST_CHANGED, LANDMARKS_ADDED, LANDMARKS_REMOVED, ELEMENTS_DELETED;
-	}
-
-	private final String contextHandle;
-
-	private final IInteractionContext context;
-
-	private final ContextChangeKind eventKind;
-
-	private final List<IInteractionElement> elements;
-
-	public ContextChangeEvent(ContextChangeKind eventKind, String contextHandle, IInteractionContext context,
-			List<IInteractionElement> elements) {
-		Assert.isNotNull(eventKind);
-		this.contextHandle = contextHandle;
-		this.context = context;
-		this.eventKind = eventKind;
-		if (elements == null) {
-			this.elements = Collections.emptyList();
-		} else {
-			this.elements = elements;
-		}
-	}
-
-	/**
-	 * The Type of context event that occurred
-	 * 
-	 * @since 3.2
-	 */
-	public ContextChangeKind getEventKind() {
-		return eventKind;
-	}
-
-	/**
-	 * The elements that were manipulated for the event (may be empty)
-	 * 
-	 * @since 3.2
-	 */
-	public List<IInteractionElement> getElements() {
-		return elements;
-	}
-
-	/**
-	 * The handle of the context that was changed (Can be null if a composite context with multiple
-	 * IInteractionContext's is changed)
-	 * 
-	 * @since 3.2
-	 */
-	public String getContextHandle() {
-		return contextHandle;
-	}
-
-	/**
-	 * The context that was changed (Can be null e.g. context deleted)
-	 * 
-	 * @since 3.2
-	 */
-	public IInteractionContext getContext() {
-		return context;
-	}
-
-	/**
-	 * Utility for whether the manipulated context is the active one
-	 * 
-	 * @since 3.2
-	 */
-	public boolean isActiveContext() {
-		IInteractionContext activeContext = ContextCore.getContextManager().getActiveContext();
-		return activeContext != null && activeContext.getHandleIdentifier() != null
-				&& activeContext.getHandleIdentifier().equals(contextHandle);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/ContextCore.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/ContextCore.java
deleted file mode 100644
index 5a17594..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/ContextCore.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.core;
-
-import java.util.Set;
-
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-
-/**
- * @author Mik Kersten
- * @since 3.0
- */
-public final class ContextCore {
-
-	public static final String CONTENT_TYPE_RESOURCE = "resource"; //$NON-NLS-1$
-
-	/**
-	 * @since 3.0
-	 */
-	public static IInteractionContextManager getContextManager() {
-		return ContextCorePlugin.getContextManager();
-	}
-
-	public static IInteractionContextScaling getCommonContextScaling() {
-		return ContextCorePlugin.getDefault().getCommonContextScaling();
-	}
-
-	/**
-	 * @return null if there are no bridges loaded, null bridge otherwise
-	 */
-	public static AbstractContextStructureBridge getStructureBridge(Object object) {
-		return ContextCorePlugin.getDefault().getStructureBridge(object);
-	}
-
-	public static AbstractContextStructureBridge getStructureBridge(String contentType) {
-		return ContextCorePlugin.getDefault().getStructureBridge(contentType);
-	}
-
-	public static Set<String> getContentTypes() {
-		return ContextCorePlugin.getDefault().getContentTypes();
-	}
-
-	public static Set<String> getChildContentTypes(String contentType) {
-		return ContextCorePlugin.getDefault().getChildContentTypes(contentType);
-	}
-
-	public static IContextStore getContextStore() {
-		return ContextCorePlugin.getContextStore();
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IContextStore.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IContextStore.java
deleted file mode 100644
index 654a47b..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IContextStore.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.context.core;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * File-based store used for writing Mylyn-specific date such as the task list and task contexts (e.g.
- * workspace/.metadata/.mylyn folder).
- * 
- * @author Mik Kersten
- * @author Steffen Pingel
- * @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 IContextStore {
-
-	/**
-	 * @since 3.0
-	 */
-	public abstract boolean hasContext(String handleIdentifier);
-
-	/**
-	 * @param zipFile
-	 *            A zip file that contains a context with the specified handle identifier in its root.
-	 * @return null if the import failed
-	 * @throws CoreException
-	 * @since 3.0
-	 */
-	public abstract IInteractionContext importContext(String handleIdentifier, File zipFile) throws CoreException;
-
-	/**
-	 * Creates a new context if a source context was not found.
-	 * 
-	 * @since 3.0
-	 */
-	public abstract IInteractionContext cloneContext(String sourceHandleIdentifier, String destinationHandleIdentifier);
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IDegreeOfInterest.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IDegreeOfInterest.java
deleted file mode 100644
index 9aa7dbc..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IDegreeOfInterest.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.context.core;
-
-import java.util.List;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * Abstraction for capturing the interest level of elements and relations based on interaction events.
- * 
- * @author Mik Kersten
- * @since 2.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 IDegreeOfInterest {
-
-	public abstract boolean isPropagated();
-
-	public boolean isPredicted();
-
-	public abstract boolean isLandmark();
-
-	public abstract boolean isInteresting();
-
-	public abstract float getEncodedValue();
-
-	public float getDecayValue();
-
-	public abstract float getValue();
-
-	public abstract List<InteractionEvent> getEvents();
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IImplicitlyIntersting.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IImplicitlyIntersting.java
deleted file mode 100644
index ad1f5c4..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IImplicitlyIntersting.java
+++ /dev/null
@@ -1,22 +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.context.core;
-
-/**
- * Tag interface to indicate elements that should not be filtered as uninteresting.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public interface IImplicitlyIntersting {
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContext.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContext.java
deleted file mode 100644
index a0fb481..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContext.java
+++ /dev/null
@@ -1,121 +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.context.core;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * A model of task context weighted by interaction based on frequency and recency of access, as determined by the
- * degree-of-interest weighting mechanism.
- * 
- * @author Mik Kersten
- * @author Shawn Minto
- * @author David Green bug 257977 isInteresting
- * @noimplement This interface is not intended to be implemented by clients.
- * @since 2.0
- */
-public interface IInteractionContext {
-
-	/**
-	 * Returns the unique handle identifier of the context.
-	 * 
-	 * @return null if no unique handle, e.g. if a composite context
-	 * @since 2.0
-	 */
-	public abstract String getHandleIdentifier();
-
-	/**
-	 * Returns a list of all interesting interaction elements. Modifying the list will not affect the context.
-	 * 
-	 * @since 2.0
-	 */
-	public abstract List<InteractionEvent> getInteractionHistory();
-
-	/**
-	 * indicate if the interaction element identified by the given handle is interesting
-	 * 
-	 * @param elementHandle
-	 *            the {@link IInteractionElement#getHandleIdentifier() handle identifier}
-	 * 
-	 * @return true if an {@link #getInteresting() interesting} interaction element exists with the given handle
-	 * @since 3.2
-	 */
-	public boolean isInteresting(String elementHandle);
-
-	/**
-	 * Returns a list of all interesting interaction elements. Modifying the list will not affect the context.
-	 * 
-	 * @since 2.0
-	 */
-	public List<IInteractionElement> getInteresting();
-
-	/**
-	 * Returns a list of all interaction elements that are landmarks. Modifying the list will not affect the context.
-	 * 
-	 * @since 2.2
-	 */
-	public List<IInteractionElement> getLandmarks();
-
-	/**
-	 * 
-	 * @since 2.0
-	 */
-	public abstract IInteractionElement get(String element);
-
-	/**
-	 * 
-	 * @since 2.0
-	 */
-	public abstract IInteractionElement getActiveNode();
-
-	/**
-	 * 
-	 * @since 2.0
-	 */
-	public abstract void delete(IInteractionElement element);
-
-	/**
-	 * @since 3.2
-	 */
-	public abstract void delete(Collection<IInteractionElement> elements);
-
-	/**
-	 * @since 2.0
-	 */
-	public abstract void updateElementHandle(IInteractionElement element, String newHandle);
-
-	/**
-	 * Returns a list of all interaction elements. Modifying the list will not affect the context.
-	 * 
-	 * @since 2.0
-	 */
-	public abstract List<IInteractionElement> getAllElements();
-
-	/**
-	 * @since 3.0
-	 */
-	public IInteractionContextScaling getScaling();
-
-	/**
-	 * @since 2.2
-	 */
-	public String getContentLimitedTo();
-
-	/**
-	 * @since 2.2
-	 */
-	public void setContentLimitedTo(String contentLimitedTo);
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContextManager.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContextManager.java
deleted file mode 100644
index 00f34f1..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContextManager.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.core;
-
-import java.util.Collection;
-import java.util.Set;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- * @since 3.0
- * @noimplement
- */
-public interface IInteractionContextManager {
-
-	/**
-	 * @return null if the element handle is null or if the element is not found in the active task context.
-	 */
-	public abstract IInteractionElement getElement(String elementHandle);
-
-	public abstract void addListener(AbstractContextListener listener);
-
-	public abstract void removeListener(AbstractContextListener listener);
-
-	public abstract void activateContext(String handleIdentifier);
-
-	public abstract void deactivateContext(String handleIdentifier);
-
-	public abstract void deleteContext(String handleIdentifier);
-
-	public abstract IInteractionContext getActiveContext();
-
-	public abstract Set<IInteractionElement> getActiveLandmarks();
-
-	public abstract Set<IInteractionElement> getActiveDocuments(IInteractionContext context);
-
-	public abstract void updateHandle(IInteractionElement element, String newHandle);
-
-	public abstract void deleteElement(IInteractionElement element);
-
-	/**
-	 * @since 3.2
-	 */
-	public abstract void deleteElements(Collection<IInteractionElement> elements);
-
-	public IInteractionElement getActiveElement();
-
-	public IInteractionElement processInteractionEvent(InteractionEvent event);
-
-	public boolean isContextActive();
-
-	/**
-	 * Lazily loads set of handles with corresponding contexts.
-	 */
-	public boolean hasContext(String handleIdentifier);
-
-	public abstract boolean isContextActivePropertySet();
-
-	public abstract boolean isContextCapturePaused();
-
-	/**
-	 * NOTE: If pausing ensure to restore to original state.
-	 */
-	public void setContextCapturePaused(boolean paused);
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContextScaling.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContextScaling.java
deleted file mode 100644
index 2c345b4..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionContextScaling.java
+++ /dev/null
@@ -1,35 +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.context.core;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- * @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 IInteractionContextScaling {
-
-	public abstract float get(InteractionEvent.Kind kind);
-
-	public abstract float getDecay();
-
-	public abstract float getInteresting();
-
-	public abstract float getLandmark();
-
-	public abstract float getForcedLandmark();
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionElement.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionElement.java
deleted file mode 100644
index 1948145..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionElement.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.context.core;
-
-import java.util.Collection;
-
-import org.eclipse.mylyn.internal.context.core.InteractionContextRelation;
-
-/**
- * Virtual proxy for a structured element in the contet model.
- * 
- * @author Mik Kersten
- * @since 2.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 IInteractionElement extends IInteractionObject {
-
-	public abstract String getHandleIdentifier();
-
-	public abstract void setHandleIdentifier(String handle);
-
-	public abstract IInteractionContext getContext();
-
-	public abstract Collection<InteractionContextRelation> getRelations();
-
-	/**
-	 * @since 3.0
-	 */
-	public abstract IInteractionRelation getRelation(String targetHandle);
-
-	public abstract void clearRelations();
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionObject.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionObject.java
deleted file mode 100644
index 3104dbc..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionObject.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.core;
-
-/**
- * Virtual proxy for an element or relation in the context model.
- * 
- * @author Mik Kersten
- * @since 2.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 IInteractionObject {
-
-	public abstract IDegreeOfInterest getInterest();
-
-	public abstract String getContentType();
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionRelation.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionRelation.java
deleted file mode 100644
index 7a55565..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/IInteractionRelation.java
+++ /dev/null
@@ -1,32 +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.context.core;
-
-/**
- * Virtual proxy for a relation between two elements in the context model.
- * 
- * @author Mik Kersten
- * @since 2.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 IInteractionRelation extends IInteractionObject {
-
-	public abstract String getLabel();
-
-	public abstract String getRelationshipHandle();
-
-	public abstract IInteractionElement getTarget();
-
-	public abstract IInteractionElement getSource();
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/InterestComparator.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/InterestComparator.java
deleted file mode 100644
index 0b2119c..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/context/core/InterestComparator.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.context.core;
-
-import java.util.Comparator;
-
-/**
- * Ranks elements by their degree-of-interest.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public class InterestComparator<T> implements Comparator<T> {
-
-	public int compare(T e1, T e2) {
-		if (e1 instanceof IInteractionElement && e2 instanceof IInteractionElement) {
-			IInteractionElement info1 = (IInteractionElement) e1;
-			IInteractionElement info2 = (IInteractionElement) e2;
-			float v1 = info1.getInterest().getValue();
-			float v2 = info2.getInterest().getValue();
-			if (v1 >= v2) {
-				return -1;
-			}
-			if (v1 < v2) {
-				return 1;
-			}
-		}
-		return 0;
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/AbstractRelationProvider.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/AbstractRelationProvider.java
deleted file mode 100644
index 6d23561..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/AbstractRelationProvider.java
+++ /dev/null
@@ -1,165 +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.context.core;
-
-import java.util.List;
-
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * Used for Active Search.
- * 
- * NOTE: this facility is not exposed by default in Mylyn 2.0 and likely to change for 3.0.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public abstract class AbstractRelationProvider extends AbstractContextListener {
-
-	protected final String DOS_0_LABEL = "disabled"; //$NON-NLS-1$
-
-	protected final String DOS_1_LABEL = "landmark resources"; //$NON-NLS-1$
-
-	protected final String DOS_2_LABEL = "interesting resources"; //$NON-NLS-1$
-
-	protected final String DOS_3_LABEL = "interesting projects"; //$NON-NLS-1$
-
-	protected final String DOS_4_LABEL = "project dependencies"; //$NON-NLS-1$
-
-	protected final String DOS_5_LABEL = "entire workspace (slow)"; //$NON-NLS-1$
-
-	private boolean enabled = false;
-
-	private final String id;
-
-	private final String structureKind;
-
-	private int degreeOfSeparation;
-
-	public String getId() {
-		return id;
-	}
-
-	public AbstractRelationProvider(String structureKind, String id) {
-		this.id = id;
-		this.structureKind = structureKind;
-		degreeOfSeparation = getDefaultDegreeOfSeparation();
-	}
-
-	public abstract List<IDegreeOfSeparation> getDegreesOfSeparation();
-
-	protected abstract int getDefaultDegreeOfSeparation();
-
-	protected abstract void findRelated(final IInteractionElement node, int degreeOfSeparation);
-
-	/**
-	 * @param limitTo
-	 *            Only used in thye AbstractJavaRelationshipProvider for the search type
-	 */
-	public abstract IActiveSearchOperation getSearchOperation(IInteractionElement node, int limitTo,
-			int degreeOfSeparation);
-
-	public abstract String getName();
-
-	public boolean acceptResultElement(Object element) {
-		return true;
-	}
-
-	@Override
-	public void contextChanged(ContextChangeEvent event) {
-		switch (event.getEventKind()) {
-		case LANDMARKS_ADDED:
-			if (enabled) {
-				for (IInteractionElement node : event.getElements()) {
-					findRelated(node, degreeOfSeparation);
-				}
-			}
-			break;
-		}
-	}
-
-	protected void searchCompleted(IInteractionElement landmark) {
-		if (landmark.getRelations().size() > 0) {
-			ContextCorePlugin.getContextManager().notifyRelationshipsChanged(landmark);
-		}
-	}
-
-	protected void incrementInterest(IInteractionElement node, String elementKind, String elementHandle,
-			int degreeOfSeparation) {
-		int predictedInterest = 1;// (7-degreeOfSeparation) *
-		// TaskscapeManager.getScalingFactors().getDegreeOfSeparationScale();
-		InteractionEvent event = new InteractionEvent(InteractionEvent.Kind.PREDICTION, elementKind, elementHandle,
-				getSourceId(), getId(), null, predictedInterest);
-		ContextCorePlugin.getContextManager().processInteractionEvent(event, false, false);
-		createEdge(node, elementKind, elementHandle);
-	}
-
-	/**
-	 * Public for testing
-	 */
-	public void createEdge(IInteractionElement toNode, String elementKind, String targetHandle) {
-		CompositeContextElement targetNode = (CompositeContextElement) ContextCore.getContextManager().getElement(
-				targetHandle);
-		if (targetNode == null) {
-			return;
-		}
-		InteractionContextElement concreteTargetNode = null;
-		if (targetNode.getNodes().size() != 1) {
-			return;
-		} else {
-			concreteTargetNode = targetNode.getNodes().iterator().next();
-		}
-		if (concreteTargetNode != null) {
-			for (InteractionContextElement sourceNode : ((CompositeContextElement) toNode).getNodes()) {
-				InteractionContextRelation edge = new InteractionContextRelation(elementKind, getId(), sourceNode,
-						concreteTargetNode, sourceNode.getContext());
-				sourceNode.addEdge(edge);
-			}
-		}
-	}
-
-	protected abstract String getSourceId();
-
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	public int getCurrentDegreeOfSeparation() {
-		return degreeOfSeparation;
-	}
-
-	@Override
-	public String toString() {
-		return "(provider for: " + id + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public String getStructureKind() {
-		return structureKind;
-	}
-
-	public void setDegreeOfSeparation(int degreeOfSeparation) {
-		this.degreeOfSeparation = degreeOfSeparation;
-	}
-
-	public abstract String getGenericId();
-
-	public abstract void stopAllRunningJobs();
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/AggregateInteractionEvent.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/AggregateInteractionEvent.java
deleted file mode 100644
index 17291be..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/AggregateInteractionEvent.java
+++ /dev/null
@@ -1,65 +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.context.core;
-
-import java.util.Date;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Shawn Minto
- */
-public class AggregateInteractionEvent extends InteractionEvent {
-
-	// these are needed for collapsed events so that we can restore the context properly
-	private final int numCollapsedEvents;
-
-	private final int eventCountOnCreation;
-
-	/**
-	 * For parameter description see this class's getters.
-	 */
-	public AggregateInteractionEvent(Kind kind, String structureKind, String handle, String originId,
-			String navigatedRelation, String delta, float interestContribution, int numCollapsedEvents,
-			int eventCountOnCreation) {
-		super(kind, structureKind, handle, originId, navigatedRelation, delta, interestContribution);
-		this.numCollapsedEvents = numCollapsedEvents;
-		this.eventCountOnCreation = eventCountOnCreation;
-	}
-
-	/**
-	 * For parameter description see this class's getters.
-	 */
-	public AggregateInteractionEvent(Kind kind, String structureKind, String handle, String originId,
-			String navigatedRelation, String delta, float interestContribution, Date startDate, Date endDate,
-			int numCollapsedEvents, int eventCountOnCreation) {
-
-		super(kind, structureKind, handle, originId, navigatedRelation, delta, interestContribution, startDate, endDate);
-		this.numCollapsedEvents = numCollapsedEvents;
-		this.eventCountOnCreation = eventCountOnCreation;
-	}
-
-	/**
-	 * Returns the number of events this event represents
-	 */
-	public int getNumCollapsedEvents() {
-		return numCollapsedEvents;
-	}
-
-	/**
-	 * Returns the number of user events that had occurred when this was created or -1 to use the context's count
-	 */
-	public int getEventCountOnCreation() {
-		return eventCountOnCreation;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeContextElement.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeContextElement.java
deleted file mode 100644
index 2965536..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeContextElement.java
+++ /dev/null
@@ -1,165 +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.context.core;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.IDegreeOfInterest;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- */
-public class CompositeContextElement implements IInteractionElement {
-
-	private final List<InteractionContextElement> nodes;
-
-	private String handle;
-
-	private final IInteractionContextScaling contextScaling;
-
-	public CompositeContextElement(String handle, List<InteractionContextElement> nodes,
-			IInteractionContextScaling contextScaling) {
-		Assert.isNotNull(handle);
-		this.handle = handle;
-		this.nodes = nodes;
-		this.contextScaling = contextScaling;
-	}
-
-	/**
-	 * @return the context with the highest value TODO: is this always best?
-	 */
-	public IInteractionContext getContext() {
-		IInteractionElement highestValueNode = null;
-		for (IInteractionElement node : nodes) {
-			if (highestValueNode == null || node.getInterest().getValue() < highestValueNode.getInterest().getValue()) {
-				highestValueNode = node;
-			}
-		}
-		if (highestValueNode != null) {
-			return highestValueNode.getContext();
-		} else {
-			return null;
-		}
-	}
-
-	public IDegreeOfInterest getInterest() {
-		if (nodes.size() == 1) {
-			return nodes.iterator().next().getInterest();
-		} else {
-			// TODO: fix this inefficiency, but not currently used by existing code
-			CompositeDegreeOfInterest degreeOfInterest = new CompositeDegreeOfInterest(contextScaling);
-			for (IInteractionElement node : nodes) {
-				degreeOfInterest.getComposedDegreesOfInterest().add(node.getInterest());
-			}
-			return degreeOfInterest;
-		}
-	}
-
-	public String getHandleIdentifier() {
-		return handle;
-	}
-
-	public void setHandleIdentifier(String handle) {
-		Assert.isNotNull(handle);
-		this.handle = handle;
-		for (IInteractionElement node : nodes) {
-			node.setHandleIdentifier(handle);
-		}
-	}
-
-	public List<InteractionContextElement> getNodes() {
-		return nodes;
-	}
-
-	/**
-	 * @return empty string if all kinds aren't equal
-	 */
-	public String getContentType() {
-		Set<String> kinds = new HashSet<String>();
-		String lastKind = null;
-		for (IInteractionElement node : nodes) {
-			lastKind = node.getContentType();
-			kinds.add(lastKind);
-		}
-		if (kinds.size() == 1) {
-			return lastKind;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * TODO: need composite edges here
-	 */
-	public IInteractionRelation getRelation(String targetHandle) {
-		Set<IInteractionRelation> edges = new HashSet<IInteractionRelation>();
-		for (IInteractionElement node : nodes) {
-			edges.add(node.getRelation(targetHandle));
-		}
-		if (edges.size() == 0) {
-			return null;
-		} else if (edges.size() > 1) {
-			StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN,
-					"Multiple edges found in composite, not supported")); //$NON-NLS-1$
-		}
-		return edges.iterator().next();
-	}
-
-	public Collection<InteractionContextRelation> getRelations() {
-		Set<InteractionContextRelation> edges = new HashSet<InteractionContextRelation>();
-
-		for (InteractionContextElement node : nodes) {
-			edges.addAll(node.getRelations());
-		}
-		return edges;
-	}
-
-	public void clearRelations() {
-		for (InteractionContextElement node : nodes) {
-			node.clearRelations();
-		}
-	}
-
-	@Override
-	public boolean equals(Object object) {
-		if (object == null) {
-			return false;
-		}
-		if (object instanceof CompositeContextElement) {
-			CompositeContextElement element = (CompositeContextElement) object;
-			return this.getHandleIdentifier().equals(element.getHandleIdentifier());
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return handle.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return "composite" + nodes; //$NON-NLS-1$
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeDegreeOfInterest.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeDegreeOfInterest.java
deleted file mode 100644
index 2c952f5..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeDegreeOfInterest.java
+++ /dev/null
@@ -1,134 +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.context.core;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.mylyn.context.core.IDegreeOfInterest;
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public class CompositeDegreeOfInterest implements IDegreeOfInterest {
-
-	private final Set<IDegreeOfInterest> composed = new HashSet<IDegreeOfInterest>();
-
-	protected IInteractionContextScaling contextScaling;
-
-	public CompositeDegreeOfInterest(IInteractionContextScaling contextScaling) {
-		this.contextScaling = contextScaling;
-	}
-
-	public void addEvent(InteractionEvent event) {
-		for (IDegreeOfInterest info : composed) {
-			((DegreeOfInterest) info).addEvent(event);
-		}
-	}
-
-	public List<InteractionEvent> getEvents() {
-		Set<InteractionEvent> events = new HashSet<InteractionEvent>();
-		for (IDegreeOfInterest info : composed) {
-			events.addAll(info.getEvents());
-		}
-		return new ArrayList<InteractionEvent>(events);
-	}
-
-	public float getValue() {
-		float value = 0;
-		for (IDegreeOfInterest info : composed) {
-			value += info.getValue();
-		}
-		return value;
-	}
-
-	public float getDecayValue() {
-		float value = 0;
-		for (IDegreeOfInterest info : composed) {
-			value += info.getDecayValue();
-		}
-		return value;
-	}
-
-	public float getEncodedValue() {
-		float value = 0;
-		for (IDegreeOfInterest info : composed) {
-			value += info.getEncodedValue();
-		}
-		return value;
-	}
-
-	/**
-	 * @return true if one is interesting
-	 */
-	public boolean isInteresting() {
-		boolean isInteresting = false;
-		for (IDegreeOfInterest info : composed) {
-			if (info.isInteresting()) {
-				isInteresting = true;
-			}
-		}
-		return isInteresting;
-	}
-
-	/**
-	 * @return true if all are predicted
-	 */
-	public boolean isPropagated() {
-		if (composed.isEmpty()) {
-			return false;
-		}
-		boolean allPropagated = true;
-		for (IDegreeOfInterest info : composed) {
-			if (!info.isPropagated()) {
-				allPropagated = false;
-			}
-		}
-		return allPropagated;
-	}
-
-	public boolean isPredicted() {
-		if (composed.isEmpty()) {
-			return false;
-		}
-		boolean allPredicted = true;
-		for (IDegreeOfInterest info : composed) {
-			if (!info.isPredicted()) {
-				allPredicted = false;
-			}
-		}
-		return allPredicted;
-	}
-
-	public boolean isLandmark() {
-		return getValue() >= contextScaling.getLandmark();
-	}
-
-	public Set<IDegreeOfInterest> getComposedDegreesOfInterest() {
-		return composed;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer result = new StringBuffer();
-		result.append("composite("); //$NON-NLS-1$
-		for (IDegreeOfInterest info : composed) {
-			result.append(info.toString());
-		}
-		result.append(")"); //$NON-NLS-1$
-		return result.toString();
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeInteractionContext.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeInteractionContext.java
deleted file mode 100644
index 249a08b..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/CompositeInteractionContext.java
+++ /dev/null
@@ -1,191 +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.context.core;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * Delegates to contained contexts.
- * 
- * TODO: should info be propagated proportionally to number of taskscapes?
- * 
- * @author Mik Kersten
- * @author Shawn Minto
- * @author David Green bug 257977 isInteresting
- */
-public class CompositeInteractionContext implements IInteractionContext {
-
-	protected Map<String, InteractionContext> contexts = new HashMap<String, InteractionContext>();
-
-	protected IInteractionElement activeNode = null;
-
-	private final IInteractionContextScaling contextScaling;
-
-	public String contentLimitedTo = null;
-
-	public CompositeInteractionContext(IInteractionContextScaling contextScaling) {
-		this.contextScaling = contextScaling;
-	}
-
-	public IInteractionElement addEvent(InteractionEvent event) {
-		List<InteractionContextElement> nodes = new ArrayList<InteractionContextElement>();
-		for (InteractionContext context : contexts.values()) {
-			InteractionContextElement info = (InteractionContextElement) context.parseEvent(event);
-			nodes.add(info);
-		}
-		CompositeContextElement compositeNode = new CompositeContextElement(event.getStructureHandle(), nodes,
-				contextScaling);
-		return compositeNode;
-	}
-
-	public IInteractionElement get(String handle) {
-		if (handle == null || contexts.values().size() == 0) {
-			return null;
-		}
-		List<InteractionContextElement> nodes = new ArrayList<InteractionContextElement>();
-		for (InteractionContext taskscape : contexts.values()) {
-			InteractionContextElement node = (InteractionContextElement) taskscape.get(handle);
-			if (node != null) {
-				nodes.add(node);
-			}
-		}
-		CompositeContextElement composite = new CompositeContextElement(handle, nodes, contextScaling);
-		return composite;
-	}
-
-	public List<IInteractionElement> getLandmarks() {
-		Set<IInteractionElement> landmarks = new HashSet<IInteractionElement>();
-		for (InteractionContext taskscape : contexts.values()) {
-			for (IInteractionElement concreteNode : taskscape.getLandmarks()) {
-				if (concreteNode != null) {
-					landmarks.add(get(concreteNode.getHandleIdentifier()));
-				}
-			}
-		}
-		return new ArrayList<IInteractionElement>(landmarks);
-	}
-
-	public List<IInteractionElement> getInteresting() {
-		Set<IInteractionElement> landmarks = new HashSet<IInteractionElement>();
-		for (InteractionContext context : contexts.values()) {
-			for (IInteractionElement concreteNode : context.getInteresting()) {
-				if (concreteNode != null) {
-					landmarks.add(get(concreteNode.getHandleIdentifier()));
-				}
-			}
-		}
-		return new ArrayList<IInteractionElement>(landmarks);
-	}
-
-	public boolean isInteresting(String elementHandle) {
-		for (InteractionContext context : contexts.values()) {
-			if (context.isInteresting(elementHandle)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public void setActiveElement(IInteractionElement activeElement) {
-		this.activeNode = activeElement;
-	}
-
-	public IInteractionElement getActiveNode() {
-		return activeNode;
-	}
-
-	public void delete(IInteractionElement node) {
-		for (InteractionContext taskscape : contexts.values()) {
-			taskscape.delete(node);
-		}
-	}
-
-	public void delete(Collection<IInteractionElement> nodes) {
-		for (InteractionContext context : contexts.values()) {
-			context.delete(nodes);
-		}
-	}
-
-	public void clear() {
-		for (InteractionContext taskscape : contexts.values()) {
-			taskscape.reset();
-		}
-	}
-
-	public Map<String, InteractionContext> getContextMap() {
-		return contexts;
-	}
-
-	public List<IInteractionElement> getAllElements() {
-		Set<IInteractionElement> nodes = new HashSet<IInteractionElement>();
-		for (InteractionContext context : contexts.values()) {
-			for (IInteractionElement concreteNode : context.getAllElements()) {
-				nodes.add(get(concreteNode.getHandleIdentifier()));
-			}
-		}
-		return new ArrayList<IInteractionElement>(nodes);
-	}
-
-	/**
-	 * TODO: sort by date?
-	 */
-	public List<InteractionEvent> getInteractionHistory() {
-		Set<InteractionEvent> events = new HashSet<InteractionEvent>();
-		for (InteractionContext taskscape : contexts.values()) {
-			events.addAll(taskscape.getInteractionHistory());
-		}
-		return new ArrayList<InteractionEvent>(events);
-	}
-
-	public void updateElementHandle(IInteractionElement element, String newHandle) {
-		for (InteractionContext context : contexts.values()) {
-			context.updateElementHandle(element, newHandle);
-		}
-		element.setHandleIdentifier(newHandle);
-	}
-
-	/**
-	 * Composite contexts do not have a unique handle identifier.
-	 * 
-	 * @return null if no unique handle
-	 */
-	public String getHandleIdentifier() {
-		if (contexts.values().size() == 1) {
-			return contexts.keySet().iterator().next();
-		} else {
-			return null;
-		}
-	}
-
-	public IInteractionContextScaling getScaling() {
-		return contextScaling;
-	}
-
-	public String getContentLimitedTo() {
-		return contentLimitedTo;
-	}
-
-	public void setContentLimitedTo(String contentLimitedTo) {
-		this.contentLimitedTo = contentLimitedTo;
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/ContextCorePlugin.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/ContextCorePlugin.java
deleted file mode 100644
index b9be34a..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/ContextCorePlugin.java
+++ /dev/null
@@ -1,474 +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.context.core;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-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.Plugin;
-import org.eclipse.core.runtime.Status;
-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.context.core.IInteractionContextScaling;
-import org.osgi.framework.BundleContext;
-
-/**
- * Activator for the Context Core plug-in.
- * 
- * @author Mik Kersten
- * @since 3.0
- */
-public class ContextCorePlugin extends Plugin {
-
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.core"; //$NON-NLS-1$
-
-	private final Map<String, AbstractContextStructureBridge> bridges = new ConcurrentHashMap<String, AbstractContextStructureBridge>();
-
-	private final Map<String, Set<String>> childContentTypeMap = new ConcurrentHashMap<String, Set<String>>();
-
-	// specifies that one content type should shadow another
-	// the <value> content type shadows the <key> content typee
-	private final Map<String, String> contentTypeToShadowMap = new ConcurrentHashMap<String, String>();
-
-	private AbstractContextStructureBridge defaultBridge = null;
-
-	private static ContextCorePlugin INSTANCE;
-
-	private InteractionContextManager contextManager;
-
-	private static LocalContextStore contextStore;
-
-	private final Map<String, Set<AbstractRelationProvider>> relationProviders = new HashMap<String, Set<AbstractRelationProvider>>();
-
-	private final InteractionContextScaling commonContextScaling = new InteractionContextScaling();
-
-	private static final AbstractContextStructureBridge DEFAULT_BRIDGE = new AbstractContextStructureBridge() {
-
-		@Override
-		public String getContentType() {
-			return null;
-		}
-
-		@Override
-		public String getHandleIdentifier(Object object) {
-			return null;
-		}
-
-		@Override
-		public Object getObjectForHandle(String handle) {
-			return null;
-		}
-
-		@Override
-		public String getParentHandle(String handle) {
-			return null;
-		}
-
-		@Override
-		public String getLabel(Object object) {
-			return ""; //$NON-NLS-1$
-		}
-
-		@Override
-		public boolean canBeLandmark(String handle) {
-			return false;
-		}
-
-		@Override
-		public boolean acceptsObject(Object object) {
-			return false;
-		}
-
-		@Override
-		public boolean canFilter(Object element) {
-			return true;
-		}
-
-		@Override
-		public boolean isDocument(String handle) {
-			return false;
-		}
-
-		@Override
-		public String getContentType(String elementHandle) {
-			return getContentType();
-		}
-
-		@Override
-		public String getHandleForOffsetInObject(Object resource, int offset) {
-			return null;
-		}
-
-		@Override
-		public List<String> getChildHandles(String handle) {
-			return Collections.emptyList();
-		}
-	};
-
-	public ContextCorePlugin() {
-		INSTANCE = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		contextStore = new LocalContextStore(commonContextScaling);
-		contextManager = new InteractionContextManager(contextStore);
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		try {
-			super.stop(context);
-			INSTANCE = null;
-			for (AbstractRelationProvider provider : getRelationProviders()) {
-				provider.stopAllRunningJobs();
-			}
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN, "Mylyn Core stop failed", e)); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Shadows override existing shadows if present.
-	 */
-	private void addShadowsContent(String baseContentType, String shadowedByContentType) {
-		contentTypeToShadowMap.put(baseContentType, shadowedByContentType);
-	}
-
-	private void addRelationProvider(String contentType, AbstractRelationProvider provider) {
-		Set<AbstractRelationProvider> providers = relationProviders.get(contentType);
-		if (providers == null) {
-			providers = new HashSet<AbstractRelationProvider>();
-			relationProviders.put(contentType, providers);
-		}
-		providers.add(provider);
-		// TODO: need facility for removing
-		ContextCore.getContextManager().addListener(provider);
-	}
-
-	/**
-	 * @return all relation providers
-	 */
-	public Set<AbstractRelationProvider> getRelationProviders() {
-		Set<AbstractRelationProvider> allProviders = new HashSet<AbstractRelationProvider>();
-		for (Set<AbstractRelationProvider> providers : relationProviders.values()) {
-			allProviders.addAll(providers);
-		}
-		return allProviders;
-	}
-
-	public Set<AbstractRelationProvider> getRelationProviders(String contentType) {
-		return relationProviders.get(contentType);
-	}
-
-	public static ContextCorePlugin getDefault() {
-		return INSTANCE;
-	}
-
-	public static InteractionContextManager getContextManager() {
-		return INSTANCE.contextManager;
-	}
-
-	public Map<String, AbstractContextStructureBridge> getStructureBridges() {
-		BridgesExtensionPointReader.initExtensions();
-		return bridges;
-	}
-
-	/**
-	 * Finds the shadowed content for the passed in base content
-	 * 
-	 * @param baseContent
-	 * @return the shadowed content type or if null there is none
-	 */
-	private String getShadowedContentType(String baseContent) {
-		return contentTypeToShadowMap.get(baseContent);
-	}
-
-	public AbstractContextStructureBridge getStructureBridge(String contentType) {
-		BridgesExtensionPointReader.initExtensions();
-		if (contentType != null) {
-			// find the content type that shadows this one
-			// if one exists.
-			String shadowsContentType = getShadowedContentType(contentType);
-			if (shadowsContentType != null) {
-				AbstractContextStructureBridge bridge = bridges.get(shadowsContentType);
-				if (bridge != null) {
-					return bridge;
-				}
-			}
-
-			// no shadowing of content, look at original content type
-			AbstractContextStructureBridge bridge = bridges.get(contentType);
-			if (bridge != null) {
-				return bridge;
-			}
-		}
-		return (defaultBridge == null) ? DEFAULT_BRIDGE : defaultBridge;
-	}
-
-	public Set<String> getContentTypes() {
-		BridgesExtensionPointReader.initExtensions();
-		return bridges.keySet();
-	}
-
-	/**
-	 * TODO: cache this to improve performance?
-	 */
-	public AbstractContextStructureBridge getStructureBridge(Object object) {
-		BridgesExtensionPointReader.initExtensions();
-
-		for (Map.Entry<String, AbstractContextStructureBridge> entry : bridges.entrySet()) {
-			// check to see if there is shadowing of content types going on.
-			String shadowsContentType = getShadowedContentType(entry.getKey());
-			if (shadowsContentType != null) {
-				AbstractContextStructureBridge structureBridge = bridges.get(shadowsContentType);
-				if (structureBridge.acceptsObject(object)) {
-					return structureBridge;
-				}
-			}
-
-			// no shadowing...look at actual content type
-			AbstractContextStructureBridge bridge = entry.getValue();
-			if (bridge != null && bridge.acceptsObject(object)) {
-				return bridge;
-			}
-		}
-
-		// use the default if not found
-		return (defaultBridge != null && defaultBridge.acceptsObject(object)) ? defaultBridge : DEFAULT_BRIDGE;
-	}
-
-	/**
-	 * Recommended bridge registration is via extension point, but bridges can also be added at runtime. Note that only
-	 * one bridge per content type is supported. Overriding content types is not supported.
-	 */
-	public synchronized void addStructureBridge(AbstractContextStructureBridge bridge) {
-		if (bridge.getContentType().equals(ContextCore.CONTENT_TYPE_RESOURCE)) {
-			defaultBridge = bridge;
-		} else {
-			bridges.put(bridge.getContentType(), bridge);
-		}
-		if (bridge.getParentContentType() != null) {
-			Set<String> childContentTypes = childContentTypeMap.get(bridge.getParentContentType());
-			if (childContentTypes == null) {
-				// CopyOnWriteArrayList handles concurrent access to the content types
-				childContentTypes = new CopyOnWriteArraySet<String>();
-			}
-
-			childContentTypes.add(bridge.getContentType());
-			childContentTypeMap.put(bridge.getParentContentType(), childContentTypes);
-		}
-	}
-
-	public static LocalContextStore getContextStore() {
-//		if (!contextStoreRead) {
-//			contextStoreRead = true;
-//			ContextStoreExtensionReader.initExtensions();
-//			if (contextStore != null) {
-//				contextStore.init();
-//			} else {
-//				StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.PLUGIN_ID, "No context store specified"));
-//			}
-//		}
-		return contextStore;
-	}
-
-//	public void setContextStore(AbstractContextStore contextStore) {
-//		ContextCorePlugin.contextStore = contextStore;
-//	}
-
-//	static class ContextStoreExtensionReader {
-//
-//		private static final String ELEMENT_CONTEXT_STORE = "contextStore";
-//
-//		private static boolean extensionsRead = false;
-//
-//		public static void initExtensions() {
-//			if (!extensionsRead) {
-//				IExtensionRegistry registry = Platform.getExtensionRegistry();
-//				IExtensionPoint extensionPoint = registry.getExtensionPoint(BridgesExtensionPointReader.EXTENSION_ID_CONTEXT);
-//				IExtension[] extensions = extensionPoint.getExtensions();
-//				for (IExtension extension : extensions) {
-//					IConfigurationElement[] elements = extension.getConfigurationElements();
-//					for (IConfigurationElement element : elements) {
-//						if (element.getName().compareTo(ELEMENT_CONTEXT_STORE) == 0) {
-//							readStore(element);
-//						}
-//					}
-//				}
-//				extensionsRead = true;
-//			}
-//		}
-//
-//		private static void readStore(IConfigurationElement element) {
-//			// Currently disabled
-//			try {
-//				Object object = element.createExecutableExtension(BridgesExtensionPointReader.ATTR_CLASS);
-//				if (!(object instanceof AbstractContextStore)) {
-//					StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.PLUGIN_ID,
-//							"Could not load bridge: " + object.getClass().getCanonicalName() + " must implement "
-//									+ AbstractContextStructureBridge.class.getCanonicalName()));
-//					return;
-//				} else {
-//					ContextCorePlugin.contextStore = (AbstractContextStore) object;
-//				}
-//			} catch (CoreException e) {
-//				StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.PLUGIN_ID,
-//						"Could not load bridge extension", e));
-//			}
-//		}
-//	}
-
-	static class BridgesExtensionPointReader {
-
-		private static final String EXTENSION_ID_CONTEXT = "org.eclipse.mylyn.context.core.bridges"; //$NON-NLS-1$
-
-		private static final String EXTENSION_ID_INTERNAL_CONTEXT = "org.eclipse.mylyn.context.core.internalBridges"; //$NON-NLS-1$
-
-		private static final String EXTENSION_ID_RELATION_PROVIDERS = "org.eclipse.mylyn.context.core.relationProviders"; //$NON-NLS-1$
-
-		private static final String ELEMENT_STRUCTURE_BRIDGE = "structureBridge"; //$NON-NLS-1$
-
-		private static final String ELEMENT_RELATION_PROVIDER = "provider"; //$NON-NLS-1$
-
-		private static final String ELEMENT_SHADOW = "shadow"; //$NON-NLS-1$
-
-		private static final String ATTR_CLASS = "class"; //$NON-NLS-1$
-
-		private static final String ATTR_CONTENT_TYPE = "contentType"; //$NON-NLS-1$
-
-		private static final String ATTR_PARENT_CONTENT_TYPE = "parentContentType"; //$NON-NLS-1$
-
-		private static final String ATTR_BASE_CONTENT = "baseContent"; //$NON-NLS-1$
-
-		private static final String ATTR_SHADOWED_BY_CONTENT = "shadowedByContent"; //$NON-NLS-1$
-
-		private static boolean extensionsRead = false;
-
-		public static void initExtensions() {
-			if (!extensionsRead) {
-				IExtensionRegistry registry = Platform.getExtensionRegistry();
-
-				IExtensionPoint extensionPoint = registry.getExtensionPoint(BridgesExtensionPointReader.EXTENSION_ID_CONTEXT);
-				IExtension[] extensions = extensionPoint.getExtensions();
-				for (IExtension extension : extensions) {
-					IConfigurationElement[] elements = extension.getConfigurationElements();
-					for (IConfigurationElement element : elements) {
-						if (element.getName().compareTo(BridgesExtensionPointReader.ELEMENT_STRUCTURE_BRIDGE) == 0) {
-							readBridge(element);
-						}
-					}
-				}
-
-				// internal bridges
-				extensionPoint = registry.getExtensionPoint(BridgesExtensionPointReader.EXTENSION_ID_INTERNAL_CONTEXT);
-				extensions = extensionPoint.getExtensions();
-				for (IExtension extension : extensions) {
-					IConfigurationElement[] elements = extension.getConfigurationElements();
-					for (IConfigurationElement element : elements) {
-						if (element.getName().compareTo(BridgesExtensionPointReader.ELEMENT_SHADOW) == 0) {
-							readInternalBridge(element);
-						}
-					}
-				}
-
-				extensionPoint = registry.getExtensionPoint(BridgesExtensionPointReader.EXTENSION_ID_RELATION_PROVIDERS);
-				extensions = extensionPoint.getExtensions();
-				for (IExtension extension : extensions) {
-					IConfigurationElement[] elements = extension.getConfigurationElements();
-					for (IConfigurationElement element : elements) {
-						if (element.getName().compareTo(BridgesExtensionPointReader.ELEMENT_RELATION_PROVIDER) == 0) {
-							readRelationProvider(element);
-						}
-					}
-				}
-				extensionsRead = true;
-			}
-		}
-
-		private static void readBridge(IConfigurationElement element) {
-			try {
-				Object object = element.createExecutableExtension(BridgesExtensionPointReader.ATTR_CLASS);
-				if (!(object instanceof AbstractContextStructureBridge)) {
-					StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN,
-							"Could not load bridge: " + object.getClass().getCanonicalName() + " must implement " //$NON-NLS-1$ //$NON-NLS-2$
-									+ AbstractContextStructureBridge.class.getCanonicalName()));
-					return;
-				}
-
-				AbstractContextStructureBridge bridge = (AbstractContextStructureBridge) object;
-				if (element.getAttribute(BridgesExtensionPointReader.ATTR_PARENT_CONTENT_TYPE) != null) {
-					String parentContentType = element.getAttribute(BridgesExtensionPointReader.ATTR_PARENT_CONTENT_TYPE);
-					if (parentContentType != null) {
-						bridge.setParentContentType(parentContentType);
-					}
-				}
-				ContextCorePlugin.getDefault().addStructureBridge(bridge);
-			} catch (Throwable e) {
-				StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN,
-						"Could not load bridge extension", e)); //$NON-NLS-1$
-			}
-		}
-
-		private static void readInternalBridge(IConfigurationElement element) {
-			String baseContent = element.getAttribute(ATTR_BASE_CONTENT);
-			String shadowedByContent = element.getAttribute(ATTR_SHADOWED_BY_CONTENT);
-
-			if (baseContent == null || shadowedByContent == null) {
-				StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN,
-						"Ignoring bridge shadowing because of invalid extension point " //$NON-NLS-1$
-								+ BridgesExtensionPointReader.ELEMENT_STRUCTURE_BRIDGE, new Exception()));
-			}
-			ContextCorePlugin.getDefault().addShadowsContent(baseContent, shadowedByContent);
-		}
-
-		private static void readRelationProvider(IConfigurationElement element) {
-			try {
-				String contentType = element.getAttribute(BridgesExtensionPointReader.ATTR_CONTENT_TYPE);
-				AbstractRelationProvider relationProvider = (AbstractRelationProvider) element.createExecutableExtension(BridgesExtensionPointReader.ATTR_CLASS);
-				if (contentType != null) {
-					ContextCorePlugin.getDefault().addRelationProvider(contentType, relationProvider);
-				}
-			} catch (Throwable e) {
-				StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN,
-						"Could not load relation provider", e)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public Set<String> getChildContentTypes(String contentType) {
-		Set<String> contentTypes = childContentTypeMap.get(contentType);
-		if (contentTypes != null) {
-			return contentTypes;
-		} else {
-			return Collections.emptySet();
-		}
-	}
-
-	public IInteractionContextScaling getCommonContextScaling() {
-		return commonContextScaling;
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/DegreeOfInterest.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/DegreeOfInterest.java
deleted file mode 100644
index 28dd8e0..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/DegreeOfInterest.java
+++ /dev/null
@@ -1,195 +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.context.core;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.mylyn.context.core.IDegreeOfInterest;
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-// TODO: make package-visible
-public class DegreeOfInterest implements IDegreeOfInterest {
-
-	private final List<InteractionEvent> events = new ArrayList<InteractionEvent>();
-
-	private final Map<InteractionEvent.Kind, InteractionEvent> collapsedEvents = new HashMap<InteractionEvent.Kind, InteractionEvent>();
-
-	protected IInteractionContextScaling contextScaling;
-
-	private float edits = 0;
-
-	private float selections = 0;
-
-	private float commands = 0;
-
-	private float predictedBias = 0;
-
-	private float propagatedBias = 0;
-
-	private float manipulationBias = 0;
-
-	private final InteractionContext context;
-
-	private final int eventCountOnCreation;
-
-	public DegreeOfInterest(InteractionContext context, IInteractionContextScaling scaling) {
-		this(context, scaling, context.getUserEventCount());
-	}
-
-	public DegreeOfInterest(InteractionContext context, IInteractionContextScaling scaling, int eventCountOnCreation) {
-		this.context = context;
-		if (eventCountOnCreation <= 0) {
-			this.eventCountOnCreation = context.getUserEventCount();
-		} else {
-			this.eventCountOnCreation = eventCountOnCreation;
-		}
-		this.contextScaling = scaling;
-	}
-
-	/**
-	 * TODO: make package-visible
-	 */
-	public void addEvent(InteractionEvent event) {
-		events.add(event); // NOTE: was events.add(0, event);
-		InteractionEvent last = collapsedEvents.get(event.getKind());
-		if (last != null) {
-
-			int numCollapsedEvents = 1;
-			if (last instanceof AggregateInteractionEvent) {
-				numCollapsedEvents = ((AggregateInteractionEvent) last).getNumCollapsedEvents();
-			}
-
-			AggregateInteractionEvent aggregateEvent = new AggregateInteractionEvent(event.getKind(),
-					event.getStructureKind(), event.getStructureHandle(), event.getOriginId(), event.getNavigation(),
-					event.getDelta(), last.getInterestContribution() + event.getInterestContribution(), last.getDate(),
-					event.getEndDate(), numCollapsedEvents + 1, eventCountOnCreation);
-			collapsedEvents.put(event.getKind(), aggregateEvent);
-		} else {
-			collapsedEvents.put(event.getKind(), event);
-		}
-
-		updateEventState(event);
-	}
-
-	private void updateEventState(InteractionEvent event) {
-		switch (event.getKind()) {
-		case EDIT:
-			edits += event.getInterestContribution();
-			break;
-		case SELECTION:
-			selections += event.getInterestContribution();
-			break;
-		case COMMAND:
-			commands += event.getInterestContribution();
-			break;
-		case PREDICTION:
-			predictedBias += event.getInterestContribution();
-			break;
-		case PROPAGATION:
-			propagatedBias += event.getInterestContribution();
-			break;
-		case MANIPULATION:
-			manipulationBias += event.getInterestContribution();
-			break;
-		}
-	}
-
-	public float getValue() {
-		float value = getEncodedValue();
-		value += predictedBias;
-		value += propagatedBias;
-		return value;
-	}
-
-	public float getEncodedValue() {
-		float value = 0;
-		value += selections * contextScaling.get(InteractionEvent.Kind.SELECTION);
-		value += edits * contextScaling.get(InteractionEvent.Kind.EDIT);
-		value += commands * contextScaling.get(InteractionEvent.Kind.COMMAND);
-		value += manipulationBias;
-		value -= getDecayValue();
-		return value;
-	}
-
-	/**
-	 * @return a scaled decay count based on the number of events since the creation of this interest object
-	 */
-	public float getDecayValue() {
-		if (context != null) {
-			return (context.getUserEventCount() - eventCountOnCreation) * contextScaling.getDecay();
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Sums predicted and propagated values
-	 */
-	// TODO 3.3 improve method name
-	public boolean isPropagated() {
-		float value = selections * contextScaling.get(InteractionEvent.Kind.SELECTION) + edits
-				* contextScaling.get(InteractionEvent.Kind.EDIT);
-		return value <= 0 && propagatedBias > 0;
-	}
-
-	public boolean isPredicted() {
-		return (getValue() - predictedBias) <= 0 && predictedBias > 0;
-	}
-
-	public boolean isLandmark() {
-		return getValue() >= contextScaling.getLandmark();
-	}
-
-	public boolean isInteresting() {
-		return getValue() > contextScaling.getInteresting();
-	}
-
-	@Override
-	public String toString() {
-		return "(" + "selections: " + selections + ", edits: " + edits + ", commands: " + commands + ", predicted: " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-				+ predictedBias + ", propagated: " + propagatedBias + ", manipulation: " + manipulationBias + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	/**
-	 * TODO: make unmodifiable? Clients should not muck with this list.
-	 */
-	public List<InteractionEvent> getEvents() {
-		return events;
-	}
-
-	public List<InteractionEvent> getCollapsedEvents() {
-		return new ArrayList<InteractionEvent>(collapsedEvents.values());
-	}
-
-	// private void writeObject(ObjectOutputStream stream) throws IOException {
-	// stream.defaultWriteObject();
-	// stream.writeObject(events);
-	// }
-	//    
-	// @SuppressWarnings(value="unchecked")
-	// private void readObject(ObjectInputStream stream) throws IOException,
-	// ClassNotFoundException {
-	// stream.defaultReadObject();
-	// events = (List<InteractionEvent>)stream.readObject();
-	// init();
-	// for (InteractionEvent event : events) {
-	// updateEventState(event);
-	// }
-	// }
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/DegreeOfSeparation.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/DegreeOfSeparation.java
deleted file mode 100644
index 56fb79f..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/DegreeOfSeparation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.core;
-
-/**
- * @author Shawn Minto
- */
-public class DegreeOfSeparation implements IDegreeOfSeparation {
-
-	private final String label;
-
-	private final int degree;
-
-	public DegreeOfSeparation(String label, int degree) {
-		this.label = label;
-		this.degree = degree;
-	}
-
-	public String getLabel() {
-		return label;
-	}
-
-	public int getDegree() {
-		return degree;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IActiveSearchListener.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IActiveSearchListener.java
deleted file mode 100644
index ba910c8..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IActiveSearchListener.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.context.core;
-
-import java.util.List;
-
-/**
- * Interface for a listener of when the bugzilla search is completed
- * 
- * @author Shawn Minto
- */
-public interface IActiveSearchListener {
-	/**
-	 * Called when a background search is completed
-	 * 
-	 * @param l
-	 *            The list of objects that were returned by the search
-	 */
-	public void searchCompleted(List<?> l);
-
-	public boolean resultsGathered();
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IActiveSearchOperation.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IActiveSearchOperation.java
deleted file mode 100644
index 795af5c..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IActiveSearchOperation.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.context.core;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * @author Mik Kersten
- */
-public interface IActiveSearchOperation {
-
-	public void addListener(IActiveSearchListener listener);
-
-	public void removeListener(IActiveSearchListener listener);
-
-	public IStatus run(IProgressMonitor monitor);
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IContextStoreListener.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IContextStoreListener.java
deleted file mode 100644
index a369cc4..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IContextStoreListener.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.internal.context.core;
-
-import java.io.File;
-
-import org.eclipse.mylyn.context.core.IContextStore;
-
-/**
- * Notified of events where {@link IContextStore} is moved.
- * 
- * @author Mik Kersten
- */
-public interface IContextStoreListener {
-
-	/**
-	 * @since 3.0
-	 */
-	public abstract void contextStoreMoved(File newDirectory);
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IDegreeOfSeparation.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IDegreeOfSeparation.java
deleted file mode 100644
index 427aeab..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IDegreeOfSeparation.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.internal.context.core;
-
-/**
- * NOTE: not used in current Mylyn distribution, likely to change for 3.0.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public interface IDegreeOfSeparation {
-
-	public abstract String getLabel();
-
-	public abstract int getDegree();
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IInteractionContextReader.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IInteractionContextReader.java
deleted file mode 100644
index f98ea3f..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IInteractionContextReader.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.context.core;
-
-import java.io.File;
-
-/**
- * @author Mik Kersten
- * @since 3.0
- */
-public interface IInteractionContextReader {
-
-	public abstract InteractionContext readContext(String handleIdentifier, File file);
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IInteractionContextWriter.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IInteractionContextWriter.java
deleted file mode 100644
index e4118d5..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IInteractionContextWriter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.core;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.eclipse.mylyn.context.core.IInteractionContext;
-
-/**
- * @author Mik Kersten
- */
-public interface IInteractionContextWriter {
-
-	public abstract void setOutputStream(OutputStream outputStream);
-
-	public abstract void writeContextToStream(IInteractionContext context) throws IOException;
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IRelationsListener.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IRelationsListener.java
deleted file mode 100644
index 7ae5519..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/IRelationsListener.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.core;
-
-import org.eclipse.mylyn.context.core.IInteractionElement;
-
-/**
- * @author Mik Kersten
- */
-public interface IRelationsListener {
-
-	public void relationsChanged(IInteractionElement element);
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContext.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContext.java
deleted file mode 100644
index bbbe1fe..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContext.java
+++ /dev/null
@@ -1,319 +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.context.core;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- * @author David Green bug 257977 isInteresting
- */
-public class InteractionContext implements IInteractionContext {
-
-	private String handleIdentifier;
-
-	private final List<InteractionEvent> interactionHistory;
-
-	private final Map<String, InteractionContextElement> elementMap;
-
-	private final Map<String, IInteractionElement> landmarkMap;
-
-	/**
-	 * The last element that was added to this context.
-	 */
-	private InteractionContextElement activeNode;
-
-	private InteractionEvent lastEdgeEvent;
-
-	private InteractionContextElement lastEdgeNode;
-
-	private String contentLimitedTo;
-
-	private int numUserEvents;
-
-	private final IInteractionContextScaling contextScaling;
-
-	public InteractionContext(String id, IInteractionContextScaling scaling) {
-		this.handleIdentifier = id;
-		this.contextScaling = scaling;
-		this.interactionHistory = new ArrayList<InteractionEvent>();
-		this.elementMap = new HashMap<String, InteractionContextElement>();
-		this.landmarkMap = new HashMap<String, IInteractionElement>();
-
-		for (InteractionEvent event : interactionHistory) {
-			parseInteractionEvent(event);
-		}
-
-		for (InteractionContextElement node : elementMap.values()) {
-			if (node.getInterest().isLandmark()) {
-				landmarkMap.put(node.getHandleIdentifier(), node);
-			}
-		}
-
-		activeNode = lastEdgeNode;
-	}
-
-	public synchronized IInteractionElement parseEvent(InteractionEvent event) {
-		interactionHistory.add(event);
-		return parseInteractionEvent(event);
-	}
-
-	/**
-	 * Propagations and predictions are not added as edges
-	 */
-	private IInteractionElement parseInteractionEvent(InteractionEvent event) {
-		if (event.getStructureHandle() == null || event.getKind() == null) {
-			return null;
-		}
-
-		if (event.getKind().isUserEvent()) {
-			numUserEvents++;
-		}
-
-		InteractionContextElement node = elementMap.get(event.getStructureHandle());
-		if (node == null) {
-			if (event instanceof AggregateInteractionEvent) {
-				node = new InteractionContextElement(event.getStructureKind(), event.getStructureHandle(), this,
-						((AggregateInteractionEvent) event).getEventCountOnCreation());
-			} else {
-				node = new InteractionContextElement(event.getStructureKind(), event.getStructureHandle(), this);
-			}
-			elementMap.put(event.getStructureHandle(), node);
-		}
-
-		if (event.getKind().isUserEvent() && event instanceof AggregateInteractionEvent) {
-			// add the rest of the events that this event represented
-			numUserEvents += ((AggregateInteractionEvent) event).getNumCollapsedEvents() - 1;
-		}
-
-		if (event.getNavigation() != null
-				&& !event.getNavigation().equals("null") && lastEdgeEvent != null //$NON-NLS-1$
-				&& lastEdgeNode != null && lastEdgeEvent.getStructureHandle() != null
-				&& event.getKind() != InteractionEvent.Kind.PROPAGATION
-				&& event.getKind() != InteractionEvent.Kind.PREDICTION) {
-			IInteractionElement navigationSource = elementMap.get(lastEdgeEvent.getStructureHandle());
-			if (navigationSource != null) {
-				InteractionContextRelation edge = lastEdgeNode.getRelation(event.getStructureHandle());
-				if (edge == null) {
-					edge = new InteractionContextRelation(event.getStructureKind(), event.getNavigation(),
-							lastEdgeNode, node, this);
-					lastEdgeNode.addEdge(edge);
-				}
-				DegreeOfInterest doi = (DegreeOfInterest) edge.getInterest();
-				doi.addEvent(event);
-			}
-		}
-		DegreeOfInterest doi = (DegreeOfInterest) node.getInterest();
-
-		doi.addEvent(event);
-		if (doi.isLandmark()) {
-			landmarkMap.put(node.getHandleIdentifier(), node);
-		} else {
-			landmarkMap.remove(node.getHandleIdentifier()); // TODO: redundant
-		}
-		if (event.getKind().isUserEvent()) {
-			lastEdgeEvent = event;
-			lastEdgeNode = node;
-			activeNode = node;
-		}
-		return node;
-	}
-
-	public synchronized IInteractionElement get(String elementHandle) {
-		if (elementHandle == null) {
-			return null;
-		} else {
-			return elementMap.get(elementHandle);
-		}
-	}
-
-	public synchronized boolean isInteresting(String elementHandle) {
-		InteractionContextElement element = elementMap.get(elementHandle);
-		if (element != null) {
-			return element.getInterest().isInteresting();
-		}
-		return false;
-	}
-
-	public synchronized List<IInteractionElement> getInteresting() {
-		List<IInteractionElement> elements = new ArrayList<IInteractionElement>();
-		for (String key : elementMap.keySet()) {
-			InteractionContextElement info = elementMap.get(key);
-			if (info != null && info.getInterest().isInteresting()) {
-				elements.add(info);
-			}
-		}
-		return elements;
-	}
-
-	public synchronized List<IInteractionElement> getLandmarks() {
-		return new ArrayList<IInteractionElement>(landmarkMap.values());
-	}
-
-	public synchronized void updateElementHandle(IInteractionElement element, String newHandle) {
-		InteractionContextElement currElement = elementMap.remove(element.getHandleIdentifier());
-		if (currElement != null) {
-			currElement.setHandleIdentifier(newHandle);
-			elementMap.put(newHandle, currElement);
-		}
-	}
-
-	public synchronized IInteractionElement getActiveNode() {
-		return activeNode;
-	}
-
-	public synchronized void delete(Collection<IInteractionElement> nodes) {
-		// remove elements
-		Set<String> handlesToRemove = new HashSet<String>();
-		for (IInteractionElement node : nodes) {
-			handlesToRemove.add(node.getHandleIdentifier());
-			landmarkMap.remove(node.getHandleIdentifier());
-			elementMap.remove(node.getHandleIdentifier());
-
-			if (activeNode != null && node.getHandleIdentifier().equals(activeNode.getHandleIdentifier())) {
-				activeNode = null;
-			}
-		}
-
-		// remove events
-		List<InteractionEvent> eventsToRemove = new ArrayList<InteractionEvent>();
-		for (InteractionEvent event : interactionHistory) {
-			if (handlesToRemove.contains(event.getStructureHandle())) {
-				eventsToRemove.add(event);
-			}
-		}
-		interactionHistory.removeAll(eventsToRemove);
-	}
-
-	public synchronized void delete(IInteractionElement node) {
-		delete(Collections.singleton(node));
-	}
-
-	public synchronized List<IInteractionElement> getAllElements() {
-		return new ArrayList<IInteractionElement>(elementMap.values());
-	}
-
-	public String getHandleIdentifier() {
-		return handleIdentifier;
-	}
-
-	/**
-	 * @since 2.1
-	 */
-	public void setHandleIdentifier(String handle) {
-		this.handleIdentifier = handle;
-	}
-
-	@Override
-	public String toString() {
-		return handleIdentifier;
-	}
-
-	public synchronized void reset() {
-		elementMap.clear();
-		interactionHistory.clear();
-		landmarkMap.clear();
-		activeNode = null;
-		numUserEvents = 0;
-		lastEdgeEvent = null;
-		lastEdgeNode = null;
-	}
-
-	public synchronized int getUserEventCount() {
-		return numUserEvents;
-	}
-
-	public synchronized List<InteractionEvent> getInteractionHistory() {
-		return new ArrayList<InteractionEvent>(interactionHistory);
-	}
-
-	public synchronized void collapse() {
-		List<InteractionEvent> collapsedHistory = new ArrayList<InteractionEvent>();
-		for (InteractionContextElement node : elementMap.values()) {
-			if (!node.equals(activeNode)) {
-				collapseNode(collapsedHistory, node);
-			}
-		}
-		if (activeNode != null) {
-			collapseNode(collapsedHistory, activeNode);
-		}
-
-		interactionHistory.clear();
-		interactionHistory.addAll(collapsedHistory);
-	}
-
-	private void collapseNode(List<InteractionEvent> collapsedHistory, InteractionContextElement node) {
-		collapsedHistory.addAll(((DegreeOfInterest) node.getInterest()).getCollapsedEvents());
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		InteractionContext other = (InteractionContext) obj;
-		if (contentLimitedTo == null) {
-			if (other.contentLimitedTo != null) {
-				return false;
-			}
-		} else if (!contentLimitedTo.equals(other.contentLimitedTo)) {
-			return false;
-		}
-		if (handleIdentifier == null) {
-			if (other.handleIdentifier != null) {
-				return false;
-			}
-		} else if (!handleIdentifier.equals(other.handleIdentifier)) {
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((contentLimitedTo == null) ? 0 : contentLimitedTo.hashCode());
-		result = prime * result + ((handleIdentifier == null) ? 0 : handleIdentifier.hashCode());
-		return result;
-	}
-
-	public IInteractionContextScaling getScaling() {
-		return contextScaling;
-	}
-
-	public String getContentLimitedTo() {
-		return contentLimitedTo;
-	}
-
-	public void setContentLimitedTo(String contentLimitedTo) {
-		this.contentLimitedTo = contentLimitedTo;
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextElement.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextElement.java
deleted file mode 100644
index af72636..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextElement.java
+++ /dev/null
@@ -1,130 +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.context.core;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.mylyn.context.core.IDegreeOfInterest;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-
-/**
- * Can only have one edge from a node to a particular target.
- * 
- * @author Mik Kersten
- */
-public class InteractionContextElement implements IInteractionElement {
-
-	private String handle;
-
-	private String kind;
-
-	private final DegreeOfInterest interest;
-
-	private final InteractionContext context;
-
-	private final Map<String/* target handle */, InteractionContextRelation> edges = new HashMap<String, InteractionContextRelation>();
-
-	public InteractionContextElement(String kind, String elementHandle, InteractionContext context) {
-		this(kind, elementHandle, context, -1);
-	}
-
-	public InteractionContextElement(String kind, String elementHandle, InteractionContext context,
-			int eventCountOnCreation) {
-		if (elementHandle == null) {
-			throw new RuntimeException("malformed context: null handle"); //$NON-NLS-1$
-		}
-		interest = new DegreeOfInterest(context, context.getScaling(), eventCountOnCreation);
-		this.handle = elementHandle;
-		this.kind = kind;
-		this.context = context;
-	}
-
-	public String getHandleIdentifier() {
-		return handle;
-	}
-
-	public void setHandleIdentifier(String handle) {
-		this.handle = handle;
-	}
-
-	public String getContentType() {
-		return kind;
-	}
-
-	public void setKind(String kind) {
-		this.kind = kind;
-	}
-
-	public Collection<InteractionContextRelation> getRelations() {
-		return edges.values();
-	}
-
-	public InteractionContextRelation getRelation(String targetHandle) {
-		return edges.get(targetHandle);
-	}
-
-	/**
-	 * TODO: reduce visibility
-	 */
-	public void addEdge(InteractionContextRelation edge) {
-		edges.put(edge.getTarget().getHandleIdentifier(), edge);
-	}
-
-	public void clearRelations() {
-		edges.clear();
-	}
-
-	void removeEdge(IInteractionRelation edge) {
-		edges.remove(edge.getTarget().getHandleIdentifier());
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == null) {
-			return false;
-		}
-		if (this.getHandleIdentifier() == null) {
-			return false;
-		}
-		if (obj instanceof InteractionContextElement) {
-			InteractionContextElement node = (InteractionContextElement) obj;
-			return this.getHandleIdentifier().equals(node.getHandleIdentifier());
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		if (handle != null) {
-			return handle.hashCode();
-		} else {
-			return super.hashCode();
-		}
-	}
-
-	public IDegreeOfInterest getInterest() {
-		return interest;
-	}
-
-	public InteractionContext getContext() {
-		return context;
-	}
-
-	@Override
-	public String toString() {
-		return handle;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextExternalizer.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextExternalizer.java
deleted file mode 100644
index 887e96a..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextExternalizer.java
+++ /dev/null
@@ -1,186 +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.context.core;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-
-/**
- * @author Mik Kersten
- * @author Jevgeni Holodkov
- */
-public class InteractionContextExternalizer {
-
-	public static final String ELMNT_INTERACTION_HISTORY_OLD = "interactionEvent"; //$NON-NLS-1$
-
-	public static final String ELMNT_INTERACTION_HISTORY = "InteractionHistory"; //$NON-NLS-1$
-
-	public static final String ATR_STRUCTURE_KIND = "StructureKind"; //$NON-NLS-1$
-
-	public static final String ATR_STRUCTURE_HANDLE = "StructureHandle"; //$NON-NLS-1$
-
-	public static final String ATR_START_DATE = "StartDate"; //$NON-NLS-1$
-
-	public static final String ATR_ORIGIN_ID = "OriginId"; //$NON-NLS-1$
-
-	public static final String ATR_NAVIGATION = "Navigation"; //$NON-NLS-1$
-
-	public static final String ATR_KIND = "Kind"; //$NON-NLS-1$
-
-	public static final String ATR_INTEREST = "Interest"; //$NON-NLS-1$
-
-	public static final String ATR_NUM_EVENTS = "NumEvents"; //$NON-NLS-1$
-
-	public static final String ATR_CREATION_COUNT = "CreationCount"; //$NON-NLS-1$
-
-	public static final String ATR_DELTA = "Delta"; //$NON-NLS-1$
-
-	public static final String ATR_END_DATE = "EndDate"; //$NON-NLS-1$
-
-	public static final String ATR_ID = "Id"; //$NON-NLS-1$
-
-	public static final String ATR_VERSION = "Version"; //$NON-NLS-1$
-
-	static final String DATE_FORMAT_STRING = "yyyy-MM-dd HH:mm:ss.S z"; //$NON-NLS-1$
-
-	static String getFirstContextHandle(File sourceFile) throws CoreException {
-		try {
-			ZipFile zipFile = new ZipFile(sourceFile);
-			try {
-				for (Enumeration<?> e = zipFile.entries(); e.hasMoreElements();) {
-					ZipEntry entry = (ZipEntry) e.nextElement();
-					String name = entry.getName();
-					if (name.endsWith(InteractionContextManager.CONTEXT_FILE_EXTENSION_OLD)) {
-						try {
-							String decodedName = URLDecoder.decode(name,
-									InteractionContextManager.CONTEXT_FILENAME_ENCODING);
-							if (decodedName.length() > InteractionContextManager.CONTEXT_FILE_EXTENSION_OLD.length()) {
-								return decodedName.substring(0, decodedName.length()
-										- InteractionContextManager.CONTEXT_FILE_EXTENSION_OLD.length());
-							}
-						} catch (IllegalArgumentException ignored) {
-							// not a valid context entry
-						}
-					}
-				}
-				return null;
-			} finally {
-				zipFile.close();
-			}
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN,
-					"Could not get context handle from " + sourceFile, e)); //$NON-NLS-1$
-		}
-	}
-
-	public void writeContextToXml(IInteractionContext context, File file) throws IOException {
-		writeContextToXml(context, file, new SaxContextWriter());
-	}
-
-	/**
-	 * Public for testing.
-	 * 
-	 * @throws IOException
-	 *             if writing of context fails
-	 */
-	public void writeContextToXml(IInteractionContext context, File file, IInteractionContextWriter writer)
-			throws IOException {
-		if (context.getInteractionHistory().isEmpty()) {
-			return;
-		}
-
-		FileOutputStream fileOutputStream = new FileOutputStream(file);
-		try {
-			ZipOutputStream outputStream = new ZipOutputStream(fileOutputStream);
-			try {
-				writeContext(context, outputStream, writer);
-			} finally {
-				outputStream.close();
-			}
-		} finally {
-			fileOutputStream.close();
-		}
-	}
-
-	public void writeContext(IInteractionContext context, ZipOutputStream outputStream) throws IOException {
-		writeContext(context, outputStream, new SaxContextWriter());
-	}
-
-	/**
-	 * For testing
-	 */
-	public void writeContext(IInteractionContext context, ZipOutputStream outputStream, IInteractionContextWriter writer)
-			throws IOException {
-		String handleIdentifier = context.getHandleIdentifier();
-		String encoded = URLEncoder.encode(handleIdentifier, InteractionContextManager.CONTEXT_FILENAME_ENCODING);
-		ZipEntry zipEntry = new ZipEntry(encoded + InteractionContextManager.CONTEXT_FILE_EXTENSION_OLD);
-		outputStream.putNextEntry(zipEntry);
-		outputStream.setMethod(ZipOutputStream.DEFLATED);
-
-		writer.setOutputStream(outputStream);
-		writer.writeContextToStream(context);
-		outputStream.flush();
-		outputStream.closeEntry();
-	}
-
-	public IInteractionContext readContextFromXml(String handleIdentifier, File fromFile,
-			IInteractionContextScaling scaling) {
-		return readContextFromXml(handleIdentifier, fromFile, new SaxContextReader(), scaling);
-	}
-
-	/**
-	 * Public for testing
-	 */
-	public IInteractionContext readContextFromXml(String handleIdentifier, File fromFile,
-			IInteractionContextReader reader, IInteractionContextScaling scaling) {
-		try {
-			if (!fromFile.exists()) {
-				return null;
-			} else {
-				if (reader instanceof SaxContextReader) {
-					((SaxContextReader) reader).setContextScaling(scaling);
-				}
-
-				InteractionContext context = reader.readContext(handleIdentifier, fromFile);
-				if (context == null) {
-					String firstHandle = getFirstContextHandle(fromFile);
-					if (firstHandle != null && !firstHandle.equals(handleIdentifier)) {
-						context = reader.readContext(firstHandle, fromFile);
-						if (context != null) {
-							context.setHandleIdentifier(handleIdentifier);
-						}
-					}
-				}
-				return context;
-			}
-		} catch (Exception e) {
-			// TODO: propagate exception instead?
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN, "Could not read: " //$NON-NLS-1$
-					+ fromFile.getAbsolutePath(), e));
-		}
-		return null;
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextManager.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextManager.java
deleted file mode 100644
index b0965c6..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextManager.java
+++ /dev/null
@@ -1,1451 +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.context.core;
-
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ILock;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionContextManager;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-import org.eclipse.mylyn.context.core.ContextChangeEvent.ContextChangeKind;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.core.InteractionEvent.Kind;
-
-/**
- * This is the core class resposible for context management.
- * 
- * @author Mik Kersten
- * @author Jevgeni Holodkov
- * @author Shawn Minto
- */
-public class InteractionContextManager implements IInteractionContextManager {
-
-	public static final String SOURCE_ID_DECAY = "org.eclipse.mylyn.core.model.interest.decay"; //$NON-NLS-1$
-
-	public static final String CONTEXT_FILE_EXTENSION_OLD = ".xml"; //$NON-NLS-1$
-
-	public static final String CONTEXT_FILE_EXTENSION = ".xml.zip"; //$NON-NLS-1$
-
-	public static final String CONTAINMENT_PROPAGATION_ID = "org.eclipse.mylyn.core.model.edges.containment"; //$NON-NLS-1$
-
-	/**
-	 * @deprecated not used anymore (used in version < 1.0.1)
-	 */
-	@Deprecated
-	public static final String OLD_CONTEXT_HISTORY_FILE_NAME = "context-history"; //$NON-NLS-1$
-
-	public static final String CONTEXT_HISTORY_FILE_NAME = "activity"; //$NON-NLS-1$
-
-	public static final String CONTEXT_FILENAME_ENCODING = "UTF-8"; //$NON-NLS-1$
-
-	public static final String PROPERTY_CONTEXT_ACTIVE = "org.eclipse.mylyn.context.core.context.active"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_STRUCTUREKIND_ACTIVATION = "activation"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_STRUCTUREKIND_TIMING = "timing"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_STRUCTUREKIND_WORKINGSET = "workingset"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_STRUCTUREKIND_LIFECYCLE = "lifecycle"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_ORIGINID_USER = "user"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_ORIGINID_OS = "os"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_ORIGINID_WORKBENCH = "org.eclipse.ui.workbench"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_HANDLE_NONE = "none"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_DELTA_STOPPED = "stopped"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_DELTA_STARTED = "started"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_DELTA_REMOVED = "removed"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_DELTA_ADDED = "added"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_DELTA_ACTIVATED = "activated"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_DELTA_DEACTIVATED = "deactivated"; //$NON-NLS-1$
-
-	// TODO: move constants
-	private static final int MAX_PROPAGATION = 17; // TODO: parametrize this
-
-	private static final ILock metaContextLock = Job.getJobManager().newLock();
-
-	private static final String PREFERENCE_ATTENTION_MIGRATED = "mylyn.attention.migrated"; //$NON-NLS-1$
-
-	private static final String SOURCE_ID_DECAY_CORRECTION = "org.eclipse.mylyn.core.model.interest.decay.correction"; //$NON-NLS-1$
-
-	private static final String SOURCE_ID_MODEL_ERROR = "org.eclipse.mylyn.core.model.interest.propagation"; //$NON-NLS-1$
-
-	private static final String SOURCE_ID_MODEL_PROPAGATION = "org.eclipse.mylyn.core.model.interest.propagation"; //$NON-NLS-1$
-
-	private boolean activationHistorySuppressed = false;
-
-	private final CompositeInteractionContext activeContext = new CompositeInteractionContext(
-			ContextCore.getCommonContextScaling());
-
-	private InteractionContext activityMetaContext = null;
-
-	private final List<AbstractContextListener> activityMetaContextListeners = new CopyOnWriteArrayList<AbstractContextListener>();
-
-	private boolean contextCapturePaused = false;
-
-	private final List<AbstractContextListener> contextListeners = new CopyOnWriteArrayList<AbstractContextListener>();
-
-	private final List<String> errorElementHandles = new ArrayList<String>();
-
-	/**
-	 * Global contexts do not participate in the regular activation lifecycle but are instead activated and deactivated
-	 * by clients.
-	 */
-	private final Collection<IInteractionContext> globalContexts = new HashSet<IInteractionContext>();
-
-	private int numInterestingErrors = 0;
-
-	private boolean suppressListenerNotification = false;
-
-	private final List<AbstractContextListener> waitingContextListeners = new ArrayList<AbstractContextListener>();
-
-	private final LocalContextStore contextStore;
-
-	public InteractionContextManager(LocalContextStore contextStore) {
-		this.contextStore = contextStore;
-	}
-
-	public void activateContext(String handleIdentifier) {
-		try {
-			IInteractionContext loadedContext = activeContext.getContextMap().get(handleIdentifier);
-			final IInteractionContext context;
-			if (loadedContext == null) {
-				context = contextStore.loadContext(handleIdentifier);
-			} else {
-				context = loadedContext;
-			}
-
-			for (final AbstractContextListener listener : contextListeners) {
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable e) {
-						StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-								+ listener.getClass(), e));
-					}
-
-					public void run() throws Exception {
-						ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.PRE_ACTIVATED,
-								context.getHandleIdentifier(), context, null);
-						listener.contextChanged(event);
-					}
-				});
-			}
-
-			suppressListenerNotification = true;
-			internalActivateContext(context);
-			suppressListenerNotification = false;
-			contextListeners.addAll(waitingContextListeners);
-			waitingContextListeners.clear();
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN, "Could not activate context", t)); //$NON-NLS-1$
-		}
-	}
-
-	public void addActivityMetaContextListener(AbstractContextListener listener) {
-		activityMetaContextListeners.add(listener);
-	}
-
-	/**
-	 * Collapse activity events of like handle into one event Grouped by hour.
-	 */
-	public void addAttentionEvents(Map<String, List<InteractionEvent>> attention, InteractionContext temp) {
-		try {
-			for (String handle : attention.keySet()) {
-				List<InteractionEvent> activityEvents = attention.get(handle);
-				List<InteractionEvent> collapsedEvents = new ArrayList<InteractionEvent>();
-				if (activityEvents.size() > 1) {
-					collapsedEvents = collapseEventsByHour(activityEvents);
-				} else if (activityEvents.size() == 1) {
-					if (activityEvents.get(0).getEndDate().getTime() - activityEvents.get(0).getDate().getTime() > 0) {
-						collapsedEvents.add(activityEvents.get(0));
-					}
-				}
-				if (!collapsedEvents.isEmpty()) {
-					for (InteractionEvent collapsedEvent : collapsedEvents) {
-						temp.parseEvent(collapsedEvent);
-					}
-				}
-				activityEvents.clear();
-			}
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN,
-					"Error during meta activity collapse", e)); //$NON-NLS-1$
-		}
-	}
-
-	@SuppressWarnings("deprecation")
-	public void addErrorPredictedInterest(String handle, String kind, boolean notify) {
-		if (numInterestingErrors > ((InteractionContextScaling) ContextCore.getCommonContextScaling()).getMaxNumInterestingErrors()
-				|| activeContext.getContextMap().isEmpty()) {
-			return;
-		}
-		InteractionEvent errorEvent = new InteractionEvent(InteractionEvent.Kind.PROPAGATION, kind, handle,
-				SOURCE_ID_MODEL_ERROR,
-				((InteractionContextScaling) ContextCore.getCommonContextScaling()).getErrorInterest());
-		processInteractionEvent(errorEvent, true);
-		errorElementHandles.add(handle);
-		numInterestingErrors++;
-	}
-
-	public void addGlobalContext(IInteractionContext context) {
-		globalContexts.add(context);
-	}
-
-	private IInteractionElement addInteractionEvent(IInteractionContext interactionContext, InteractionEvent event) {
-		if (interactionContext instanceof CompositeInteractionContext) {
-			return ((CompositeInteractionContext) interactionContext).addEvent(event);
-		} else if (interactionContext instanceof InteractionContext) {
-			return ((InteractionContext) interactionContext).parseEvent(event);
-		} else {
-			return null;
-		}
-	}
-
-	public void addListener(AbstractContextListener listener) {
-		Assert.isNotNull(listener);
-		if (suppressListenerNotification && !waitingContextListeners.contains(listener)) {
-			waitingContextListeners.add(listener);
-		} else {
-			if (!contextListeners.contains(listener)) {
-				contextListeners.add(listener);
-			}
-		}
-	}
-
-	protected void checkForLandmarkDeltaAndNotify(float previousInterest, final IInteractionElement node,
-			final IInteractionContext context) {
-		// TODO: don't call interestChanged if it's a landmark?
-		AbstractContextStructureBridge bridge = ContextCorePlugin.getDefault()
-				.getStructureBridge(node.getContentType());
-		if (bridge.canBeLandmark(node.getHandleIdentifier())) {
-			if (previousInterest >= ContextCore.getCommonContextScaling().getLandmark()
-					&& !node.getInterest().isLandmark()) {
-				for (final AbstractContextListener listener : contextListeners) {
-					SafeRunner.run(new ISafeRunnable() {
-						public void handleException(Throwable e) {
-							StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN,
-									"Listener failed: " //$NON-NLS-1$
-											+ listener.getClass(), e));
-						}
-
-						public void run() throws Exception {
-							List<IInteractionElement> changed = new ArrayList<IInteractionElement>(1);
-							changed.add(node);
-							ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.LANDMARKS_REMOVED,
-									context.getHandleIdentifier(), context, changed);
-							listener.contextChanged(event);
-						}
-					});
-				}
-			} else if (previousInterest < ContextCore.getCommonContextScaling().getLandmark()
-					&& node.getInterest().isLandmark()) {
-				for (final AbstractContextListener listener : contextListeners) {
-					SafeRunner.run(new ISafeRunnable() {
-						public void handleException(Throwable e) {
-							StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN,
-									"Listener failed: " //$NON-NLS-1$
-											+ listener.getClass(), e));
-						}
-
-						public void run() throws Exception {
-							List<IInteractionElement> changed = new ArrayList<IInteractionElement>(1);
-							changed.add(node);
-							ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.LANDMARKS_ADDED,
-									context.getHandleIdentifier(), context, changed);
-							listener.contextChanged(event);
-						}
-					});
-				}
-			}
-		}
-	}
-
-	public InteractionContext collapseActivityMetaContext(InteractionContext context) {
-		Map<String, List<InteractionEvent>> attention = new HashMap<String, List<InteractionEvent>>();
-		InteractionContext tempContext = new InteractionContext(InteractionContextManager.CONTEXT_HISTORY_FILE_NAME,
-				ContextCore.getCommonContextScaling());
-		for (InteractionEvent event : context.getInteractionHistory()) {
-
-			if (event.getKind().equals(InteractionEvent.Kind.ATTENTION)
-					&& event.getDelta().equals(InteractionContextManager.ACTIVITY_DELTA_ADDED)) {
-				if (event.getStructureHandle() == null || event.getStructureHandle().equals("")) { //$NON-NLS-1$
-					continue;
-				}
-				List<InteractionEvent> interactionEvents = attention.get(event.getStructureHandle());
-				if (interactionEvents == null) {
-					interactionEvents = new ArrayList<InteractionEvent>();
-					attention.put(event.getStructureHandle(), interactionEvents);
-				}
-				interactionEvents.add(event);
-			} else {
-				if (!attention.isEmpty()) {
-					addAttentionEvents(attention, tempContext);
-					attention.clear();
-				}
-				tempContext.parseEvent(event);
-			}
-		}
-
-		if (!attention.isEmpty()) {
-			addAttentionEvents(attention, tempContext);
-		}
-
-		return tempContext;
-	}
-
-	/** public for testing * */
-	// TODO: simplify
-	public List<InteractionEvent> collapseEventsByHour(List<InteractionEvent> eventsToCollapse) {
-		List<InteractionEvent> collapsedEvents = new ArrayList<InteractionEvent>();
-		Iterator<InteractionEvent> itr = eventsToCollapse.iterator();
-		InteractionEvent firstEvent = itr.next();
-		long total = 0;
-		Calendar t0 = Calendar.getInstance();
-		Calendar t1 = Calendar.getInstance();
-		while (itr.hasNext()) {
-
-			t0.setTime(firstEvent.getDate());
-			t0.set(Calendar.MINUTE, 0);
-			t0.set(Calendar.MILLISECOND, 0);
-
-			t1.setTime(firstEvent.getDate());
-			t1.set(Calendar.MINUTE, t1.getMaximum(Calendar.MINUTE));
-			t1.set(Calendar.MILLISECOND, t1.getMaximum(Calendar.MILLISECOND));
-
-			InteractionEvent nextEvent = itr.next();
-			if (t0.getTime().compareTo(nextEvent.getDate()) <= 0 && t1.getTime().compareTo(nextEvent.getDate()) >= 0) {
-				// Collapsible event
-				if (total == 0) {
-					total += firstEvent.getEndDate().getTime() - firstEvent.getDate().getTime();
-				}
-				total += nextEvent.getEndDate().getTime() - nextEvent.getDate().getTime();
-
-				if (!itr.hasNext()) {
-					if (total != 0) {
-						Date newEndDate = new Date(firstEvent.getDate().getTime() + total);
-						InteractionEvent aggregateEvent = new InteractionEvent(firstEvent.getKind(),
-								firstEvent.getStructureKind(), firstEvent.getStructureHandle(),
-								firstEvent.getOriginId(), firstEvent.getNavigation(), firstEvent.getDelta(), 1f,
-								firstEvent.getDate(), newEndDate);
-						collapsedEvents.add(aggregateEvent);
-						total = 0;
-					}
-				}
-
-			} else {
-				// Next event isn't collapsible, add collapsed if exists
-				if (total != 0) {
-					Date newEndDate = new Date(firstEvent.getDate().getTime() + total);
-					InteractionEvent aggregateEvent = new InteractionEvent(firstEvent.getKind(),
-							firstEvent.getStructureKind(), firstEvent.getStructureHandle(), firstEvent.getOriginId(),
-							firstEvent.getNavigation(), firstEvent.getDelta(), 1f, firstEvent.getDate(), newEndDate);
-					collapsedEvents.add(aggregateEvent);
-					total = 0;
-				} else {
-					collapsedEvents.add(firstEvent);
-					if (!itr.hasNext()) {
-						collapsedEvents.add(nextEvent);
-					}
-				}
-
-				firstEvent = nextEvent;
-			}
-
-		}
-
-		return collapsedEvents;
-	}
-
-	public void deactivateAllContexts() {
-		Set<String> handles = new HashSet<String>(activeContext.getContextMap().keySet());
-		for (String handleIdentifier : handles) {
-			deactivateContext(handleIdentifier);
-		}
-	}
-
-	public void deactivateContext(String handleIdentifier) {
-		try {
-			System.setProperty(InteractionContextManager.PROPERTY_CONTEXT_ACTIVE, Boolean.FALSE.toString());
-
-			final IInteractionContext context = activeContext.getContextMap().get(handleIdentifier);
-			if (context != null) {
-				contextStore.saveContext(context);
-				activeContext.getContextMap().remove(handleIdentifier);
-
-				setContextCapturePaused(true);
-				for (final AbstractContextListener listener : contextListeners) {
-					SafeRunner.run(new ISafeRunnable() {
-						public void handleException(Throwable e) {
-							StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN,
-									"Listener failed: " //$NON-NLS-1$
-											+ listener.getClass(), e));
-						}
-
-						public void run() throws Exception {
-							ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.DEACTIVATED,
-									context.getHandleIdentifier(), context, null);
-							listener.contextChanged(event);
-						}
-					});
-				}
-				setContextCapturePaused(false);
-			}
-			if (!activationHistorySuppressed) {
-				processActivityMetaContextEvent(new InteractionEvent(InteractionEvent.Kind.COMMAND,
-						InteractionContextManager.ACTIVITY_STRUCTUREKIND_ACTIVATION, handleIdentifier,
-						InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH, null,
-						InteractionContextManager.ACTIVITY_DELTA_DEACTIVATED, 1f));
-			}
-//			saveActivityMetaContext();
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN, "Could not deactivate context", t)); //$NON-NLS-1$
-		}
-	}
-
-	public void deleteElement(IInteractionElement element) {
-		delete(element, getActiveContext());
-		notifyElementsDeleted(getActiveContext(), Arrays.asList(new IInteractionElement[] { element }));
-	}
-
-	public void deleteElements(Collection<IInteractionElement> elements) {
-		Assert.isNotNull(elements);
-		IInteractionContext context = getActiveContext();
-		if (elements.size() == 0 || context == null) {
-			return;
-		}
-
-		context.delete(elements);
-
-		notifyElementsDeleted(getActiveContext(), new ArrayList<IInteractionElement>(elements));
-	}
-
-	private void delete(IInteractionElement element, IInteractionContext context) {
-		if (element == null || context == null) {
-			return;
-		}
-		context.delete(element);
-	}
-
-	public void deleteContext(final String handleIdentifier) {
-		final IInteractionContext context = activeContext.getContextMap().get(handleIdentifier);
-
-		setContextCapturePaused(true);
-		eraseContext(handleIdentifier);
-
-		contextStore.deleteContext(handleIdentifier);
-		for (final AbstractContextListener listener : contextListeners) {
-			SafeRunner.run(new ISafeRunnable() {
-				public void handleException(Throwable e) {
-					StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-							+ listener.getClass(), e));
-				}
-
-				public void run() throws Exception {
-					ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.CLEARED, handleIdentifier,
-							context, null);
-					listener.contextChanged(event);
-				}
-			});
-		}
-		setContextCapturePaused(false);
-	}
-
-	private float ensureIsInteresting(IInteractionContext interactionContext, String contentType, String handle,
-			IInteractionElement previous, float previousInterest) {
-		float decayOffset = 0;
-		if (previousInterest < 0) { // reset interest if not interesting
-			decayOffset = (-1) * (previous.getInterest().getValue());
-			addInteractionEvent(interactionContext, new InteractionEvent(InteractionEvent.Kind.MANIPULATION,
-					contentType, handle, SOURCE_ID_DECAY_CORRECTION, decayOffset));
-		}
-		return decayOffset;
-	}
-
-	private void eraseContext(String handleIdentifier) {
-		InteractionContext context = activeContext.getContextMap().get(handleIdentifier);
-		if (context == null) {
-			return;
-		}
-		activeContext.getContextMap().remove(context);
-		context.reset();
-	}
-
-	public IInteractionContext getActiveContext() {
-		return activeContext;
-	}
-
-	public Collection<InteractionContext> getActiveContexts() {
-		return Collections.unmodifiableCollection(activeContext.getContextMap().values());
-	}
-
-	public IInteractionElement getActiveElement() {
-		if (activeContext != null) {
-			return activeContext.getActiveNode();
-		} else {
-			return null;
-		}
-	}
-
-	public Set<IInteractionElement> getActiveLandmarks() {
-		List<IInteractionElement> allLandmarks = activeContext.getLandmarks();
-		Set<IInteractionElement> acceptedLandmarks = new HashSet<IInteractionElement>();
-		for (IInteractionElement node : allLandmarks) {
-			AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(node.getContentType());
-
-			if (bridge.canBeLandmark(node.getHandleIdentifier())) {
-				acceptedLandmarks.add(node);
-			}
-		}
-		return acceptedLandmarks;
-	}
-
-	public InteractionContext getActivityMetaContext() {
-		try {
-			metaContextLock.acquire();
-			if (activityMetaContext == null) {
-				loadActivityMetaContext();
-			}
-		} finally {
-			metaContextLock.release();
-		}
-		return activityMetaContext;
-	}
-
-	/**
-	 * Returns the highest interest context. TODO: refactor this into better multiple context support
-	 */
-	@Deprecated
-	public String getDominantContextHandleForElement(IInteractionElement node) {
-		IInteractionElement dominantNode = null;
-		if (node instanceof CompositeContextElement) {
-			CompositeContextElement compositeNode = (CompositeContextElement) node;
-			if (compositeNode.getNodes().isEmpty()) {
-				return null;
-			}
-			dominantNode = (IInteractionElement) compositeNode.getNodes().toArray()[0];
-
-			for (IInteractionElement concreteNode : compositeNode.getNodes()) {
-				if (dominantNode != null
-						&& dominantNode.getInterest().getValue() < concreteNode.getInterest().getValue()) {
-					dominantNode = concreteNode;
-				}
-			}
-		} else if (node instanceof InteractionContextElement) {
-			dominantNode = node;
-		}
-		if (dominantNode != null) {
-			return ((InteractionContextElement) dominantNode).getContext().getHandleIdentifier();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @return null if the element handle is null or if the element is not found in the active task context.
-	 */
-	public IInteractionElement getElement(String elementHandle) {
-		if (activeContext != null && elementHandle != null) {
-			return activeContext.get(elementHandle);
-		} else {
-			return null;
-		}
-	}
-
-	public Collection<IInteractionContext> getGlobalContexts() {
-		return globalContexts;
-	}
-
-	public Collection<IInteractionElement> getActiveDocuments() {
-		return getActiveDocuments(activeContext);
-	}
-
-	public Set<IInteractionElement> getActiveDocuments(IInteractionContext context) {
-		Set<IInteractionElement> set = new HashSet<IInteractionElement>();
-		if (context == null) {
-			return set;
-		} else {
-			List<IInteractionElement> allIntersting = context.getInteresting();
-			for (IInteractionElement node : allIntersting) {
-				if (ContextCore.getStructureBridge(node.getContentType()).isDocument(node.getHandleIdentifier())) {
-					set.add(node);
-				}
-			}
-			return set;
-		}
-	}
-
-	/**
-	 * For testing.
-	 */
-	public List<AbstractContextListener> getListeners() {
-		return Collections.unmodifiableList(contextListeners);
-	}
-
-	/**
-	 * Lazily loads set of handles with corresponding contexts.
-	 */
-	public boolean hasContext(String handleIdentifier) {
-		if (handleIdentifier == null) {
-			return false;
-		}
-
-		if (getActiveContext() != null && handleIdentifier.equals(getActiveContext().getHandleIdentifier())) {
-			return !getActiveContext().getAllElements().isEmpty();
-		} else {
-			return contextStore.hasContext(handleIdentifier);
-		}
-	}
-
-	/**
-	 * Public for testing, activate via handle
-	 */
-	public void internalActivateContext(final IInteractionContext context) {
-		Assert.isTrue(context instanceof InteractionContext, "Must provide a concrete InteractionContext"); //$NON-NLS-1$
-
-		System.setProperty(InteractionContextManager.PROPERTY_CONTEXT_ACTIVE, Boolean.TRUE.toString());
-		activeContext.getContextMap().put(context.getHandleIdentifier(), (InteractionContext) context);
-//		if (contextFiles != null) {
-//			contextFiles.add(getFileForContext(context.getHandleIdentifier()));
-//		}
-		if (!activationHistorySuppressed) {
-			processActivityMetaContextEvent(new InteractionEvent(InteractionEvent.Kind.COMMAND,
-					InteractionContextManager.ACTIVITY_STRUCTUREKIND_ACTIVATION, context.getHandleIdentifier(),
-					InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH, null,
-					InteractionContextManager.ACTIVITY_DELTA_ACTIVATED, 1f));
-		}
-
-		for (final AbstractContextListener listener : contextListeners) {
-			SafeRunner.run(new ISafeRunnable() {
-				public void handleException(Throwable e) {
-					StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-							+ listener.getClass(), e));
-				}
-
-				public void run() throws Exception {
-					ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.ACTIVATED,
-							context.getHandleIdentifier(), context, null);
-					listener.contextChanged(event);
-				}
-			});
-		}
-	}
-
-	public List<IInteractionElement> internalProcessInteractionEvent(InteractionEvent event,
-			IInteractionContext interactionContext, boolean propagateToParents) {
-		if (contextCapturePaused || InteractionEvent.Kind.COMMAND.equals(event.getKind())
-				|| suppressListenerNotification) {
-			return Collections.emptyList();
-		}
-
-		IInteractionElement previous = interactionContext.get(event.getStructureHandle());
-		float previousInterest = 0;
-		boolean previouslyPredicted = false;
-		boolean previouslyPropagated = false;
-		float decayOffset = 0;
-		if (previous != null) {
-			previousInterest = previous.getInterest().getValue();
-			previouslyPredicted = previous.getInterest().isPredicted();
-			previouslyPropagated = previous.getInterest().isPropagated();
-		}
-		if (event.getKind().isUserEvent()) {
-			decayOffset = ensureIsInteresting(interactionContext, event.getStructureKind(), event.getStructureHandle(),
-					previous, previousInterest);
-		}
-		IInteractionElement element = addInteractionEvent(interactionContext, event);
-		List<IInteractionElement> interestDelta = new ArrayList<IInteractionElement>();
-		if (propagateToParents && !event.getKind().equals(InteractionEvent.Kind.MANIPULATION)) {
-			Set<String> handles = new HashSet<String>();
-			handles.add(element.getHandleIdentifier());
-
-			propegateInterestToParents(interactionContext, event.getKind(), element, previousInterest, decayOffset, 1,
-					interestDelta, event.getOriginId(), null, handles);
-		}
-		if (event.getKind().isUserEvent() && interactionContext instanceof CompositeInteractionContext) {
-			((CompositeInteractionContext) interactionContext).setActiveElement(element);
-		}
-
-		if (isInterestDelta(previousInterest, previouslyPredicted, previouslyPropagated, element)) {
-			interestDelta.add(element);
-		}
-
-		checkForLandmarkDeltaAndNotify(previousInterest, element, interactionContext);
-		return interestDelta;
-	}
-
-	public boolean isActivationHistorySuppressed() {
-		return activationHistorySuppressed;
-	}
-
-	// TODO consider removing check for pause and making clients explicitly determine this, 
-	// or provide a separate method
-	public boolean isContextActive() {
-		return !contextCapturePaused && activeContext.getContextMap().values().size() > 0;
-	}
-
-	@Deprecated
-	public boolean isContextActivePropertySet() {
-		return Boolean.parseBoolean(System.getProperty(InteractionContextManager.PROPERTY_CONTEXT_ACTIVE));
-	}
-
-	public boolean isContextCapturePaused() {
-		return contextCapturePaused;
-	}
-
-	protected boolean isInterestDelta(float previousInterest, boolean previouslyPredicted,
-			boolean previouslyPropagated, IInteractionElement node) {
-		float currentInterest = node.getInterest().getValue();
-		if (previousInterest <= 0 && currentInterest > 0) {
-			return true;
-		} else if (previousInterest > 0 && currentInterest <= 0) {
-			return true;
-		} else if (currentInterest > 0 && previouslyPredicted && !node.getInterest().isPredicted()) {
-			return true;
-		} else if (currentInterest > 0 && previouslyPropagated && !node.getInterest().isPropagated()) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public void loadActivityMetaContext() {
-		if (contextStore != null) {
-			for (final AbstractContextListener listener : activityMetaContextListeners) {
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable e) {
-						StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-								+ listener.getClass(), e));
-					}
-
-					public void run() throws Exception {
-						ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.PRE_ACTIVATED,
-								InteractionContextManager.CONTEXT_HISTORY_FILE_NAME, null, null);
-						listener.contextChanged(event);
-					}
-				});
-			}
-
-			try {
-				metaContextLock.acquire();
-
-				activityMetaContext = (InteractionContext) contextStore.loadContext(InteractionContextManager.CONTEXT_HISTORY_FILE_NAME);
-				if (activityMetaContext == null || activityMetaContext.getInteractionHistory().isEmpty()) {
-					File contextHistory = contextStore.getFileForContext(InteractionContextManager.CONTEXT_HISTORY_FILE_NAME);
-					if (restoreSnapshot(contextHistory)) {
-						activityMetaContext = (InteractionContext) contextStore.loadContext(InteractionContextManager.CONTEXT_HISTORY_FILE_NAME);
-					}
-				}
-
-				if (activityMetaContext == null) {
-					resetActivityMetaContext();
-				} else if (!ContextCorePlugin.getDefault().getPluginPreferences().getBoolean(
-						PREFERENCE_ATTENTION_MIGRATED)) {
-					activityMetaContext = migrateLegacyActivity(activityMetaContext);
-					saveActivityMetaContext();
-					ContextCorePlugin.getDefault().getPluginPreferences().setValue(PREFERENCE_ATTENTION_MIGRATED, true);
-					ContextCorePlugin.getDefault().savePluginPreferences();
-				}
-			} finally {
-				metaContextLock.release();
-			}
-
-			for (final AbstractContextListener listener : activityMetaContextListeners) {
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable e) {
-						StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-								+ listener.getClass(), e));
-					}
-
-					public void run() throws Exception {
-						ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.ACTIVATED,
-								activityMetaContext.getHandleIdentifier(), activityMetaContext, null);
-						listener.contextChanged(event);
-					}
-				});
-			}
-		} else {
-			resetActivityMetaContext();
-			StatusHandler.log(new Status(IStatus.INFO, ContextCorePlugin.ID_PLUGIN,
-					"No context store installed, not restoring activity context.")); //$NON-NLS-1$
-		}
-	}
-
-	public void saveActivityMetaContext() {
-		if (contextStore == null) {
-			return;
-		}
-		boolean wasPaused = contextCapturePaused;
-		try {
-			metaContextLock.acquire();
-			if (!wasPaused) {
-				setContextCapturePaused(true);
-			}
-
-			InteractionContext context = getActivityMetaContext();
-			takeSnapshot(contextStore.getFileForContext(InteractionContextManager.CONTEXT_HISTORY_FILE_NAME));
-			contextStore.saveContext(collapseActivityMetaContext(context),
-					InteractionContextManager.CONTEXT_HISTORY_FILE_NAME);
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN, "Could not save activity history", //$NON-NLS-1$
-					t));
-		} finally {
-			metaContextLock.release();
-			if (!wasPaused) {
-				setContextCapturePaused(false);
-			}
-		}
-	}
-
-	/**
-	 * COPY: from AbstractExternalizationParticipant
-	 */
-	protected boolean takeSnapshot(File file) {
-		if (file.length() > 0) {
-			File originalFile = file.getAbsoluteFile();
-			File backup = new File(file.getParentFile(), "." + file.getName()); //$NON-NLS-1$
-			backup.delete();
-			return originalFile.renameTo(backup);
-		}
-		return false;
-	}
-
-	protected boolean restoreSnapshot(File file) {
-		File backup = new File(file.getParentFile(), "." + file.getName()); //$NON-NLS-1$
-		File originalFile = file.getAbsoluteFile();
-		if (originalFile.exists()) {
-			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HHmmss", Locale.ENGLISH); //$NON-NLS-1$
-			File failed = new File(file.getParentFile(), "failed-" + format.format(new Date()) + "-" //$NON-NLS-1$ //$NON-NLS-2$
-					+ originalFile.getName());
-			originalFile.renameTo(failed);
-		}
-		if (backup.exists()) {
-			return backup.renameTo(originalFile);
-		}
-		return false;
-	}
-
-	/**
-	 * Manipulates interest for the active context.
-	 */
-	// TODO 3.3 revise or remove this and it's helper
-	public boolean manipulateInterestForElement(IInteractionElement element, boolean increment, boolean forceLandmark,
-			boolean preserveUninteresting, String sourceId) {
-		if (!isContextActive()) {
-			return false;
-		} else {
-			return manipulateInterestForElement(element, increment, forceLandmark, preserveUninteresting, sourceId,
-					activeContext);
-		}
-	}
-
-	/**
-	 * @return true if interest was manipulated successfully
-	 */
-	public boolean manipulateInterestForElement(IInteractionElement element, boolean increment, boolean forceLandmark,
-			boolean preserveUninteresting, String sourceId, IInteractionContext context) {
-		Set<IInteractionElement> changedElements = new HashSet<IInteractionElement>();
-		boolean manipulated = manipulateInterestForElementHelper(element, increment, forceLandmark,
-				preserveUninteresting, sourceId, context, changedElements, null);
-
-		if (manipulated) {
-			if (preserveUninteresting || increment) {
-				notifyInterestDelta(new ArrayList<IInteractionElement>(changedElements));
-			} else {
-				notifyElementsDeleted(context, new ArrayList<IInteractionElement>(changedElements));
-			}
-		}
-		return manipulated;
-	}
-
-	private boolean manipulateInterestForElementHelper(IInteractionElement element, boolean increment,
-			boolean forceLandmark, boolean preserveUninteresting, String sourceId, IInteractionContext context,
-			Set<IInteractionElement> changedElements, AbstractContextStructureBridge forcedBridge) {
-		if (element == null || context == null) {
-			return false;
-		}
-		float originalValue = element.getInterest().getValue();
-		float changeValue = 0;
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(element.getContentType());
-
-		// XXX go through each bridge here?
-		// make sure that we manipulate the interest on all bridges and not just the one that the element
-		// maps to
-		Object objectForHandle = bridge.getObjectForHandle(element.getHandleIdentifier());
-		String parentContentType = bridge.getParentContentType();
-		if (parentContentType != null && objectForHandle != null) {
-			AbstractContextStructureBridge parentBridge = ContextCorePlugin.getDefault().getStructureBridge(
-					parentContentType);
-
-			if (parentBridge != null && parentBridge != forcedBridge) {
-				String parentBridgeHandle = parentBridge.getHandleIdentifier(objectForHandle);
-
-				if (parentBridgeHandle != null) {
-					IInteractionElement parentBridgeElement = context.get(parentBridgeHandle);
-					manipulateInterestForElementHelper(parentBridgeElement, increment, forceLandmark,
-							preserveUninteresting, sourceId, context, changedElements, parentBridge);
-				}
-			}
-		}
-
-		if (forcedBridge != null) {
-			// if there is a forced bridge, we should be using it
-			bridge = forcedBridge;
-		}
-
-		if (!increment) {
-			if (element.getInterest().isLandmark() && bridge.canBeLandmark(element.getHandleIdentifier())) {
-				// keep it interesting
-				changeValue = (-1 * originalValue) + 1;
-			} else {
-				// make uninteresting
-				if (originalValue >= 0) {
-					changeValue = ((-1) * originalValue) - 1;
-				}
-
-				// reduce interest of children
-				for (String childHandle : bridge.getChildHandles(element.getHandleIdentifier())) {
-					IInteractionElement childElement = context.get(childHandle);
-					if (childElement != null /*&& childElement.getInterest().isInteresting()*/
-							&& !childElement.equals(element)) {
-						manipulateInterestForElementHelper(childElement, increment, forceLandmark,
-								preserveUninteresting, sourceId, context, changedElements, forcedBridge);
-					}
-				}
-			}
-		} else {
-			if (!forceLandmark && (originalValue > context.getScaling().getLandmark())) {
-				changeValue = 0;
-			} else {
-				if (bridge.canBeLandmark(element.getHandleIdentifier())) {
-					changeValue = (context.getScaling().getForcedLandmark()) - originalValue + 1;
-				} else {
-					return false;
-				}
-			}
-		}
-//		if (changeValue > context.getScaling().getInteresting() || preserveUninteresting) {
-		if (increment || preserveUninteresting) {
-			InteractionEvent interactionEvent = new InteractionEvent(InteractionEvent.Kind.MANIPULATION,
-					element.getContentType(), element.getHandleIdentifier(), sourceId, changeValue);
-			List<IInteractionElement> interestDelta = internalProcessInteractionEvent(interactionEvent, context, true);
-			changedElements.addAll(interestDelta);
-//			notifyInterestDelta(interestDelta);
-		} else { //if (changeValue < context.getScaling().getInteresting()) {
-			changedElements.add(element);
-			delete(element, context);
-		}
-		return true;
-	}
-
-	/**
-	 * Used to migrate old activity to new activity events
-	 * 
-	 * @since 2.1
-	 */
-	public InteractionContext migrateLegacyActivity(InteractionContext context) {
-		LegacyActivityAdaptor adaptor = new LegacyActivityAdaptor();
-		InteractionContext newMetaContext = new InteractionContext(context.getHandleIdentifier(),
-				ContextCore.getCommonContextScaling());
-		for (InteractionEvent event : context.getInteractionHistory()) {
-			InteractionEvent temp = adaptor.parseInteractionEvent(event);
-			if (temp != null) {
-				newMetaContext.parseEvent(temp);
-			}
-		}
-		return newMetaContext;
-	}
-
-	private void notifyElementsDeleted(final IInteractionContext context, final List<IInteractionElement> interestDelta) {
-		if (!interestDelta.isEmpty()) {
-			for (final AbstractContextListener listener : contextListeners) {
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable e) {
-						StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-								+ listener.getClass(), e));
-					}
-
-					public void run() throws Exception {
-						ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.ELEMENTS_DELETED,
-								context.getHandleIdentifier(), context, interestDelta);
-						listener.contextChanged(event);
-					}
-				});
-			}
-		}
-	}
-
-	@Deprecated
-	public void notifyInterestDelta(final List<IInteractionElement> interestDelta) {
-		notifyInterestDelta(getActiveContext(), interestDelta);
-	}
-
-	public void notifyInterestDelta(final IInteractionContext context, final List<IInteractionElement> interestDelta) {
-		if (!interestDelta.isEmpty()) {
-			for (final AbstractContextListener listener : contextListeners) {
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable e) {
-						StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-								+ listener.getClass(), e));
-					}
-
-					public void run() throws Exception {
-						ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.INTEREST_CHANGED,
-								context.getHandleIdentifier(), context, interestDelta);
-						listener.contextChanged(event);
-					}
-				});
-			}
-		}
-	}
-
-	/**
-	 * Copy the listener list in case it is modified during the notificiation.
-	 * 
-	 * @param element
-	 */
-	public void notifyRelationshipsChanged(final IInteractionElement element) {
-		if (suppressListenerNotification) {
-			return;
-		}
-		for (final AbstractContextListener listener : contextListeners) {
-			if (listener instanceof IRelationsListener) {
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable e) {
-						StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-								+ listener.getClass(), e));
-					}
-
-					public void run() throws Exception {
-						((IRelationsListener) listener).relationsChanged(element);
-					}
-				});
-
-			}
-		}
-	}
-
-	public void processActivityMetaContextEvent(InteractionEvent event) {
-		IInteractionElement element = getActivityMetaContext().parseEvent(event);
-
-		final List<IInteractionElement> changed = Collections.singletonList(element);
-		for (final AbstractContextListener listener : activityMetaContextListeners) {
-			SafeRunner.run(new ISafeRunnable() {
-				public void handleException(Throwable e) {
-					StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-							+ listener.getClass(), e));
-				}
-
-				public void run() throws Exception {
-					ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.INTEREST_CHANGED,
-							getActivityMetaContext().getHandleIdentifier(), getActivityMetaContext(), changed);
-					listener.contextChanged(event);
-				}
-			});
-		}
-	}
-
-	public IInteractionElement processInteractionEvent(InteractionEvent event) {
-		return processInteractionEvent(event, true);
-	}
-
-	public IInteractionElement processInteractionEvent(InteractionEvent event, boolean propagateToParents) {
-		return processInteractionEvent(event, propagateToParents, true);
-	}
-
-	public IInteractionElement processInteractionEvent(InteractionEvent event, boolean propagateToParents,
-			boolean notifyListeners) {
-		boolean alreadyNotified = false;
-		if (isContextActive()) {
-			List<IInteractionElement> interestDelta = internalProcessInteractionEvent(event, activeContext,
-					propagateToParents);
-			if (notifyListeners) {
-				notifyInterestDelta(interestDelta);
-			}
-		}
-		for (IInteractionContext globalContext : globalContexts) {
-			if (globalContext.getContentLimitedTo().equals(event.getStructureKind())) {
-				List<IInteractionElement> interestDelta = internalProcessInteractionEvent(event, globalContext,
-						propagateToParents);
-				if (notifyListeners && !alreadyNotified) {
-					notifyInterestDelta(interestDelta);
-				}
-			}
-		}
-
-		return activeContext.get(event.getStructureHandle());
-	}
-
-	/**
-	 * TODO: consider using IInteractionElement instead, or making other methods consistent
-	 */
-	public IInteractionElement processInteractionEvent(Object object, Kind eventKind, String origin,
-			IInteractionContext context) {
-		AbstractContextStructureBridge structureBridge = ContextCore.getStructureBridge(object);
-		if (structureBridge != null) {
-			String structureKind = structureBridge.getContentType();
-			String handle = structureBridge.getHandleIdentifier(object);
-			if (structureKind != null && handle != null) {
-				InteractionEvent event = new InteractionEvent(eventKind, structureKind, handle, origin);
-				List<IInteractionElement> interestDelta = internalProcessInteractionEvent(event, context, true);
-
-				notifyInterestDelta(interestDelta);
-
-				return context.get(event.getStructureHandle());
-			}
-		}
-		return null;
-	}
-
-	public void processInteractionEvents(List<InteractionEvent> events, boolean propagateToParents) {
-		Set<IInteractionElement> compositeDelta = new HashSet<IInteractionElement>();
-		for (InteractionEvent event : events) {
-			if (isContextActive()) {
-				compositeDelta.addAll(internalProcessInteractionEvent(event, activeContext, propagateToParents));
-			}
-			for (IInteractionContext globalContext : globalContexts) {
-				if (globalContext.getContentLimitedTo().equals(event.getStructureKind())) {
-					internalProcessInteractionEvent(event, globalContext, propagateToParents);
-				}
-			}
-		}
-		notifyInterestDelta(new ArrayList<IInteractionElement>(compositeDelta));
-	}
-
-	/**
-	 * Policy is that a parent should not have an interest lower than that of one of its children. This meets our goal
-	 * of having them decay no faster than the children while having their interest be proportional to the interest of
-	 * their children.
-	 * 
-	 * @param forcedBridge
-	 *            The structure bridge that we should use. Can be null, then we will automatically select
-	 * @param handles
-	 *            Handles that have already been handled in the propagation
-	 */
-	private void propegateInterestToParents(IInteractionContext interactionContext, InteractionEvent.Kind kind,
-			IInteractionElement node, float previousInterest, float decayOffset, int level,
-			List<IInteractionElement> interestDelta, String origin, AbstractContextStructureBridge forcedBridge,
-			Set<String> handles) {
-
-		if (level > MAX_PROPAGATION || node == null || node.getHandleIdentifier() == null
-				|| node.getInterest().getValue() <= 0) {
-			return;
-		}
-
-		checkForLandmarkDeltaAndNotify(previousInterest, node, interactionContext);
-		level++; // original is 1st level
-
-		// NOTE: original code summed parent interest
-//		float propagatedIncrement = node.getInterest().getValue() - previousInterest + decayOffset;
-
-		AbstractContextStructureBridge bridge = ContextCorePlugin.getDefault()
-				.getStructureBridge(node.getContentType());
-
-		// make sure that we propagate the interest on all bridges and not just the one that the element
-		// maps to
-		Object objectForHandle = bridge.getObjectForHandle(node.getHandleIdentifier());
-		String parentBridgeContentType = bridge.getParentContentType();
-		if (parentBridgeContentType != null && objectForHandle != null) {
-			AbstractContextStructureBridge parentBridge = ContextCorePlugin.getDefault().getStructureBridge(
-					parentBridgeContentType);
-
-			if (parentBridge != null && parentBridge != forcedBridge) {
-				String parentHandle = parentBridge.getHandleIdentifier(objectForHandle);
-
-				if (parentHandle != null) {
-					// make sure that the element for the parent bridge is in the context
-					IInteractionElement parentBridgeElement = interactionContext.get(parentHandle);
-					float parentPreviousInterest = 0;
-					float parentDecayOffset = 0;
-					if (parentBridgeElement != null) {
-						parentPreviousInterest = parentBridgeElement.getInterest().getValue();
-					}
-					if (kind.isUserEvent()) {
-						parentDecayOffset = ensureIsInteresting(interactionContext, parentBridge.getContentType(),
-								parentHandle, parentBridgeElement, parentPreviousInterest);
-					}
-					if (!handles.contains(parentHandle)) {
-						handles.add(parentHandle);
-						parentBridgeElement = addInteractionEvent(interactionContext, new InteractionEvent(
-								InteractionEvent.Kind.PROPAGATION, parentBridge.getContentType(), parentHandle, origin));
-					} else {
-						parentBridgeElement = interactionContext.get(parentHandle);
-					}
-
-					propegateInterestToParents(interactionContext, kind, parentBridgeElement, previousInterest,
-							parentDecayOffset, level, interestDelta, origin, parentBridge, handles);
-				}
-			}
-		}
-
-		// ensure we use the forced bridge if we are given one
-		if (forcedBridge != null) {
-			bridge = forcedBridge;
-		}
-		String parentHandle = bridge.getParentHandle(node.getHandleIdentifier(), forcedBridge == null); //false);
-
-		// do not check child bridges if we are using a foced bridge
-		if (forcedBridge == null) {
-			// check if should use child bridge
-			for (String contentType : ContextCore.getChildContentTypes(bridge.getContentType())) {
-				AbstractContextStructureBridge childBridge = ContextCore.getStructureBridge(contentType);
-				Object resolved = childBridge.getObjectForHandle(parentHandle);
-				if (resolved != null) {
-					AbstractContextStructureBridge canonicalBridge = ContextCore.getStructureBridge(resolved);
-					// HACK: hard-coded resource content type
-					if (!canonicalBridge.getContentType().equals(ContextCore.CONTENT_TYPE_RESOURCE)) {
-						// NOTE: resetting bridge
-						bridge = canonicalBridge;
-					}
-				}
-			}
-		}
-
-		if (parentHandle != null) {
-			String parentContentType = bridge.getContentType(parentHandle);
-
-			IInteractionElement parentElement = interactionContext.get(parentHandle);
-			float parentPreviousInterest = 0;
-			if (parentElement != null && parentElement.getInterest() != null) {
-				parentPreviousInterest = parentElement.getInterest().getValue();
-			}
-
-			// NOTE: if element marked as landmark, this propagates the landmark value to all parents
-			float increment = interactionContext.getScaling().getInteresting();
-			if (parentPreviousInterest < node.getInterest().getValue()) {
-				increment = node.getInterest().getValue() - parentPreviousInterest;
-				InteractionEvent propagationEvent = new InteractionEvent(InteractionEvent.Kind.PROPAGATION,
-						parentContentType, parentHandle, SOURCE_ID_MODEL_PROPAGATION,
-						InteractionContextManager.CONTAINMENT_PROPAGATION_ID, increment);
-				if (!handles.contains(parentHandle)) {
-					handles.add(parentHandle);
-					parentElement = addInteractionEvent(interactionContext, propagationEvent);
-				} else {
-					parentElement = interactionContext.get(parentHandle);
-				}
-
-			}
-
-			// NOTE: this might be redundant
-			if (parentElement != null && kind.isUserEvent()
-					&& parentElement.getInterest().getValue() < ContextCore.getCommonContextScaling().getInteresting()) {
-				float parentOffset = ContextCore.getCommonContextScaling().getInteresting()
-						- parentElement.getInterest().getValue() + increment;
-				if (!handles.contains(parentHandle)) {
-					handles.add(parentHandle);
-					addInteractionEvent(interactionContext, new InteractionEvent(InteractionEvent.Kind.MANIPULATION,
-							parentElement.getContentType(), parentElement.getHandleIdentifier(),
-							SOURCE_ID_DECAY_CORRECTION, parentOffset));
-				} else {
-					parentElement = interactionContext.get(parentElement.getHandleIdentifier());
-				}
-			}
-
-			if (parentElement != null
-					&& isInterestDelta(parentPreviousInterest, parentElement.getInterest().isPredicted(),
-							parentElement.getInterest().isPropagated(), parentElement)) {
-				interestDelta.add(0, parentElement);
-			}
-			propegateInterestToParents(interactionContext, kind, parentElement, parentPreviousInterest, decayOffset,
-					level, interestDelta, origin, forcedBridge, handles);
-		}
-	}
-
-	public void removeActivityMetaContextListener(AbstractContextListener listener) {
-		activityMetaContextListeners.remove(listener);
-	}
-
-	public void removeAllListeners() {
-		waitingContextListeners.clear();
-		contextListeners.clear();
-	}
-
-	/**
-	 * TODO: worry about decay-related change if predicted interest dacays
-	 */
-	@SuppressWarnings("deprecation")
-	public void removeErrorPredictedInterest(String handle, String kind, boolean notify) {
-		if (activeContext.getContextMap().isEmpty()) {
-			return;
-		}
-		if (handle == null) {
-			return;
-		}
-		final IInteractionElement element = activeContext.get(handle);
-		if (element != null && element.getInterest().isInteresting() && errorElementHandles.contains(handle)) {
-			InteractionEvent errorEvent = new InteractionEvent(InteractionEvent.Kind.MANIPULATION, kind, handle,
-					SOURCE_ID_MODEL_ERROR,
-					((InteractionContextScaling) ContextCore.getCommonContextScaling()).getErrorInterest());
-			processInteractionEvent(errorEvent, true);
-			numInterestingErrors--;
-			errorElementHandles.remove(handle);
-			// TODO: this results in double-notification
-			if (notify) {
-				for (final AbstractContextListener listener : contextListeners) {
-					SafeRunner.run(new ISafeRunnable() {
-						public void handleException(Throwable e) {
-							StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN,
-									"Listener failed: " //$NON-NLS-1$
-											+ listener.getClass(), e));
-						}
-
-						public void run() throws Exception {
-							// FIXME use singleton list instead that is constructed outside of loop
-							List<IInteractionElement> changed = new ArrayList<IInteractionElement>();
-							changed.add(element);
-							listener.interestChanged(changed);
-						}
-					});
-				}
-			}
-		}
-	}
-
-	public void removeGlobalContext(IInteractionContext context) {
-		globalContexts.remove(context);
-	}
-
-	public void removeListener(AbstractContextListener listener) {
-		waitingContextListeners.remove(listener);
-		contextListeners.remove(listener);
-	}
-
-	public void resetActivityMetaContext() {
-		try {
-			metaContextLock.acquire();
-			activityMetaContext = new InteractionContext(InteractionContextManager.CONTEXT_HISTORY_FILE_NAME,
-					ContextCore.getCommonContextScaling());
-			saveActivityMetaContext();
-		} finally {
-			metaContextLock.release();
-		}
-	}
-
-	public void resetLandmarkRelationshipsOfKind(String reltationKind) {
-		for (IInteractionElement landmark : activeContext.getLandmarks()) {
-			for (IInteractionRelation edge : landmark.getRelations()) {
-				if (edge.getRelationshipHandle().equals(reltationKind)) {
-					landmark.clearRelations();
-				}
-			}
-		}
-		for (final AbstractContextListener listener : contextListeners) {
-			if (listener instanceof IRelationsListener) {
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable e) {
-						StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-								+ listener.getClass(), e));
-					}
-
-					public void run() throws Exception {
-						((IRelationsListener) listener).relationsChanged(null);
-					}
-				});
-			}
-		}
-	}
-
-	public void setActivationHistorySuppressed(boolean activationHistorySuppressed) {
-		this.activationHistorySuppressed = activationHistorySuppressed;
-	}
-
-	public void setActiveSearchEnabled(boolean enabled) {
-		for (AbstractRelationProvider provider : ContextCorePlugin.getDefault().getRelationProviders()) {
-			provider.setEnabled(enabled);
-		}
-	}
-
-	/**
-	 * NOTE: If pausing ensure to restore to original state.
-	 */
-	public void setContextCapturePaused(boolean paused) {
-		synchronized (InteractionContextManager.this) {
-			this.contextCapturePaused = paused;
-		}
-	}
-
-	public void updateHandle(final IInteractionElement element, String newHandle) {
-		if (element == null) {
-			return;
-		}
-		final IInteractionContext context = getActiveContext();
-		context.updateElementHandle(element, newHandle);
-
-		final List<IInteractionElement> changed = Collections.singletonList(element);
-		for (final AbstractContextListener listener : contextListeners) {
-			SafeRunner.run(new ISafeRunnable() {
-				public void handleException(Throwable e) {
-					StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-							+ listener.getClass(), e));
-				}
-
-				public void run() throws Exception {
-					ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.INTEREST_CHANGED,
-							context.getHandleIdentifier(), context, changed);
-					listener.contextChanged(event);
-				}
-			});
-		}
-		if (element.getInterest().isLandmark()) {
-			for (final AbstractContextListener listener : contextListeners) {
-				SafeRunner.run(new ISafeRunnable() {
-					public void handleException(Throwable e) {
-						StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Listener failed: " //$NON-NLS-1$
-								+ listener.getClass(), e));
-					}
-
-					public void run() throws Exception {
-						List<IInteractionElement> changed = new ArrayList<IInteractionElement>();
-						changed.add(element);
-						ContextChangeEvent event = new ContextChangeEvent(ContextChangeKind.LANDMARKS_ADDED,
-								context.getHandleIdentifier(), context, changed);
-						listener.contextChanged(event);
-					}
-				});
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextRelation.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextRelation.java
deleted file mode 100644
index b509e28..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextRelation.java
+++ /dev/null
@@ -1,73 +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.context.core;
-
-import org.eclipse.mylyn.context.core.IDegreeOfInterest;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-
-/**
- * TODO: make immutable?
- * 
- * @author Mik Kersten
- */
-public class InteractionContextRelation implements IInteractionRelation {
-
-	private final DegreeOfInterest interest;
-
-	private final String structureKind;
-
-	private final String relationshipHandle;
-
-	private final IInteractionElement source;
-
-	private final IInteractionElement target;
-
-	public InteractionContextRelation(String kind, String edgeKind, IInteractionElement source,
-			IInteractionElement target, InteractionContext context) {
-		interest = new DegreeOfInterest(context, context.getScaling());
-		this.structureKind = kind;
-		this.relationshipHandle = edgeKind;
-		this.target = target;
-		this.source = source;
-	}
-
-	public IInteractionElement getTarget() {
-		return target;
-	}
-
-	public IDegreeOfInterest getInterest() {
-		return interest;
-	}
-
-	@Override
-	public String toString() {
-		return "(rel: " + relationshipHandle + ", source: " + source.getHandleIdentifier() + ", target: " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				+ target.getHandleIdentifier() + ")"; //$NON-NLS-1$
-	}
-
-	public String getLabel() {
-		return toString();
-	}
-
-	public String getRelationshipHandle() {
-		return relationshipHandle;
-	}
-
-	public String getContentType() {
-		return structureKind;
-	}
-
-	public IInteractionElement getSource() {
-		return source;
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextScaling.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextScaling.java
deleted file mode 100644
index 6730007..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/InteractionContextScaling.java
+++ /dev/null
@@ -1,112 +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.context.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * Initialized with default values.
- * 
- * @author Mik Kersten
- */
-public class InteractionContextScaling implements IInteractionContextScaling {
-
-	private static final float DEFAULT_INTERESTING = 0f;
-
-	private static final float DEFAULT_EVENT = 1f;
-
-	private static final float DEFAULT_EVENT_EDIT = .7f;
-
-	private static final float DEFAULT_DECAY = .017f;
-
-	private static final float DEFAULT_LANDMARK = 30f;
-
-	private static final float DEFAULT_FORCED_LANDMARK = 7 * DEFAULT_LANDMARK;
-
-	private final Map<InteractionEvent.Kind, Float> interactionScalingFactors = new HashMap<InteractionEvent.Kind, Float>();
-
-	private float interesting = DEFAULT_INTERESTING;
-
-	private float landmark = DEFAULT_LANDMARK;
-
-	private float forcedLandmark = DEFAULT_FORCED_LANDMARK;
-
-	private float decay = DEFAULT_DECAY;
-
-	@Deprecated
-	private final float errorInterest = .3f;
-
-	@Deprecated
-	private final int maxNumInterestingErrors = 20;
-
-	public InteractionContextScaling() {
-		interactionScalingFactors.put(InteractionEvent.Kind.EDIT, DEFAULT_EVENT_EDIT);
-	}
-
-	public float get(InteractionEvent.Kind kind) {
-		if (interactionScalingFactors.containsKey(kind)) {
-			return interactionScalingFactors.get(kind);
-		} else {
-			return DEFAULT_EVENT;
-		}
-	}
-
-	public void set(InteractionEvent.Kind kind, float value) {
-		interactionScalingFactors.put(kind, value);
-	}
-
-	public float getDecay() {
-		return decay;
-	}
-
-	public void setDecay(float decay) {
-		this.decay = decay;
-	}
-
-	public float getInteresting() {
-		return interesting;
-	}
-
-	public void setInteresting(float interesting) {
-		this.interesting = interesting;
-	}
-
-	public float getLandmark() {
-		return landmark;
-	}
-
-	public void setLandmark(float landmark) {
-		this.landmark = landmark;
-	}
-
-	@Deprecated
-	public float getErrorInterest() {
-		return errorInterest;
-	}
-
-	@Deprecated
-	public int getMaxNumInterestingErrors() {
-		return maxNumInterestingErrors;
-	}
-
-	public float getForcedLandmark() {
-		return forcedLandmark;
-	}
-
-	public void setForcedLandmark(float userLandmark) {
-		this.forcedLandmark = userLandmark;
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/LegacyActivityAdaptor.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/LegacyActivityAdaptor.java
deleted file mode 100644
index 710a85a..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/LegacyActivityAdaptor.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.internal.context.core;
-
-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;
-
-/**
- * Adapt any legacy attention events to new form
- * 
- * @since 2.1
- * @author Rob Elves
- */
-public class LegacyActivityAdaptor {
-
-	private static final String LEGACY_HANDLE_ATTENTION = "attention"; //$NON-NLS-1$
-
-	private String currentTask;
-
-	public InteractionEvent parseInteractionEvent(InteractionEvent event) {
-		try {
-			if (event.getDelta() != null && event.getDelta().equals(InteractionContextManager.ACTIVITY_DELTA_ACTIVATED)) {
-				if (event.getStructureHandle() != null && !event.getStructureHandle().equals(LEGACY_HANDLE_ATTENTION)) {
-					String activatedTask = event.getStructureHandle();
-					if (activatedTask != null) {
-						currentTask = event.getStructureHandle();
-					}
-				} else if (event.getStructureHandle() != null
-						&& event.getStructureHandle().equals(LEGACY_HANDLE_ATTENTION)) {
-					if (currentTask != null && !currentTask.equals("")) { //$NON-NLS-1$
-						return new InteractionEvent(InteractionEvent.Kind.ATTENTION,
-								InteractionContextManager.ACTIVITY_STRUCTUREKIND_TIMING, currentTask,
-								InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH, null,
-								InteractionContextManager.ACTIVITY_DELTA_ADDED, 1f, event.getDate(), event.getEndDate());
-					} else if (currentTask == null) {
-						// bogus event remove.
-						return null;
-					}
-				}
-			} else if (event.getDelta() != null
-					&& event.getDelta().equals(InteractionContextManager.ACTIVITY_DELTA_DEACTIVATED)) {
-				if (event.getStructureHandle() != null && !event.getStructureHandle().equals(LEGACY_HANDLE_ATTENTION)
-						&& currentTask != null && currentTask.equals(event.getStructureHandle())) {
-					currentTask = null;
-				} else if (event.getStructureHandle() != null
-						&& event.getStructureHandle().equals(LEGACY_HANDLE_ATTENTION)) {
-					// bogus event remove.
-					return null;
-				}
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN, "Error parsing interaction event", //$NON-NLS-1$
-					t));
-		}
-		return event;
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/LocalContextStore.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/LocalContextStore.java
deleted file mode 100644
index 3713334..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/LocalContextStore.java
+++ /dev/null
@@ -1,252 +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.context.core;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IContextStore;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class LocalContextStore implements IContextStore {
-
-	private File contextDirectory;
-
-	private Set<File> contextFiles = null;
-
-	private final InteractionContextExternalizer externalizer = new InteractionContextExternalizer();
-
-	private final IInteractionContextScaling commonContextScaling;
-
-	private final List<IContextStoreListener> listeners = new ArrayList<IContextStoreListener>();
-
-	public LocalContextStore(IInteractionContextScaling commonContextScaling) {
-		this.commonContextScaling = commonContextScaling;
-	}
-
-	public synchronized void setContextDirectory(File directory) {
-		this.contextDirectory = directory;
-		for (IContextStoreListener listener : listeners) {
-			listener.contextStoreMoved(directory);
-		}
-//		rootDirectory = new File(TasksUiPlugin.getDefault().getDataDirectory());
-//		if (!rootDirectory.exists()) {
-//			rootDirectory.mkdir();
-//		}
-//
-//		contextDirectory = new File(rootDirectory, ITasksCoreConstants.CONTEXTS_DIRECTORY);
-//		if (!contextDirectory.exists()) {
-//			contextDirectory.mkdir();
-//		}
-	}
-
-	public File getContextDirectory() {
-		return contextDirectory;
-	}
-
-	/**
-	 * @return false if the map could not be read for any reason
-	 */
-	public IInteractionContext loadContext(String handleIdentifier) {
-		return loadContext(handleIdentifier, getFileForContext(handleIdentifier), commonContextScaling);
-	}
-
-	public IInteractionContext importContext(String handleIdentifier, File fromFile) throws CoreException {
-		InteractionContext context;
-		String handleToImportFrom;
-		handleToImportFrom = InteractionContextExternalizer.getFirstContextHandle(fromFile);
-		context = (InteractionContext) loadContext(handleToImportFrom, fromFile, commonContextScaling);
-		context.setHandleIdentifier(handleIdentifier);
-		saveContext(context);
-		return context;
-	}
-
-	/**
-	 * @return The loaded context, or a newly created one.
-	 */
-	public IInteractionContext loadContext(String handleIdentifier, File fromFile,
-			IInteractionContextScaling contextScaling) {
-		IInteractionContext loadedContext = externalizer.readContextFromXml(handleIdentifier, fromFile, contextScaling);
-		if (loadedContext == null) {
-			return new InteractionContext(handleIdentifier, contextScaling);
-		} else {
-			return loadedContext;
-		}
-	}
-
-	// TODO: interaction activity capture should be locked or queued for the duration of this and other saves
-	public void saveActiveContext() {
-		// FIXME this should not reference the context manager
-		IInteractionContext context = ContextCore.getContextManager().getActiveContext();
-		if (context != null && context.getHandleIdentifier() != null) {
-			saveContext(context);
-		}
-	}
-
-	public void saveContext(IInteractionContext context, String fileName) {
-		try {
-			externalizer.writeContextToXml(context, getFileForContext(fileName));
-		} catch (IOException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN, "Failed to write context " //$NON-NLS-1$
-					+ context.getHandleIdentifier(), e));
-		}
-	}
-
-	public void saveContext(IInteractionContext context) {
-		// FIXME this should not reference the context manager
-		boolean wasPaused = ContextCore.getContextManager().isContextCapturePaused();
-		try {
-			// TODO: make this asynchronous by creating a copy
-			if (!wasPaused) {
-				// FIXME this should not reference the context manager
-				ContextCore.getContextManager().setContextCapturePaused(true);
-			}
-
-			if (context instanceof InteractionContext) {
-				((InteractionContext) context).collapse();
-			}
-			externalizer.writeContextToXml(context, getFileForContext(context.getHandleIdentifier()));
-
-			if (context.getAllElements().size() == 0) {
-				removeFromCache(context);
-			} else {
-				addToCache(context);
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN, "could not save context", t)); //$NON-NLS-1$
-		} finally {
-			if (!wasPaused) {
-				// FIXME this should not reference the context manager
-				ContextCore.getContextManager().setContextCapturePaused(false);
-			}
-		}
-	}
-
-	private boolean addToCache(IInteractionContext context) {
-		initCache();
-		return contextFiles.add(getFileForContext(context.getHandleIdentifier()));
-	}
-
-	private void initCache() {
-		if (contextFiles == null) {
-			contextFiles = new HashSet<File>();
-			File[] files = contextDirectory.listFiles();
-			for (File file : files) {
-				contextFiles.add(file);
-			}
-		}
-	}
-
-	private boolean removeFromCache(IInteractionContext context) {
-		if (contextFiles != null) {
-			return contextFiles.remove(getFileForContext(context.getHandleIdentifier()));
-		} else {
-			return false;
-		}
-	}
-
-	public IInteractionContext cloneContext(String sourceContextHandle, String destinationContextHandle) {
-
-		InteractionContext readContext = (InteractionContext) externalizer.readContextFromXml(sourceContextHandle,
-				getFileForContext(sourceContextHandle), commonContextScaling);
-
-		if (readContext == null) {
-			return new InteractionContext(destinationContextHandle, commonContextScaling);
-		} else {
-			readContext.setHandleIdentifier(destinationContextHandle);
-			saveContext(readContext);
-		}
-
-//		IInteractionContext context = importContext(destinationContextHandle, getFileForContext(sourceContextHandle));
-//		if (context != null) {
-//			saveContext(context);
-//		} else {
-//			StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, "Could not copy context from: "
-//					+ sourceContextHandle));
-//		}
-		return readContext;
-	}
-
-	public boolean hasContext(String handleIdentifier) {
-		Assert.isNotNull(handleIdentifier);
-		File file = getFileForContext(handleIdentifier);
-		initCache();
-		return contextFiles.contains(file);
-	}
-
-	public File getFileForContext(String handleIdentifier) {
-		String encoded;
-		try {
-			encoded = URLEncoder.encode(handleIdentifier, InteractionContextManager.CONTEXT_FILENAME_ENCODING);
-			File contextDirectory = getContextDirectory();
-			File contextFile = new File(contextDirectory, encoded + InteractionContextManager.CONTEXT_FILE_EXTENSION);
-			return contextFile;
-		} catch (UnsupportedEncodingException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN,
-					"Could not determine path for context", e)); //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	public void deleteContext(String handleIdentifier) {
-		try {
-			File file = getFileForContext(handleIdentifier);
-			if (file.exists()) {
-				file.delete();
-			}
-
-			if (contextFiles != null) {
-				contextFiles.remove(getFileForContext(handleIdentifier));
-			}
-		} catch (SecurityException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN,
-					"Could not delete context file, insufficient permissions.", e)); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Can consider making this API, but it should not expose a zip stream.
-	 */
-	public void export(String handleIdentifier, ZipOutputStream outputStream) throws IOException {
-		IInteractionContext context = loadContext(handleIdentifier);
-		externalizer.writeContext(context, outputStream);
-	}
-
-	@Deprecated
-	public void addListener(IContextStoreListener listener) {
-		listeners.add(listener);
-	}
-
-	@Deprecated
-	public void removeListener(IContextStoreListener listener) {
-		listeners.remove(listener);
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextContentHandler.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextContentHandler.java
deleted file mode 100644
index 3baa6dd..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextContentHandler.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Brock Janiczak and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Brock Janiczak - initial API and implementation
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.core;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.core.InteractionEvent.Kind;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * @author Brock Janiczak
- * @author Mik Kersten
- */
-public class SaxContextContentHandler extends DefaultHandler {
-
-	private static final int EXPECTING_ROOT = 0;
-
-	private static final int EXPECTING_EVENT = 1;
-
-	private int state = EXPECTING_ROOT;
-
-	private InteractionContext context;
-
-	private final IInteractionContextScaling contextScaling;
-
-	private final String contextHandleIdentifier;
-
-	static final String ATTRIBUTE_INTERACTION_EVENT = "InteractionEvent"; //$NON-NLS-1$
-
-	static final String ATTRIBUTE_CONTENT = "Content"; //$NON-NLS-1$
-
-	public SaxContextContentHandler(String contextHandleIdentifier, IInteractionContextScaling contextScaling) {
-		this.contextHandleIdentifier = contextHandleIdentifier;
-		this.contextScaling = contextScaling;
-	}
-
-	public InteractionContext getContext() {
-		return context;
-	}
-
-	@Override
-	public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-		switch (state) {
-		case EXPECTING_ROOT:
-			context = new InteractionContext(contextHandleIdentifier, contextScaling);
-			String limitContentTo = attributes.getValue(ATTRIBUTE_CONTENT);
-			if (limitContentTo != null) {
-				context.setContentLimitedTo(limitContentTo);
-			}
-			state = EXPECTING_EVENT;
-			break;
-		case EXPECTING_EVENT:
-			try {
-				InteractionEvent ie = createEventFromAttributes(attributes);
-				context.parseEvent(ie);
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN,
-						"Ignored unexpected activity event", e)); //$NON-NLS-1$
-			}
-			break;
-		}
-	}
-
-	@SuppressWarnings( { "deprecation", "restriction" })
-	private InteractionEvent createEventFromAttributes(Attributes attributes) throws ParseException {
-		String delta = org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertXmlToString(attributes.getValue(InteractionContextExternalizer.ATR_DELTA));
-		String endDate = attributes.getValue(InteractionContextExternalizer.ATR_END_DATE);
-		String interest = attributes.getValue(InteractionContextExternalizer.ATR_INTEREST);
-		String kind = attributes.getValue(InteractionContextExternalizer.ATR_KIND);
-		String navigation = org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertXmlToString(attributes.getValue(InteractionContextExternalizer.ATR_NAVIGATION));
-		String originId = org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertXmlToString(attributes.getValue(InteractionContextExternalizer.ATR_ORIGIN_ID));
-		String startDate = attributes.getValue(InteractionContextExternalizer.ATR_START_DATE);
-		String structureHandle = org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertXmlToString(attributes.getValue(InteractionContextExternalizer.ATR_STRUCTURE_HANDLE));
-		String structureKind = org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertXmlToString(attributes.getValue(InteractionContextExternalizer.ATR_STRUCTURE_KIND));
-
-		// the number of events and event count on creation are needed to ensure that the context that is read in is the same as what was written out
-		String numEventsString = attributes.getValue(InteractionContextExternalizer.ATR_NUM_EVENTS);
-		int numEvents = 1;
-		if (numEventsString != null && numEventsString.length() != 0) {
-			try {
-				numEvents = Integer.parseInt(numEventsString);
-			} catch (NumberFormatException nfe) {
-				//ignore.
-			}
-		}
-
-		String eventCountOnCreationString = attributes.getValue(InteractionContextExternalizer.ATR_CREATION_COUNT);
-		int eventCountOnCreation = -1;
-		if (eventCountOnCreationString != null && eventCountOnCreationString.length() != 0) {
-			try {
-				eventCountOnCreation = Integer.parseInt(eventCountOnCreationString);
-			} catch (NumberFormatException nfe) {
-				//ignore.
-			}
-		}
-
-		SimpleDateFormat dateFormat = new SimpleDateFormat(InteractionContextExternalizer.DATE_FORMAT_STRING,
-				Locale.ENGLISH);
-		Date dStartDate = dateFormat.parse(startDate);
-		Date dEndDate = dateFormat.parse(endDate);
-		float iInterest = Float.parseFloat(interest);
-
-		InteractionEvent ie = null;
-		if (numEventsString == null || eventCountOnCreationString == null) {
-			// if we don't have the values for the collapsed event, it must be one that is uncollapsed
-			ie = new InteractionEvent(Kind.fromString(kind), structureKind, structureHandle, originId, navigation,
-					delta, iInterest, dStartDate, dEndDate);
-		} else {
-			ie = new AggregateInteractionEvent(Kind.fromString(kind), structureKind, structureHandle, originId,
-					navigation, delta, iInterest, dStartDate, dEndDate, numEvents, eventCountOnCreation);
-		}
-		return ie;
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextReader.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextReader.java
deleted file mode 100644
index 5eaaab5..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextReader.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Brock Janiczak and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Brock Janiczak - initial API and implementation
- *     Tasktop Technologies - improvements
- *     Jevgeni Holodkov - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.core;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.net.URLEncoder;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * @author Brock Janiczak
- * @author Mik Kersten (refactoring)
- */
-public class SaxContextReader implements IInteractionContextReader {
-
-	private IInteractionContextScaling contextScaling;
-
-	public SaxContextReader() {
-	}
-
-	public void setContextScaling(IInteractionContextScaling contextScaling) {
-		this.contextScaling = contextScaling;
-	}
-
-	/**
-	 * Reads the first entry in the zip file if an entry matching the handleIdentifier is not found.
-	 */
-	public InteractionContext readContext(String handleIdentifier, File file) {
-		if (!file.exists()) {
-			return null;
-		}
-		try {
-			FileInputStream fileInputStream = new FileInputStream(file);
-			try {
-				ZipInputStream zipInputStream = new ZipInputStream(fileInputStream);
-				try {
-					// search for context entry
-					String encoded = URLEncoder.encode(handleIdentifier,
-							InteractionContextManager.CONTEXT_FILENAME_ENCODING);
-					String contextFileName = encoded + InteractionContextManager.CONTEXT_FILE_EXTENSION_OLD;
-					ZipEntry entry = zipInputStream.getNextEntry();
-					while (entry != null) {
-						if (contextFileName.equals(entry.getName())) {
-							break;
-						}
-						entry = zipInputStream.getNextEntry();
-					}
-
-					if (entry == null) {
-						return null;
-					}
-
-					SaxContextContentHandler contentHandler = new SaxContextContentHandler(handleIdentifier,
-							contextScaling);
-					XMLReader reader = XMLReaderFactory.createXMLReader();
-					reader.setContentHandler(contentHandler);
-					reader.parse(new InputSource(zipInputStream));
-					return contentHandler.getContext();
-				} finally {
-					zipInputStream.close();
-				}
-			} finally {
-				fileInputStream.close();
-			}
-		} catch (Exception e) {
-			File saveFile = new File(file.getAbsolutePath() + "-save"); //$NON-NLS-1$
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN,
-					"Error loading context, backup saved to \"" + saveFile + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
-			file.renameTo(saveFile);
-			return null;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextWriter.java b/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextWriter.java
deleted file mode 100644
index 6d58d4f..0000000
--- a/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextWriter.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Brock Janiczak and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Brock Janiczak - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.core;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.AttributesImpl;
-
-/**
- * @author Brock Janiczak
- * @author Mik Kersten (refactoring)
- */
-public class SaxContextWriter implements IInteractionContextWriter {
-
-	private OutputStream outputStream;
-
-	public void setOutputStream(OutputStream outputStream) {
-		this.outputStream = outputStream;
-	}
-
-	public void writeContextToStream(IInteractionContext context) throws IOException {
-		if (outputStream == null) {
-			IOException ioe = new IOException("OutputStream not set"); //$NON-NLS-1$
-			throw ioe;
-		}
-
-		try {
-			Transformer transformer = TransformerFactory.newInstance().newTransformer();
-			transformer.transform(new SAXSource(new SaxWriter(), new InteractionContextInputSource(context)),
-					new StreamResult(outputStream));
-		} catch (TransformerException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextCorePlugin.ID_PLUGIN, "Could not write context", e)); //$NON-NLS-1$
-			throw new IOException(e.getMessage());
-		}
-	}
-
-	private static class InteractionContextInputSource extends InputSource {
-
-		private final IInteractionContext context;
-
-		public InteractionContextInputSource(IInteractionContext context) {
-			this.context = context;
-		}
-
-		public IInteractionContext getContext() {
-			return this.context;
-		}
-
-	}
-
-	private class SaxWriter implements XMLReader {
-
-		private ContentHandler handler;
-
-		private ErrorHandler errorHandler;
-
-		public boolean getFeature(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
-			return false;
-		}
-
-		public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException {
-
-		}
-
-		public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
-			return null;
-		}
-
-		public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
-		}
-
-		public void setEntityResolver(EntityResolver resolver) {
-		}
-
-		public EntityResolver getEntityResolver() {
-			return null;
-		}
-
-		public void setDTDHandler(DTDHandler handler) {
-		}
-
-		public DTDHandler getDTDHandler() {
-			return null;
-		}
-
-		public void setContentHandler(ContentHandler handler) {
-			this.handler = handler;
-
-		}
-
-		public ContentHandler getContentHandler() {
-			return handler;
-		}
-
-		public void setErrorHandler(ErrorHandler handler) {
-			this.errorHandler = handler;
-
-		}
-
-		public ErrorHandler getErrorHandler() {
-			return errorHandler;
-		}
-
-		public void parse(InputSource input) throws IOException, SAXException {
-			if (!(input instanceof InteractionContextInputSource)) {
-				throw new SAXException("Can only parse writable input sources"); //$NON-NLS-1$
-			}
-
-			IInteractionContext context = ((InteractionContextInputSource) input).getContext();
-
-			handler.startDocument();
-			AttributesImpl rootAttributes = new AttributesImpl();
-			rootAttributes.addAttribute("", InteractionContextExternalizer.ATR_ID, //$NON-NLS-1$
-					InteractionContextExternalizer.ATR_ID, "", context.getHandleIdentifier()); //$NON-NLS-1$
-			if (context.getContentLimitedTo() != null) {
-				rootAttributes.addAttribute("", SaxContextContentHandler.ATTRIBUTE_CONTENT, //$NON-NLS-1$
-						SaxContextContentHandler.ATTRIBUTE_CONTENT, "", context.getContentLimitedTo()); //$NON-NLS-1$
-			}
-			rootAttributes.addAttribute("", InteractionContextExternalizer.ATR_VERSION, //$NON-NLS-1$
-					InteractionContextExternalizer.ATR_VERSION, "", "1"); //$NON-NLS-1$ //$NON-NLS-2$
-
-			handler.startElement("", InteractionContextExternalizer.ELMNT_INTERACTION_HISTORY, //$NON-NLS-1$
-					InteractionContextExternalizer.ELMNT_INTERACTION_HISTORY, rootAttributes);
-			// List could get modified as we're writing
-			for (InteractionEvent ie : context.getInteractionHistory()) {
-				Attributes ieAttributes = createEventAttributes(ie);
-				handler.startElement("", SaxContextContentHandler.ATTRIBUTE_INTERACTION_EVENT, //$NON-NLS-1$
-						SaxContextContentHandler.ATTRIBUTE_INTERACTION_EVENT, ieAttributes);
-				handler.endElement("", SaxContextContentHandler.ATTRIBUTE_INTERACTION_EVENT, //$NON-NLS-1$
-						SaxContextContentHandler.ATTRIBUTE_INTERACTION_EVENT);
-			}
-			handler.endElement("", InteractionContextExternalizer.ELMNT_INTERACTION_HISTORY, //$NON-NLS-1$
-					InteractionContextExternalizer.ELMNT_INTERACTION_HISTORY);
-
-			handler.endDocument();
-		}
-
-		public void parse(String systemId) throws IOException, SAXException {
-			throw new SAXException("Can only parse writable input sources"); //$NON-NLS-1$
-		}
-	}
-
-	@SuppressWarnings( { "deprecation", "restriction" })
-	private Attributes createEventAttributes(InteractionEvent ie) {
-		SimpleDateFormat dateFormat = new SimpleDateFormat(InteractionContextExternalizer.DATE_FORMAT_STRING,
-				Locale.ENGLISH);
-
-		AttributesImpl ieAttributes = new AttributesImpl();
-
-		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_DELTA, //$NON-NLS-1$
-				InteractionContextExternalizer.ATR_DELTA, "", //$NON-NLS-1$
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(ie.getDelta()));
-		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_END_DATE, //$NON-NLS-1$
-				InteractionContextExternalizer.ATR_END_DATE, "", dateFormat.format(ie.getEndDate())); //$NON-NLS-1$
-		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_INTEREST, //$NON-NLS-1$
-				InteractionContextExternalizer.ATR_INTEREST, "", Float.toString(ie.getInterestContribution())); //$NON-NLS-1$
-		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_KIND, InteractionContextExternalizer.ATR_KIND, //$NON-NLS-1$
-				"", ie.getKind().toString()); //$NON-NLS-1$
-		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_NAVIGATION, //$NON-NLS-1$
-				InteractionContextExternalizer.ATR_NAVIGATION, "", //$NON-NLS-1$
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(ie.getNavigation()));
-		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_ORIGIN_ID, //$NON-NLS-1$
-				InteractionContextExternalizer.ATR_ORIGIN_ID, "", //$NON-NLS-1$
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(ie.getOriginId()));
-		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_START_DATE, //$NON-NLS-1$
-				InteractionContextExternalizer.ATR_START_DATE, "", dateFormat.format(ie.getDate())); //$NON-NLS-1$
-		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_STRUCTURE_HANDLE, //$NON-NLS-1$
-				InteractionContextExternalizer.ATR_STRUCTURE_HANDLE, "", //$NON-NLS-1$
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(ie.getStructureHandle()));
-		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_STRUCTURE_KIND, //$NON-NLS-1$
-				InteractionContextExternalizer.ATR_STRUCTURE_KIND, "", //$NON-NLS-1$
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(ie.getStructureKind()));
-
-		if (ie instanceof AggregateInteractionEvent) {
-			// keep the state of the element (how it was collapsed and when it was created) to ensure that the context is the same after writing
-			ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_NUM_EVENTS, //$NON-NLS-1$
-					InteractionContextExternalizer.ATR_NUM_EVENTS, "", //$NON-NLS-1$
-					Integer.toString(((AggregateInteractionEvent) ie).getNumCollapsedEvents()));
-			ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_CREATION_COUNT, //$NON-NLS-1$
-					InteractionContextExternalizer.ATR_CREATION_COUNT, "", //$NON-NLS-1$
-					Integer.toString(((AggregateInteractionEvent) ie).getEventCountOnCreation()));
-		}
-		return ieAttributes;
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/.classpath b/org.eclipse.mylyn.context.tests/.classpath
deleted file mode 100644
index c9c6503..0000000
--- a/org.eclipse.mylyn.context.tests/.classpath
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<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.context.tests/.cvsignore b/org.eclipse.mylyn.context.tests/.cvsignore
deleted file mode 100644
index 0a2b580..0000000
--- a/org.eclipse.mylyn.context.tests/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-credentials.properties
diff --git a/org.eclipse.mylyn.context.tests/.project b/org.eclipse.mylyn.context.tests/.project
deleted file mode 100644
index 1c3147c..0000000
--- a/org.eclipse.mylyn.context.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.context.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.context.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.context.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 01d52ea..0000000
--- a/org.eclipse.mylyn.context.tests/.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=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.context.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.context.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.context.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.context.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.context.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.context.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.context.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.context.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.context.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.context.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.context.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.context.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.context.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index e5771b2..0000000
--- a/org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Context Tests
-Bundle-SymbolicName: org.eclipse.mylyn.context.tests
-Bundle-Version: 0.0.0
-Bundle-Activator: org.eclipse.mylyn.context.tests.ContextTestsPlugin
-Bundle-Vendor: Eclipse Mylyn
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.junit,
- org.eclipse.ui,
- org.eclipse.jdt.core,
- org.eclipse.pde,
- org.eclipse.ui.ide,
- org.eclipse.pde.core,
- org.eclipse.mylyn.commons.core,
- org.eclipse.mylyn.context.core,
- org.eclipse.mylyn.context.ui,
- org.eclipse.mylyn.monitor.ui,
- org.eclipse.mylyn.monitor.core
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: mylyn-core-tests.jar
-Export-Package: org.eclipse.mylyn.context.tests;x-internal:=true,
- org.eclipse.mylyn.context.tests.support;x-internal:=true,
- org.eclipse.mylyn.context.tests.support.search;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.context.tests/about.html b/org.eclipse.mylyn.context.tests/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.context.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.context.tests/build.properties b/org.eclipse.mylyn.context.tests/build.properties
deleted file mode 100644
index d82b168..0000000
--- a/org.eclipse.mylyn.context.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 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-core-tests.jar,\
-               about.html,\
-               testdata/,\
-               mylyn-core-tests.jar
-src.includes = about.html
-jars.compile.order = mylyn-core-tests.jar
-source.mylyn-core-tests.jar = src/
-output.mylyn-core-tests.jar = bin/
-jre.compilation.profile = J2SE-1.5
-source.mylyn-core-tests.jar = src/
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/AbstractContextTest.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/AbstractContextTest.java
deleted file mode 100644
index bbc8b2b..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/AbstractContextTest.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.context.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public abstract class AbstractContextTest extends TestCase {
-
-	protected static final String MOCK_HANDLE = "<mock-handle>";
-
-	private static final String MOCK_PROVIDER = "<mock-provider>";
-
-	protected static final String MOCK_ORIGIN = "<mock-origin>";
-
-	protected static final String MOCK_KIND = "java";
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		if (ContextCore.getContextManager() != null) {
-			assertFalse("Unexpected context active: "
-					+ ((InteractionContextManager) ContextCore.getContextManager()).getActiveContexts(),
-					ContextCore.getContextManager().isContextActive());
-		}
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (ContextCore.getContextManager() != null) {
-			assertFalse("" + ((InteractionContextManager) ContextCore.getContextManager()).getActiveContexts(),
-					ContextCore.getContextManager().isContextActive());
-		}
-	}
-
-	protected InteractionEvent mockSelection(String handle) {
-		return new InteractionEvent(InteractionEvent.Kind.SELECTION, MOCK_KIND, handle, MOCK_ORIGIN);
-	}
-
-	protected InteractionEvent mockPropagation(String handle) {
-		return new InteractionEvent(InteractionEvent.Kind.PROPAGATION, MOCK_KIND, handle, MOCK_ORIGIN);
-	}
-
-	protected InteractionEvent mockSelection() {
-		return mockSelection(MOCK_HANDLE);
-	}
-
-	protected InteractionEvent mockNavigation(String toHandle) {
-		return new InteractionEvent(InteractionEvent.Kind.SELECTION, MOCK_KIND, toHandle, MOCK_ORIGIN, MOCK_PROVIDER);
-	}
-
-	protected InteractionEvent mockInterestContribution(String handle, String kind, float value) {
-		InteractionEvent event = new InteractionEvent(InteractionEvent.Kind.MANIPULATION, kind, handle, MOCK_ORIGIN,
-				value);
-		return event;
-	}
-
-	protected InteractionEvent mockInterestContribution(String handle, float value) {
-		return mockInterestContribution(handle, MOCK_KIND, value);
-	}
-
-	protected InteractionEvent mockPreferenceChange(String handle) {
-		return new InteractionEvent(InteractionEvent.Kind.PREFERENCE, MOCK_KIND, handle, MOCK_ORIGIN);
-	}
-
-	protected boolean compareTaskscapeEquality(IInteractionContext t1, IInteractionContext t2) {
-		return false;
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/AllContextTests.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/AllContextTests.java
deleted file mode 100644
index cf41ba9..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/AllContextTests.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.context.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.mylyn.context.tests.support.TestUtil;
-
-/**
- * @author Mik Kersten
- */
-public class AllContextTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.mylyn.context.tests");
-
-		TestUtil.triggerContextUiLazyStart();
-
-		// $JUnit-BEGIN$
-		suite.addTestSuite(InteractionContextListeningTest.class);
-		suite.addTestSuite(ScalingFactorsTest.class);
-		suite.addTestSuite(InteractionContextTest.class);
-		suite.addTestSuite(ContextExternalizerTest.class);
-		suite.addTestSuite(DegreeOfInterestTest.class);
-		suite.addTestSuite(ContextTest.class);
-		suite.addTestSuite(InteractionEventTest.class);
-		suite.addTestSuite(ShadowsBridgeTest.class);
-		// $JUnit-END$
-		return suite;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextExternalizerTest.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextExternalizerTest.java
deleted file mode 100644
index b6db631..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextExternalizerTest.java
+++ /dev/null
@@ -1,301 +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.context.tests;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-import org.eclipse.mylyn.context.tests.support.DomContextReader;
-import org.eclipse.mylyn.context.tests.support.DomContextWriter;
-import org.eclipse.mylyn.context.tests.support.FileTool;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextExternalizer;
-import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.internal.context.core.SaxContextReader;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- */
-public class ContextExternalizerTest extends AbstractContextTest {
-
-	private static final String CONTEXT_HANDLE = "context-externalization";
-
-	private InteractionContext context;
-
-	private IInteractionContextScaling scaling;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		scaling = ContextCore.getCommonContextScaling();
-		context = new InteractionContext(CONTEXT_HANDLE, ContextCore.getCommonContextScaling());
-		assertNotNull(ContextCore.getContextManager());
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testContentAttributeExternalization() throws Exception {
-		InteractionContextExternalizer externalizer = new InteractionContextExternalizer();
-		context.parseEvent(mockSelection("1"));
-		context.setContentLimitedTo("foobar");
-
-		IInteractionContext loaded = writeAndReadContext(context, externalizer);
-
-		assertEquals("foobar", loaded.getContentLimitedTo());
-	}
-
-	public void testSaxExternalizationAgainstDom() throws Exception {
-		File file = FileTool.getFileInPlugin(ContextTestsPlugin.getDefault(), new Path(
-				"testdata/externalizer/testcontext.xml.zip"));
-		assertTrue(file.getAbsolutePath(), file.exists());
-		InteractionContextExternalizer externalizer = new InteractionContextExternalizer();
-//		externalizer.setReader(new DomContextReader());
-		IInteractionContext domReadContext = externalizer.readContextFromXml(CONTEXT_HANDLE, file,
-				new DomContextReader(), scaling);
-
-//		externalizer.setReader(new SaxContextReader());
-		IInteractionContext saxReadContext = externalizer.readContextFromXml(CONTEXT_HANDLE, file,
-				new SaxContextReader(), scaling);
-		assertEquals(284, saxReadContext.getInteractionHistory().size()); // known
-		// from
-		// testdata
-		assertEquals(domReadContext, saxReadContext);
-
-//		externalizer.setWriter(new DomContextWriter());
-		File domOut = new File("dom-out.xml");
-		domOut.deleteOnExit();
-		externalizer.writeContextToXml(saxReadContext, domOut, new DomContextWriter());
-
-		//externalizer.setWriter(new DomContextWriter());
-		File saxOut = new File("sax-out.xml");
-		saxOut.deleteOnExit();
-		externalizer.writeContextToXml(saxReadContext, saxOut, new DomContextWriter());
-		assertEquals(domOut.length(), saxOut.length());
-
-		//externalizer.setReader(new DomContextReader());
-		IInteractionContext domReadAfterWrite = externalizer.readContextFromXml(CONTEXT_HANDLE, file,
-				new DomContextReader(), scaling);
-		//externalizer.setReader(new SaxContextReader());
-		IInteractionContext saxReadAfterWrite = externalizer.readContextFromXml(CONTEXT_HANDLE, file,
-				new SaxContextReader(), scaling);
-
-		assertEquals(domReadAfterWrite, saxReadAfterWrite);
-	}
-
-	public void testContextSize() throws Exception {
-		InteractionContextExternalizer externalizer = new InteractionContextExternalizer();
-		String path = "extern.xml";
-		File file = new File(path);
-		file.deleteOnExit();
-
-		int ORIGINAL = 100;
-		for (int i = 0; i < ORIGINAL; i++) {
-			context.parseEvent(mockSelection("1"));
-			context.parseEvent(mockPreferenceChange("2"));
-		}
-		context.collapse();
-		externalizer.writeContextToXml(context, file);
-		long size = file.length();
-
-		context.reset();
-		for (int i = 0; i < ORIGINAL * ORIGINAL; i++) {
-			context.parseEvent(mockSelection("1"));
-			context.parseEvent(mockPreferenceChange("2"));
-		}
-		context.collapse();
-		externalizer.writeContextToXml(context, file);
-		long size2 = file.length();
-		assertTrue(size <= size2 * 2);
-	}
-
-	public void testExternalization() throws Exception {
-		InteractionContextExternalizer externalizer = new InteractionContextExternalizer();
-
-		IInteractionElement node = context.parseEvent(mockSelection("1"));
-		context.parseEvent(mockNavigation("2"));
-		IInteractionRelation edge = node.getRelation("2");
-		assertNotNull(edge);
-		assertEquals(1, node.getRelations().size());
-		context.parseEvent(mockInterestContribution("3", scaling.getLandmark() + scaling.getDecay() * 3));
-		assertTrue("interest: " + context.get("3").getInterest().getValue(), context.get("3")
-				.getInterest()
-				.isLandmark());
-		float doi = node.getInterest().getValue();
-		assertNotNull(context.getLandmarks());
-
-		// "3" not a user event
-		assertEquals("2", context.getActiveNode().getHandleIdentifier());
-
-		IInteractionContext loaded = writeAndReadContext(context, externalizer);
-		assertEquals(3, loaded.getInteractionHistory().size());
-		IInteractionElement loadedNode = loaded.get("1");
-		IInteractionRelation edgeNode = loadedNode.getRelation("2");
-		assertNotNull(edgeNode);
-		assertEquals(1, loadedNode.getRelations().size());
-
-		IInteractionElement landmark = loaded.get("3");
-		assertNotNull(loadedNode);
-		assertEquals(doi, loadedNode.getInterest().getValue());
-		assertTrue(landmark.getInterest().isLandmark());
-		assertNotNull(loaded.getLandmarks());
-
-		assertEquals("2", loaded.getActiveNode().getHandleIdentifier());
-	}
-
-	/**
-	 * What is written and read from disk should always return the same doi for an element when the context is collapsed
-	 * 
-	 * @throws Exception
-	 */
-	public void testExternalizationWithCollapse() throws Exception {
-		InteractionContextExternalizer externalizer = new InteractionContextExternalizer();
-
-		// create nodes in the context and ensure that writing and reading work properly
-		IInteractionElement node1 = context.parseEvent(mockSelection("1"));
-		IInteractionElement node2 = context.parseEvent(mockSelection("2"));
-		context.parseEvent(mockSelection("2"));
-		context.parseEvent(mockSelection("2"));
-
-		float doi1 = node1.getInterest().getValue();
-		float doi2 = node2.getInterest().getValue();
-
-		int numEvents = context.getUserEventCount();
-
-		// key to this test
-		context.collapse();
-		InteractionContext loadedContext = (InteractionContext) writeAndReadContext(context, externalizer);
-
-		assertEquals(numEvents, loadedContext.getUserEventCount());
-
-		IInteractionElement loadedNode1 = loadedContext.get("1");
-		IInteractionElement loadedNode2 = loadedContext.get("2");
-
-		assertEquals(doi1, loadedNode1.getInterest().getValue());
-		assertEquals(doi2, loadedNode2.getInterest().getValue());
-
-		//
-		// try to write a second time without changes
-		//
-
-		// key to this test
-		loadedContext.collapse();
-		InteractionContext loadedContext2 = (InteractionContext) writeAndReadContext(loadedContext, externalizer);
-
-		assertEquals(numEvents, loadedContext2.getUserEventCount());
-
-		loadedNode1 = loadedContext2.get("1");
-		loadedNode2 = loadedContext2.get("2");
-
-		assertEquals(doi1, loadedNode1.getInterest().getValue());
-		assertEquals(doi2, loadedNode2.getInterest().getValue());
-
-		//
-		// try to change the context that was read and write again
-		//
-		node1 = loadedContext2.parseEvent(mockSelection("1"));
-		node2 = loadedContext2.parseEvent(mockSelection("2"));
-		loadedContext2.parseEvent(mockSelection("2"));
-		loadedContext2.parseEvent(mockSelection("1"));
-
-		doi1 = node1.getInterest().getValue();
-		doi2 = node2.getInterest().getValue();
-
-		numEvents = loadedContext2.getUserEventCount();
-
-		loadedContext2.collapse();
-
-		InteractionContext loadedContext3 = (InteractionContext) writeAndReadContext(loadedContext2, externalizer);
-
-		assertEquals(numEvents, loadedContext3.getUserEventCount());
-
-		loadedNode1 = loadedContext3.get("1");
-		loadedNode2 = loadedContext3.get("2");
-
-		assertEquals(doi1, loadedNode1.getInterest().getValue());
-		assertEquals(doi2, loadedNode2.getInterest().getValue());
-	}
-
-	private IInteractionContext writeAndReadContext(InteractionContext contextToWrite,
-			InteractionContextExternalizer externalizer) throws Exception {
-		File file = ContextCorePlugin.getContextStore().getFileForContext(contextToWrite.getHandleIdentifier());
-		file.deleteOnExit();
-		externalizer.writeContextToXml(contextToWrite, file);
-
-		// TODO: fix up directory refs
-		File dataDirectory = ContextCorePlugin.getContextStore().getContextDirectory().getParentFile();
-		File contextsDirectory = new File(dataDirectory, "contexts"/*WorkspaceAwareContextStore.CONTEXTS_DIRECTORY*/);
-		File zippedContextFile = new File(contextsDirectory, contextToWrite.getHandleIdentifier()
-				+ InteractionContextManager.CONTEXT_FILE_EXTENSION);
-		assertTrue(zippedContextFile.exists());
-		IInteractionContext loaded = externalizer.readContextFromXml(CONTEXT_HANDLE, zippedContextFile, scaling);
-		assertNotNull(loaded);
-		return loaded;
-	}
-
-	public void testReadOtherContextHandle() throws Exception {
-		InteractionContextExternalizer externalizer = new InteractionContextExternalizer();
-
-		context.setHandleIdentifier("handle-1");
-		context.parseEvent(mockSelection("1"));
-		File file1 = File.createTempFile("context", null);
-		file1.deleteOnExit();
-		externalizer.writeContextToXml(context, file1);
-
-		context.setHandleIdentifier("handle-2");
-		context.parseEvent(mockSelection("2"));
-		File file2 = File.createTempFile("context", null);
-		file2.deleteOnExit();
-		externalizer.writeContextToXml(context, file2);
-
-		context = (InteractionContext) externalizer.readContextFromXml("handle-1", file1, scaling);
-		assertNotNull(context);
-		assertEquals(1, context.getAllElements().size());
-
-		context = (InteractionContext) externalizer.readContextFromXml("handle-1", file2, scaling);
-		assertNotNull(context);
-		assertEquals(2, context.getAllElements().size());
-
-		context = (InteractionContext) externalizer.readContextFromXml("abc", file1, scaling);
-		assertNotNull(context);
-		assertEquals(1, context.getAllElements().size());
-	}
-
-	public void testReadInvalidContextHandle() throws Exception {
-		InteractionContextExternalizer externalizer = new InteractionContextExternalizer();
-		File file = File.createTempFile("context", null);
-		file.deleteOnExit();
-		ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file));
-		try {
-			ZipEntry entry = new ZipEntry("name");
-			out.putNextEntry(entry);
-		} finally {
-			out.close();
-		}
-
-		context = (InteractionContext) externalizer.readContextFromXml("abc", file, scaling);
-		assertNull(context);
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextTest.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextTest.java
deleted file mode 100644
index 15dd8be..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextTest.java
+++ /dev/null
@@ -1,121 +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.context.tests;
-
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-
-/**
- * @author Mik Kersten
- */
-public class ContextTest extends AbstractContextTest {
-
-	private InteractionContext context;
-
-	private InteractionContextScaling scaling;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		scaling = new InteractionContextScaling();
-		context = new InteractionContext("0", scaling);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testEquality() {
-		InteractionContext context1 = new InteractionContext("1", scaling);
-		context1.parseEvent(mockSelection("1"));
-		InteractionContext context2 = new InteractionContext("2", scaling);
-		context2.parseEvent(mockSelection("2"));
-		assertFalse(context1.equals(context2));
-	}
-
-	public void testReset() {
-		context.parseEvent(mockSelection());
-		context.reset();
-
-		assertNull(context.getActiveNode());
-
-	}
-
-	public void testManipulation() {
-		IInteractionElement node = context.parseEvent(mockSelection("1"));
-		context.parseEvent(mockSelection("1"));
-		context.parseEvent(mockInterestContribution("1", 40));
-		assertEquals(42 - (scaling.getDecay() * 1), node.getInterest().getValue());
-
-		context.parseEvent(mockInterestContribution("1", -20));
-		assertEquals(22 - (scaling.getDecay() * 1), node.getInterest().getValue());
-	}
-
-	public void testPropagatedInterest() {
-		IInteractionElement node = context.parseEvent(mockPropagation("1"));
-		assertTrue(node.getInterest().isPropagated());
-		context.parseEvent(mockSelection("1"));
-		context.parseEvent(mockInterestContribution("1", -10));
-		assertFalse(node.getInterest().isPropagated());
-		// context.parseEvent(mockInterestContribution("1", 40));
-		// assertEquals(42-(scaling.getDecay().getValue()*1),
-		// node.getDegreeOfInterest().getValue());
-	}
-
-	public void testEdges() {
-		IInteractionElement node = context.parseEvent(mockSelection("1"));
-		context.parseEvent(mockNavigation("2"));
-		IInteractionRelation edge = node.getRelation("2");
-		assertNotNull(edge);
-		assertEquals(edge.getTarget().getHandleIdentifier(), "2");
-	}
-
-	public void testDecay() {
-		float decay = scaling.getDecay();
-		IInteractionElement node1 = context.parseEvent(mockSelection("1"));
-
-		context.parseEvent(mockSelection("2"));
-		for (int i = 0; i < 98; i++) {
-			context.parseEvent(mockSelection("1"));
-		}
-		assertEquals(99 - (decay * 99), node1.getInterest().getValue());
-	}
-
-	public void testLandmarkScaling() {
-		IInteractionElement node1 = context.parseEvent(mockSelection("1"));
-		for (int i = 0; i < scaling.getLandmark() - 2 + (scaling.getLandmark() * scaling.getDecay()); i++) {
-			context.parseEvent(mockSelection("1"));
-		}
-		assertTrue(node1.getInterest().isInteresting());
-		assertFalse(node1.getInterest().isLandmark());
-		context.parseEvent(mockSelection("1"));
-		context.parseEvent(mockSelection("1"));
-		assertTrue(node1.getInterest().isLandmark());
-	}
-
-	public void testSelections() {
-		IInteractionElement missing = context.get("0");
-		assertNull(missing);
-
-		IInteractionElement node = context.parseEvent(mockSelection());
-		assertTrue(node.getInterest().isInteresting());
-		context.parseEvent(mockSelection());
-		assertTrue(node.getInterest().isInteresting());
-		context.parseEvent(mockSelection());
-
-		float doi = node.getInterest().getEncodedValue();
-		assertEquals(3.0f - (2 * scaling.getDecay()), doi);
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextTestsPlugin.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextTestsPlugin.java
deleted file mode 100644
index 19446f7..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ContextTestsPlugin.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Mik Kersten
- */
-public class ContextTestsPlugin extends Plugin {
-	// The shared instance.
-	private static ContextTestsPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public ContextTestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ContextTestsPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/DegreeOfInterestTest.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/DegreeOfInterestTest.java
deleted file mode 100644
index 99c2be6..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/DegreeOfInterestTest.java
+++ /dev/null
@@ -1,94 +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.context.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.context.core.DegreeOfInterest;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public class DegreeOfInterestTest extends TestCase {
-
-	private final InteractionContext mockContext = new InteractionContext("doitest", new InteractionContextScaling());
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testPredictedInterest() {
-		DegreeOfInterest doi = new DegreeOfInterest(mockContext, ContextCore.getCommonContextScaling());
-		InteractionEvent event = new InteractionEvent(InteractionEvent.Kind.PREDICTION, "kind", "handle", "source-id",
-				"id", null, 1);
-		doi.addEvent(event);
-
-		assertTrue(doi.isInteresting());
-		assertFalse(doi.isLandmark());
-		assertFalse(doi.isPropagated());
-		assertTrue(doi.isPredicted());
-	}
-
-	public void testPredictedInterestWithPropagated() {
-		DegreeOfInterest doi = new DegreeOfInterest(mockContext, ContextCore.getCommonContextScaling());
-		InteractionEvent event = new InteractionEvent(InteractionEvent.Kind.SELECTION, "kind", "handle", "source-id",
-				"id", null, 20);
-		doi.addEvent(event);
-
-		InteractionEvent event2 = new InteractionEvent(InteractionEvent.Kind.PREDICTION, "kind", "handle", "source-id",
-				"id", null, 2);
-		doi.addEvent(event2);
-
-		InteractionEvent event3 = new InteractionEvent(InteractionEvent.Kind.PROPAGATION, "kind", "handle",
-				"source-id", "id", null, 750);
-		doi.addEvent(event3);
-
-		InteractionEvent event4 = new InteractionEvent(InteractionEvent.Kind.MANIPULATION, "kind", "handle",
-				"source-id", "id", null, -684);
-		doi.addEvent(event4);
-
-		assertTrue(doi.isInteresting());
-		assertTrue(doi.isLandmark());
-		assertFalse(doi.isPropagated());
-		assertFalse(doi.isPredicted());
-	}
-
-	public void testPropagatedInterest() {
-		DegreeOfInterest doi = new DegreeOfInterest(mockContext, ContextCore.getCommonContextScaling());
-		InteractionEvent event = new InteractionEvent(InteractionEvent.Kind.PROPAGATION, "kind", "handle", "source-id",
-				"id", null, 1);
-		doi.addEvent(event);
-
-		assertTrue(doi.isInteresting());
-		assertFalse(doi.isLandmark());
-		assertTrue(doi.isPropagated());
-		assertFalse(doi.isPredicted());
-	}
-
-	public void testCreation() {
-		DegreeOfInterest doi = new DegreeOfInterest(mockContext, ContextCore.getCommonContextScaling());
-		assertFalse(doi.isInteresting());
-		assertFalse(doi.isLandmark());
-		assertFalse(doi.isPropagated());
-		assertFalse(doi.isPredicted());
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionContextListeningTest.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionContextListeningTest.java
deleted file mode 100644
index 3e2d0d1..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionContextListeningTest.java
+++ /dev/null
@@ -1,84 +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.context.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.internal.context.core.CompositeInteractionContext;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-
-/**
- * @author Steffen Pingel
- */
-public class InteractionContextListeningTest extends TestCase {
-
-	private final InteractionContext mockContext = new InteractionContext("doitest", new InteractionContextScaling());
-
-	private InteractionContextManager contextManager;
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		contextManager.deactivateAllContexts();
-	}
-
-	public void testAddRemoveListenerInContextActivated() {
-		contextManager = ContextCorePlugin.getContextManager();
-		((CompositeInteractionContext) contextManager.getActiveContext()).getContextMap().put("handle", mockContext);
-
-		final StubContextListener listener = new StubContextListener();
-		try {
-			contextManager.addListener(new AbstractContextListener() {
-				@Override
-				public void contextChanged(ContextChangeEvent event) {
-					switch (event.getEventKind()) {
-					case ACTIVATED:
-						contextManager.addListener(listener);
-						contextManager.removeListener(listener);
-						break;
-					}
-				}
-
-			});
-			contextManager.activateContext("handle");
-
-			contextManager.deactivateContext("handle");
-			contextManager.activateContext("handle");
-
-			assertEquals(0, listener.activationEventCount);
-		} finally {
-			// clean up just in case
-			contextManager.removeListener(listener);
-		}
-	}
-
-	private class StubContextListener extends AbstractContextListener {
-
-		private int activationEventCount;
-
-		@Override
-		public void contextChanged(ContextChangeEvent event) {
-			switch (event.getEventKind()) {
-			case ACTIVATED:
-				contextManager.removeListener(this);
-				activationEventCount++;
-				break;
-			}
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionContextTest.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionContextTest.java
deleted file mode 100644
index 2e91ef3..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionContextTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.tests;
-
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public class InteractionContextTest extends AbstractContextTest {
-
-	public void testReset() {
-		InteractionEvent event = mockSelection("aaaaa");
-		InteractionContext context = new InteractionContext("test", new InteractionContextScaling());
-		context.parseEvent(event);
-		assertEquals(1, context.getUserEventCount());
-		assertEquals(1, context.getInteractionHistory().size());
-
-		context.reset();
-		assertEquals(0, context.getUserEventCount());
-		assertEquals(0, context.getInteractionHistory().size());
-	}
-
-	public void testParseEventWithNullHandle() {
-		InteractionEvent event = mockSelection(null);
-		InteractionContext context = new InteractionContext("test", new InteractionContextScaling());
-		assertNull(context.parseEvent(event));
-	}
-
-	public void testSetScalingFactors() {
-		InteractionContextScaling oldScalingFactors = new InteractionContextScaling();
-//		InteractionContextScaling newScalingFactors = new InteractionContextScaling();
-//		newScalingFactors.get(InteractionEvent.Kind.EDIT).setValue(10f);
-		InteractionContext globalContext = new InteractionContext("global", oldScalingFactors);
-		assertEquals(oldScalingFactors, globalContext.getScaling());
-//		globalContext.setScaling(newScalingFactors);
-		((InteractionContextScaling) globalContext.getScaling()).set(InteractionEvent.Kind.EDIT, 10f);
-//		assertEquals(newScalingFactors, globalContext.getScaling());
-		assertEquals(10f, globalContext.getScaling().get(InteractionEvent.Kind.EDIT));
-	}
-
-	public void testScalingFactorSet() {
-		InteractionContextScaling scalingFactors = new InteractionContextScaling();
-		scalingFactors.setDecay(0f);
-		InteractionContext context = new InteractionContext("test", scalingFactors);
-		assertEquals(0f, context.getScaling().getDecay());
-	}
-
-	public void testIsInteresting() {
-		InteractionContext context = new InteractionContext("test", new InteractionContextScaling());
-
-		assertFalse(context.isInteresting("1"));
-
-		context.parseEvent(mockSelection("1"));
-
-		assertTrue(context.isInteresting("1"));
-
-		context.parseEvent(mockInterestContribution("1", -10));
-
-		assertFalse(context.isInteresting("1"));
-		assertNotNull(context.get("1"));
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionEventTest.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionEventTest.java
deleted file mode 100644
index 896baed..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/InteractionEventTest.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.context.tests;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public class InteractionEventTest extends AbstractContextTest {
-
-	public void testCopy() throws InterruptedException {
-		InteractionEvent original = mockSelection();
-		Thread.sleep(1000);
-		InteractionEvent copy = InteractionEvent.makeCopy(original, original.getInterestContribution());
-		assertEquals(original, copy);
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ScalingFactorsTest.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ScalingFactorsTest.java
deleted file mode 100644
index 8cb2373..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ScalingFactorsTest.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.context.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.context.core.IInteractionContextScaling;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-
-/**
- * @author Mik Kersten
- */
-public class ScalingFactorsTest extends TestCase {
-
-	public void testLandmarkDefaults() {
-		IInteractionContextScaling scalingFactors = new InteractionContextScaling();
-		assertEquals(7 * scalingFactors.getLandmark(), scalingFactors.getForcedLandmark());
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ShadowsBridgeTest.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ShadowsBridgeTest.java
deleted file mode 100644
index 53ca420..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/ShadowsBridgeTest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Andrew Eisenberg and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Andrew Eisenberg - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.tests;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-
-/**
- * This tests that structure bridge shadowing occurs appropriately.
- * 
- * @author Andrew Eisenberg
- */
-public class ShadowsBridgeTest extends AbstractContextTest {
-
-	static final String BASE_CONTENT_TYPE = "BASE_CONTENT_TYPE";
-
-	static final String SHADOWS_CONTENT_TYPE = "SHADOWS_CONTENT_TYPE";
-
-	static final String BASE_IDENTIFIER = "BASE_IDENTIFIER";
-
-	static final String SHADOWS_IDENTIFIER = "SHADOWS_IDENTIFIER";
-
-	static final String BASE_LABEL = "BASE_LABEL";
-
-	static final String SHADOWS_LABEL = "SHADOWS_LABEL";
-
-	static final Object BASE_OBJECT = new Object();
-
-	static final Object SHADOWS_OBJECT = new Object();
-
-	class BaseContentStructureBridge extends AbstractContextStructureBridge {
-
-		@Override
-		public boolean acceptsObject(Object object) {
-			return object == BASE_OBJECT || object == SHADOWS_OBJECT;
-		}
-
-		@Override
-		public boolean canBeLandmark(String handle) {
-			return false;
-		}
-
-		@Override
-		public boolean canFilter(Object element) {
-			return false;
-		}
-
-		@Override
-		public List<String> getChildHandles(String handle) {
-			return null;
-		}
-
-		@Override
-		public String getContentType() {
-			return BASE_CONTENT_TYPE;
-		}
-
-		@Override
-		public String getContentType(String elementHandle) {
-			if (elementHandle == BASE_IDENTIFIER) {
-				return BASE_CONTENT_TYPE;
-			} else if (elementHandle == SHADOWS_IDENTIFIER) {
-				return SHADOWS_IDENTIFIER;
-			} else {
-				return null;
-			}
-		}
-
-		@Override
-		public String getHandleForOffsetInObject(Object resource, int offset) {
-			if (resource == BASE_OBJECT) {
-				return BASE_IDENTIFIER;
-			} else if (resource == SHADOWS_OBJECT) {
-				return SHADOWS_IDENTIFIER;
-			} else {
-				return null;
-			}
-		}
-
-		@Override
-		public String getHandleIdentifier(Object object) {
-			if (object == BASE_OBJECT) {
-				return BASE_IDENTIFIER;
-			} else if (object == SHADOWS_OBJECT) {
-				return SHADOWS_IDENTIFIER;
-			} else {
-				return null;
-			}
-		}
-
-		@Override
-		public String getLabel(Object object) {
-			if (object == BASE_OBJECT) {
-				return BASE_LABEL;
-			} else if (object == SHADOWS_OBJECT) {
-				return SHADOWS_LABEL;
-			} else {
-				return null;
-			}
-		}
-
-		@Override
-		public Object getObjectForHandle(String handle) {
-			if (handle == BASE_IDENTIFIER) {
-				return BASE_OBJECT;
-			} else if (handle == SHADOWS_IDENTIFIER) {
-				return SHADOWS_OBJECT;
-			} else {
-				return null;
-			}
-		}
-
-		@Override
-		public String getParentHandle(String handle) {
-			return null;
-		}
-
-		@Override
-		public boolean isDocument(String handle) {
-			return false;
-		}
-
-	}
-
-	class ShadowsContentStructureBridge extends AbstractContextStructureBridge {
-
-		@Override
-		public boolean acceptsObject(Object object) {
-			return object == SHADOWS_OBJECT;
-		}
-
-		@Override
-		public boolean canBeLandmark(String handle) {
-			return false;
-		}
-
-		@Override
-		public boolean canFilter(Object element) {
-			return false;
-		}
-
-		@Override
-		public List<String> getChildHandles(String handle) {
-			return null;
-		}
-
-		@Override
-		public String getContentType() {
-			return SHADOWS_CONTENT_TYPE;
-		}
-
-		@Override
-		public String getContentType(String elementHandle) {
-			if (elementHandle == SHADOWS_IDENTIFIER) {
-				return SHADOWS_IDENTIFIER;
-			} else {
-				return null;
-			}
-		}
-
-		@Override
-		public String getHandleForOffsetInObject(Object resource, int offset) {
-			if (resource == SHADOWS_OBJECT) {
-				return SHADOWS_IDENTIFIER;
-			} else {
-				return null;
-			}
-		}
-
-		@Override
-		public String getHandleIdentifier(Object object) {
-			if (object == SHADOWS_OBJECT) {
-				return SHADOWS_IDENTIFIER;
-			} else {
-				return null;
-			}
-		}
-
-		@Override
-		public String getLabel(Object object) {
-			if (object == SHADOWS_OBJECT) {
-				return SHADOWS_LABEL;
-			} else {
-				return null;
-			}
-		}
-
-		@Override
-		public Object getObjectForHandle(String handle) {
-			if (handle == SHADOWS_IDENTIFIER) {
-				return SHADOWS_OBJECT;
-			} else {
-				return null;
-			}
-		}
-
-		@Override
-		public String getParentHandle(String handle) {
-			return null;
-		}
-
-		@Override
-		public boolean isDocument(String handle) {
-			return false;
-		}
-
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public void testShadowsStructureBridge() throws Exception {
-		// 1) Create mock bridge 
-		BaseContentStructureBridge baseBridge = new BaseContentStructureBridge();
-
-		// 2) Add it to ContextCorePlugin
-		ContextCorePlugin context = ContextCorePlugin.getDefault();
-		context.addStructureBridge(baseBridge);
-
-		// 3) Check that the bridge is found properly
-		AbstractContextStructureBridge otherBridge;
-
-		otherBridge = context.getStructureBridge(BASE_CONTENT_TYPE);
-		assertEquals("Should be the same bridges: " + baseBridge + " " + otherBridge, baseBridge, otherBridge);
-
-		otherBridge = context.getStructureBridge(BASE_OBJECT);
-		assertEquals("Should be the same bridges: " + baseBridge + " " + otherBridge, baseBridge, otherBridge);
-
-//		otherBridge = context.getStructureBridge(SHADOWS_CONTENT_TYPE);
-//		assertEquals("Should be the same bridges: " + baseBridge + " " + otherBridge, baseBridge, otherBridge);
-
-		otherBridge = context.getStructureBridge(SHADOWS_OBJECT);
-		assertEquals("Should be the same bridges: " + baseBridge + " " + otherBridge, baseBridge, otherBridge);
-
-		// 4) Create second mock bridge 
-		ShadowsContentStructureBridge shadowsBridge = new ShadowsContentStructureBridge();
-
-		// 5) Add it to ContextCorePlugin
-		context.addStructureBridge(shadowsBridge);
-
-		// 6) Add shadows relationship (must use reflection because it is not exposed)
-		Method addShadowsContentMethod = ContextCorePlugin.class.getDeclaredMethod("addShadowsContent", String.class,
-				String.class);
-		addShadowsContentMethod.setAccessible(true);
-		addShadowsContentMethod.invoke(context, BASE_CONTENT_TYPE, SHADOWS_CONTENT_TYPE);
-
-		// 7) Ensure that the proper kinds of objects are accepted by the shadows bridge instead
-		// now the base content is shadowed and should return the shadows bridge
-		otherBridge = context.getStructureBridge(BASE_CONTENT_TYPE);
-		assertEquals("Should be the same bridges: " + shadowsBridge + " " + otherBridge, shadowsBridge, otherBridge);
-
-		otherBridge = context.getStructureBridge(SHADOWS_CONTENT_TYPE);
-		assertEquals("Should be the same bridges: " + shadowsBridge + " " + otherBridge, shadowsBridge, otherBridge);
-
-		otherBridge = context.getStructureBridge(SHADOWS_OBJECT);
-		assertEquals("Should be the same bridges: " + shadowsBridge + " " + otherBridge, shadowsBridge, otherBridge);
-
-		// since shadows bridge does not accept BASE_OBJECT, we should still be getting base bridge here.
-		otherBridge = context.getStructureBridge(BASE_OBJECT);
-		assertEquals("Should be the same bridges: " + baseBridge + " " + otherBridge, baseBridge, otherBridge);
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/UiTestUtil.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/UiTestUtil.java
deleted file mode 100644
index dc5b55d..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/UiTestUtil.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.context.tests;
-
-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.IViewReference;
-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;
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/DomContextReader.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/DomContextReader.java
deleted file mode 100644
index 61c82f0..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/DomContextReader.java
+++ /dev/null
@@ -1,152 +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.context.tests.support;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-import java.util.zip.ZipInputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.context.core.AggregateInteractionEvent;
-import org.eclipse.mylyn.internal.context.core.IInteractionContextReader;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.core.InteractionEvent.Kind;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author Mik Kersten
- * 
- * TODO: merge into a single externalizer
- */
-public class DomContextReader implements IInteractionContextReader {
-
-	public InteractionContext readContext(String handle, File file) {
-		if (!file.exists()) {
-			return null;
-		}
-		try {
-			Document doc = openAsDOM(file);
-			Element root = doc.getDocumentElement();
-			// readVersion = Integer.parseInt(root.getAttribute("Version"));
-			// String id = root.getAttribute("Id");
-			InteractionContext t = new InteractionContext(handle, ContextCore.getCommonContextScaling());
-			NodeList list = root.getChildNodes();
-			for (int i = 0; i < list.getLength(); i++) {
-				Node child = list.item(i);
-				InteractionEvent ie = readInteractionEvent(child);
-				if (ie != null) {
-					t.parseEvent(ie);
-				}
-			}
-			return t;
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public Document openAsDOM(File inputFile) throws IOException {
-
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		DocumentBuilder builder = null;
-		Document document = null;
-		ZipInputStream zipInputStream = null;
-		FileInputStream fileInputStream = null;
-		try {
-			fileInputStream = new FileInputStream(inputFile);
-			zipInputStream = new ZipInputStream(fileInputStream);
-			zipInputStream.getNextEntry();
-			builder = factory.newDocumentBuilder();
-			document = builder.parse(zipInputStream);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		} finally {
-			closeStream(zipInputStream);
-			closeStream(fileInputStream);
-		}
-		return document;
-	}
-
-	@SuppressWarnings( { "deprecation" })
-	public InteractionEvent readInteractionEvent(Node n) {
-		try {
-			Element e = (Element) n;
-			String kind = e.getAttribute("Kind");
-			String startDate = e.getAttribute("StartDate");
-			String endDate = e.getAttribute("EndDate");
-			String originId = org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertXmlToString(e.getAttribute("OriginId"));
-			String structureKind = org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertXmlToString(e.getAttribute("StructureKind"));
-			String structureHandle = org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertXmlToString(e.getAttribute("StructureHandle"));
-			String navigation = org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertXmlToString(e.getAttribute("Navigation"));
-			String delta = org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertXmlToString(e.getAttribute("Delta"));
-			String interest = e.getAttribute("Interest");
-			String numEventsString = e.getAttribute("NumEvents");
-			int numEvents = 1;
-			if (numEventsString != null && numEventsString.length() != 0) {
-				try {
-					numEvents = Integer.parseInt(numEventsString);
-				} catch (NumberFormatException nfe) {
-					//ignore.
-				}
-			}
-
-			String eventCountOnCreationString = e.getAttribute("CreationCount");
-			int eventCountOnCreation = -1;
-			if (eventCountOnCreationString != null && eventCountOnCreationString.length() != 0) {
-				try {
-					eventCountOnCreation = Integer.parseInt(eventCountOnCreationString);
-				} catch (NumberFormatException nfe) {
-					//ignore.
-				}
-			}
-
-			String formatString = "yyyy-MM-dd HH:mm:ss.S z";
-			SimpleDateFormat format = new SimpleDateFormat(formatString, Locale.ENGLISH);
-
-			InteractionEvent ie = null;
-			if (numEventsString == null || eventCountOnCreationString == null) {
-				// if we don't have the values for the collapsed event, it must be one that is uncollapsed
-				ie = new InteractionEvent(Kind.fromString(kind), structureKind, structureHandle, originId, navigation,
-						delta, Float.parseFloat(interest), format.parse(startDate), format.parse(endDate));
-			} else {
-				ie = new AggregateInteractionEvent(Kind.fromString(kind), structureKind, structureHandle, originId,
-						navigation, delta, Float.parseFloat(interest), format.parse(startDate), format.parse(endDate),
-						numEvents, eventCountOnCreation);
-			}
-
-			return ie;
-		} catch (ParseException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private static final void closeStream(Closeable closeable) {
-		if (closeable != null) {
-			try {
-				closeable.close();
-			} catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/DomContextWriter.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/DomContextWriter.java
deleted file mode 100644
index 9fe7304..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/DomContextWriter.java
+++ /dev/null
@@ -1,172 +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.context.tests.support;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.internal.context.core.AggregateInteractionEvent;
-import org.eclipse.mylyn.internal.context.core.IInteractionContextWriter;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * TODO: remove the explicit string references
- * 
- * @author Mik Kersten
- */
-public class DomContextWriter implements IInteractionContextWriter {
-
-	private DocumentBuilderFactory dbf = null;
-
-	private Document doc = null;
-
-	private Element root = null;
-
-	private OutputStream outputStream = null;
-
-	private Result result = null;
-
-	public DomContextWriter() throws Exception {
-		dbf = DocumentBuilderFactory.newInstance();
-		doc = dbf.newDocumentBuilder().newDocument();
-	}
-
-	public void writeContextToStream(IInteractionContext context) throws IOException {
-		if (outputStream == null) {
-			IOException ioe = new IOException("OutputStream not set");
-			throw ioe;
-		}
-
-		clearDocument();
-		root = doc.createElement("InteractionHistory");
-		root.setAttribute("Version", "1");
-		root.setAttribute("Id", context.getHandleIdentifier());
-
-		for (InteractionEvent ie : context.getInteractionHistory()) {
-			writeInteractionEvent(ie);
-		}
-		doc.appendChild(root);
-		writeDOMtoStream(doc);
-		return;
-	}
-
-	private void writeDOMtoStream(Document document) {
-		Source source = new DOMSource(document);
-		result = new StreamResult(outputStream);
-		Transformer xformer = null;
-		try {
-			xformer = TransformerFactory.newInstance().newTransformer();
-			xformer.transform(source, result);
-		} catch (TransformerConfigurationException e) {
-			e.printStackTrace();
-		} catch (TransformerFactoryConfigurationError e) {
-			e.printStackTrace();
-		} catch (TransformerException e1) {
-			e1.printStackTrace();
-		}
-	}
-
-	@SuppressWarnings( { "deprecation" })
-	private void writeInteractionEvent(InteractionEvent e) {
-		Element node = doc.createElement("InteractionEvent");
-		String f = "yyyy-MM-dd HH:mm:ss.S z";
-		SimpleDateFormat format = new SimpleDateFormat(f, Locale.ENGLISH);
-		node.setAttribute("Kind", e.getKind().toString());
-		node.setAttribute("StartDate", format.format(e.getDate()));
-		node.setAttribute("EndDate", format.format(e.getEndDate()));
-		node.setAttribute("OriginId",
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(e.getOriginId()));
-		node.setAttribute("StructureKind",
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(e.getStructureKind()));
-		node.setAttribute("StructureHandle",
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(e.getStructureHandle()));
-		node.setAttribute("Navigation",
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(e.getNavigation()));
-		node.setAttribute("Delta",
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(e.getDelta()));
-		node.setAttribute("Interest", "" + e.getInterestContribution());
-
-		if (e instanceof AggregateInteractionEvent) {
-			root.setAttribute("NumEvents", "" + ((AggregateInteractionEvent) e).getNumCollapsedEvents());
-			root.setAttribute("CreationCount", "" + ((AggregateInteractionEvent) e).getEventCountOnCreation());
-		}
-		root.appendChild(node);
-	}
-
-	@SuppressWarnings( { "deprecation" })
-	public void writeEventToStream(InteractionEvent e) throws IOException {
-		if (outputStream == null) {
-			IOException ioe = new IOException("OutputStream not set");
-			throw ioe;
-		}
-
-		clearDocument();
-		root = doc.createElement("InteractionEvent");
-		String f = "yyyy-MM-dd HH:mm:ss.S z";
-		SimpleDateFormat format = new SimpleDateFormat(f, Locale.ENGLISH);
-		root.setAttribute("Kind", e.getKind().toString());
-		root.setAttribute("StartDate", format.format(e.getDate()));
-		root.setAttribute("EndDate", format.format(e.getEndDate()));
-		root.setAttribute("OriginId",
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(e.getOriginId()));
-		root.setAttribute("StructureKind",
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(e.getStructureKind()));
-		root.setAttribute("StructureHandle",
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(e.getStructureHandle()));
-		root.setAttribute("Navigation",
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(e.getNavigation()));
-		root.setAttribute("Delta",
-				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(e.getDelta()));
-		root.setAttribute("Interest", "" + e.getInterestContribution());
-
-		if (e instanceof AggregateInteractionEvent) {
-			root.setAttribute("NumEvents", "" + ((AggregateInteractionEvent) e).getNumCollapsedEvents());
-			root.setAttribute("CreationCount", "" + ((AggregateInteractionEvent) e).getEventCountOnCreation());
-		}
-
-		writeDOMtoStream(doc);
-	}
-
-	private void clearDocument() {
-		try {
-			this.doc = dbf.newDocumentBuilder().newDocument();
-		} catch (ParserConfigurationException e) {
-			throw new RuntimeException(e);
-		}
-
-	}
-
-	public OutputStream getOutputStream() {
-		return outputStream;
-	}
-
-	public void setOutputStream(OutputStream outputStream) {
-		this.outputStream = outputStream;
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/FileTool.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/FileTool.java
deleted file mode 100644
index 99b1c36..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/FileTool.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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.context.tests.support;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-public class FileTool {
-
-	private final static int MAX_RETRY = 5;
-
-	/**
-	 * A buffer.
-	 */
-	private static byte[] buffer = new byte[8192];
-
-	/**
-	 * Unzips the given zip file to the given destination directory extracting only those entries the pass through the
-	 * given filter.
-	 * 
-	 * @param zipFile
-	 *            the zip file to unzip
-	 * @param dstDir
-	 *            the destination directory
-	 * @throws IOException
-	 *             in case of problem
-	 */
-	public static void unzip(ZipFile zipFile, File dstDir) throws IOException {
-		unzip(zipFile, dstDir, dstDir, 0);
-	}
-
-	private static void unzip(ZipFile zipFile, File rootDstDir, File dstDir, int depth) throws IOException {
-
-		Enumeration<? extends ZipEntry> entries = zipFile.entries();
-
-		try {
-			while (entries.hasMoreElements()) {
-				ZipEntry entry = entries.nextElement();
-				if (entry.isDirectory()) {
-					continue;
-				}
-				String entryName = entry.getName();
-				File file = new File(dstDir, changeSeparator(entryName, '/', File.separatorChar));
-				file.getParentFile().mkdirs();
-				InputStream src = null;
-				OutputStream dst = null;
-				try {
-					src = zipFile.getInputStream(entry);
-					dst = new FileOutputStream(file);
-					transferData(src, dst);
-				} finally {
-					if (dst != null) {
-						try {
-							dst.close();
-						} catch (IOException e) {
-							// don't 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
-			}
-		}
-	}
-
-	/**
-	 * Returns the given file path with its separator character changed from the given old separator to the given new
-	 * separator.
-	 * 
-	 * @param path
-	 *            a file path
-	 * @param oldSeparator
-	 *            a path separator character
-	 * @param newSeparator
-	 *            a path separator character
-	 * @return the file path with its separator character changed from the given old separator to the given new
-	 *         separator
-	 */
-	public static String changeSeparator(String path, char oldSeparator, char newSeparator) {
-		return path.replace(oldSeparator, newSeparator);
-	}
-
-	/**
-	 * Copies all bytes in the given source file to the given destination file.
-	 * 
-	 * @param source
-	 *            the given source file
-	 * @param destination
-	 *            the given destination file
-	 * @throws IOException
-	 *             in case of error
-	 */
-	public static void transferData(File source, File destination) throws IOException {
-		destination.getParentFile().mkdirs();
-		InputStream is = null;
-		OutputStream os = null;
-		try {
-			is = new FileInputStream(source);
-			os = new FileOutputStream(destination);
-			transferData(is, os);
-		} finally {
-			if (os != null) {
-				try {
-					os.close();
-				} catch (IOException e) {
-					// don't need to catch this
-				}
-			}
-			if (is != null) {
-				try {
-					is.close();
-				} catch (IOException e) {
-					// don't need to catch this
-				}
-			}
-		}
-	}
-
-	/**
-	 * Copies all bytes in the given source stream to the given destination stream. Neither streams are closed.
-	 * 
-	 * @param source
-	 *            the given source stream
-	 * @param destination
-	 *            the given destination stream
-	 * @throws IOException
-	 *             in case of error
-	 */
-	public static void transferData(InputStream source, OutputStream destination) throws IOException {
-		int bytesRead = 0;
-		while (bytesRead != -1) {
-			bytesRead = source.read(buffer, 0, buffer.length);
-			if (bytesRead != -1) {
-				destination.write(buffer, 0, bytesRead);
-			}
-		}
-	}
-
-	/**
-	 * Copies the given source file to the given destination file.
-	 * 
-	 * @param src
-	 *            the given source file
-	 * @param dst
-	 *            the given destination file
-	 * @throws IOException
-	 *             in case of error
-	 */
-	public static void copy(File src, File dst) throws IOException {
-		if (src.isDirectory()) {
-			String[] srcChildren = src.list();
-			for (int i = 0; i < srcChildren.length; ++i) {
-				File srcChild = new File(src, srcChildren[i]);
-				File dstChild = new File(dst, srcChildren[i]);
-				copy(srcChild, dstChild);
-			}
-		} else {
-			transferData(src, dst);
-		}
-	}
-
-	@SuppressWarnings("deprecation")
-	public static File getFileInPlugin(Plugin plugin, IPath path) {
-		try {
-			URL installURL = plugin.getBundle().getEntry(path.toString());
-
-			URL localURL = Platform.asLocalURL(installURL);
-//			URL localURL = FileLocator.toFileURL(installURL);//Platform.asLocalURL(installURL);
-			return new File(localURL.getFile());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-
-	public static File createTempFileInPlugin(Plugin plugin, IPath path) {
-		IPath stateLocation = plugin.getStateLocation();
-		stateLocation = stateLocation.append(path);
-		return stateLocation.toFile();
-	}
-
-	public static StringBuffer read(String fileName) throws IOException {
-		return read(new FileReader(fileName));
-	}
-
-	public static StringBuffer read(Reader reader) throws IOException {
-		StringBuffer s = new StringBuffer();
-		try {
-			char[] charBuffer = new char[8196];
-			int chars = reader.read(charBuffer);
-			while (chars != -1) {
-				s.append(charBuffer, 0, chars);
-				chars = reader.read(charBuffer);
-			}
-		} finally {
-			try {
-				reader.close();
-			} catch (IOException e) {
-				// don't need to catch this
-			}
-		}
-		return s;
-	}
-
-	public static void write(String fileName, StringBuffer content) throws IOException {
-		Writer writer = new FileWriter(fileName);
-		try {
-			writer.write(content.toString());
-		} finally {
-			try {
-				writer.close();
-			} catch (IOException e) {
-				// don't need to catch this
-			}
-		}
-	}
-
-	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
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/ResourceHelper.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/ResourceHelper.java
deleted file mode 100644
index 29b3649..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/ResourceHelper.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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.context.tests.support;
-
-import java.io.IOException;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.tests.ContextTestsPlugin;
-import org.eclipse.pde.internal.core.natures.PDE;
-import org.eclipse.pde.internal.core.natures.PluginProject;
-
-/**
- * @since 3.0
- */
-public class ResourceHelper {
-
-	private final static IProgressMonitor NULL_MONITOR = new NullProgressMonitor();
-
-	private static final int MAX_RETRY = 10;
-
-	public static void deleteProject(String projectName) throws CoreException {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IProject project = root.getProject(projectName);
-		if (project.exists()) {
-			delete(project);
-		}
-	}
-
-	public static void delete(final IResource resource) throws CoreException {
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				for (int i = 0; i < MAX_RETRY; i++) {
-					try {
-						resource.delete(true, null);
-						i = MAX_RETRY;
-					} catch (CoreException e) {
-						if (i == MAX_RETRY - 1) {
-							StatusHandler.log(e.getStatus());
-							throw e;
-						}
-						System.gc(); // help windows to really close file
-						// locks
-						try {
-							Thread.sleep(1000); // sleep a second
-						} catch (InterruptedException e1) {
-						}
-					}
-				}
-			}
-		};
-		ResourcesPlugin.getWorkspace().run(runnable, null);
-
-	}
-
-	private static IProject createProject(String projectName) throws CoreException {
-
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IProject project = root.getProject(projectName);
-		if (!project.exists()) {
-			project.create(NULL_MONITOR);
-		} else {
-			project.refreshLocal(IResource.DEPTH_INFINITE, null);
-		}
-
-		if (!project.isOpen()) {
-			project.open(NULL_MONITOR);
-		}
-
-		return project;
-	}
-
-	private static IJavaProject createPluginProject(IProject project) throws CoreException, JavaModelException {
-
-		if (project == null) {
-			return null;
-		}
-
-		IJavaProject javaProject = JavaCore.create(project);
-
-		// create bin folder
-		IFolder binFolder = project.getFolder("bin");
-		if (!binFolder.exists()) {
-			binFolder.create(false, true, null);
-		}
-
-		// set java nature
-		IProjectDescription description = project.getDescription();
-		description.setNatureIds(new String[] { PDE.PLUGIN_NATURE, JavaCore.NATURE_ID });
-		project.setDescription(description, null);
-
-		// create output folder
-		IPath outputLocation = binFolder.getFullPath();
-		javaProject.setOutputLocation(outputLocation, null);
-
-		PluginProject pluginProject = new PluginProject();
-		pluginProject.setProject(project);
-		pluginProject.configure();
-
-		return javaProject;
-	}
-
-	public static IJavaProject createJavaPluginProjectFromZip(String projectName, String zipFileName)
-			throws CoreException, ZipException, IOException {
-		IProject project = ResourceHelper.createProject(projectName);
-		ZipFile zip = new ZipFile(FileTool.getFileInPlugin(ContextTestsPlugin.getDefault(), new Path(
-				"testdata/projects/" + zipFileName)));
-
-		FileTool.unzip(zip, project.getLocation().toFile());
-
-		project.refreshLocal(IResource.DEPTH_INFINITE, null);
-
-		IJavaProject javaProject = ResourceHelper.createPluginProject(project);
-		return javaProject;
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/TestMonitor.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/TestMonitor.java
deleted file mode 100644
index 60b7e50..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/TestMonitor.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.context.tests.support;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.internal.resources.File;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.mylyn.monitor.ui.AbstractUserInteractionMonitor;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Mik Kersten
- */
-public class TestMonitor extends AbstractUserInteractionMonitor {
-
-	List<IJavaElement> selections = new ArrayList<IJavaElement>();
-
-	public TestMonitor() {
-		super();
-	}
-
-	public void handleElementSelection(IJavaElement selected) {
-		selections.add(selected);
-	}
-
-	protected void handleUnknownSelection(Object selectedObject) {
-		// don't need to do anything here
-	}
-
-	protected void handleSelection(File file) {
-		// don't need to do anything here
-	}
-
-	public List<IJavaElement> getSelections() {
-		return selections;
-	}
-
-	public void handleReferenceNavigation(IJavaElement from, IJavaElement to) {
-		// don't need to do anything here
-	}
-
-	public void handleImplementorNavigation(IJavaElement from, IJavaElement to) {
-		// don't need to do anything here
-	}
-
-	@Override
-	protected void handleWorkbenchPartSelection(IWorkbenchPart part, ISelection selection, boolean contributeToContext) {
-		// don't need to do anything here
-
-	}
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/TestUtil.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/TestUtil.java
deleted file mode 100644
index 2f42d33..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/TestUtil.java
+++ /dev/null
@@ -1,146 +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.context.tests.support;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.net.URL;
-import java.util.Properties;
-
-import junit.framework.AssertionFailedError;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.tests.ContextTestsPlugin;
-import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Steffen Pingel
- */
-public class TestUtil {
-
-	private static boolean contextUiLazyStarted;
-
-	public static final String KEY_CREDENTIALS_FILE = "mylyn.credentials";
-
-	public enum PrivilegeLevel {
-		ANONYMOUS, GUEST, USER, ADMIN
-	};
-
-	public static class Credentials {
-
-		public final String username;
-
-		public final String password;
-
-		public Credentials(String username, String password) {
-			this.username = username;
-			this.password = password;
-		}
-
-		@Override
-		public String toString() {
-			return getClass().getName() + " [username=" + username + ",password=" + password + "]";
-		}
-	}
-
-	public static Credentials readCredentials() {
-		return readCredentials(PrivilegeLevel.USER, null);
-	}
-
-	public static Credentials readCredentials(PrivilegeLevel level) {
-		return readCredentials(level, null);
-	}
-
-	public static Credentials readCredentials(PrivilegeLevel level, String realm) {
-		Properties properties = new Properties();
-		try {
-			String filename = System.getProperty(KEY_CREDENTIALS_FILE);
-			if (filename == null) {
-				if (ContextTestsPlugin.getDefault() != null) {
-					URL localURL = FileLocator.toFileURL(ContextTestsPlugin.getDefault().getBundle().getEntry(
-							"credentials.properties"));
-					filename = localURL.getFile();
-				} else {
-					URL localURL = TestUtil.class.getResource("");
-					filename = localURL.getFile() + "../../../../../../../credentials.properties";
-				}
-			}
-			properties.load(new FileInputStream(new File(filename)));
-		} catch (Exception e) {
-			throw new AssertionFailedError("must define credentials in <plug-in dir>/credentials.properties");
-		}
-
-		String defaultPassword = properties.getProperty("pass");
-
-		realm = (realm != null) ? realm + "." : "";
-		switch (level) {
-		case ANONYMOUS:
-			return createCredentials(properties, realm + "anon.", "", "");
-		case GUEST:
-			return createCredentials(properties, realm + "guest.", "guest@mylyn.eclipse.org", defaultPassword);
-		case USER:
-			return createCredentials(properties, realm, "tests@mylyn.eclipse.org", defaultPassword);
-		case ADMIN:
-			return createCredentials(properties, realm + "admin.", "admin@mylyn.eclipse.org", null);
-		}
-
-		throw new AssertionFailedError("invalid privilege level");
-	}
-
-	private static Credentials createCredentials(Properties properties, String prefix, String defaultUsername,
-			String defaultPassword) {
-		String username = properties.getProperty(prefix + "user");
-		String password = properties.getProperty(prefix + "pass");
-
-		if (username == null) {
-			username = defaultUsername;
-		}
-
-		if (password == null) {
-			password = defaultPassword;
-		}
-
-		if (username == null || password == null) {
-			throw new AssertionFailedError(
-					"username or password not found in <plug-in dir>/credentials.properties, make sure file is valid");
-		}
-
-		return new Credentials(username, password);
-	}
-
-	/**
-	 * Test cases that rely on lazy startup of Context Ui (e.g. context bridges) need to invoke this method prior to
-	 * running the test.
-	 */
-	public static void triggerContextUiLazyStart() {
-		if (contextUiLazyStarted) {
-			return;
-		}
-
-		contextUiLazyStarted = true;
-
-		// make sure monitor UI is started and logs the start interaction event 
-		MonitorUiPlugin.getDefault();
-
-		ContextCore.getContextManager().activateContext("startup");
-		ContextCore.getContextManager().deactivateContext("startup");
-	}
-
-	public static IViewPart openView(String id) throws PartInitException {
-		return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(id);
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/search/ISearchPluginTest.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/search/ISearchPluginTest.java
deleted file mode 100644
index e4dbcec..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/search/ISearchPluginTest.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.context.tests.support.search;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-
-/**
- * @author Mik Kersten
- */
-public interface ISearchPluginTest {
-	public List<?> search(int dos, IInteractionElement node) throws IOException, CoreException;
-}
diff --git a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/search/TestActiveSearchListener.java b/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/search/TestActiveSearchListener.java
deleted file mode 100644
index d1b41763..0000000
--- a/org.eclipse.mylyn.context.tests/src/org/eclipse/mylyn/context/tests/support/search/TestActiveSearchListener.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.tests.support.search;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.mylyn.internal.context.core.AbstractRelationProvider;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchListener;
-
-/**
- * @author Mik Kersten
- */
-public class TestActiveSearchListener implements IActiveSearchListener {
-
-	private AbstractRelationProvider prov = null;
-
-	private List<?> results = null;
-
-	public TestActiveSearchListener(AbstractRelationProvider prov) {
-		this.prov = prov;
-	}
-
-	private boolean gathered = false;
-
-	public void searchCompleted(List<?> l) {
-		List<Object> accepted = new ArrayList<Object>(l.size());
-		if (prov != null) {
-			for (Object o : l) {
-				if (prov.acceptResultElement(o)) {
-					accepted.add(o);
-				}
-			}
-			results = accepted;
-		} else {
-			results = l;
-		}
-		gathered = true;
-	}
-
-	public boolean resultsGathered() {
-		return gathered;
-	}
-
-	public List<?> getResults() {
-		return results;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.tests/testdata/externalizer/testcontext.xml.zip b/org.eclipse.mylyn.context.tests/testdata/externalizer/testcontext.xml.zip
deleted file mode 100644
index ab8ce14..0000000
--- a/org.eclipse.mylyn.context.tests/testdata/externalizer/testcontext.xml.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.tests/testdata/projects/project1.zip b/org.eclipse.mylyn.context.tests/testdata/projects/project1.zip
deleted file mode 100644
index fdb0b93..0000000
--- a/org.eclipse.mylyn.context.tests/testdata/projects/project1.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.tests/testdata/projects/project2.zip b/org.eclipse.mylyn.context.tests/testdata/projects/project2.zip
deleted file mode 100644
index 280f4cf..0000000
--- a/org.eclipse.mylyn.context.tests/testdata/projects/project2.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/.classpath b/org.eclipse.mylyn.context.ui/.classpath
deleted file mode 100644
index 9ead95c..0000000
--- a/org.eclipse.mylyn.context.ui/.classpath
+++ /dev/null
@@ -1,15 +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">
-		<accessrules>
-			<accessrule kind="nonaccessible" pattern="com/sun/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.context.ui/.cvsignore b/org.eclipse.mylyn.context.ui/.cvsignore
deleted file mode 100644
index 4a98758..0000000
--- a/org.eclipse.mylyn.context.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-.fbwarnings
diff --git a/org.eclipse.mylyn.context.ui/.project b/org.eclipse.mylyn.context.ui/.project
deleted file mode 100644
index 9b088d4..0000000
--- a/org.eclipse.mylyn.context.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.context.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.context.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.context.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.context.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.context.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.context.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.context.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.context.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.context.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.context.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.context.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.context.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.context.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.context.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.context.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.context.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.context.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index feba7be..0000000
--- a/org.eclipse.mylyn.context.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.context.ui;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Activator: org.eclipse.mylyn.internal.context.ui.ContextUiPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.forms,
- org.eclipse.ui.navigator,
- org.eclipse.ui.views,
- org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.mylyn.context.ui,
- org.eclipse.mylyn.internal.context.ui;x-internal:=true,
- org.eclipse.mylyn.internal.context.ui.actions;x-internal:=true,
- org.eclipse.mylyn.internal.context.ui.commands;x-internal:=true,
- org.eclipse.mylyn.internal.context.ui.editors;x-internal:=true,
- org.eclipse.mylyn.internal.context.ui.preferences;x-internal:=true,
- org.eclipse.mylyn.internal.context.ui.views;x-internal:=true,
- org.eclipse.mylyn.internal.context.ui.wizards;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.ibm.icu.text
diff --git a/org.eclipse.mylyn.context.ui/about.html b/org.eclipse.mylyn.context.ui/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.context.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.context.ui/build-user.xml b/org.eclipse.mylyn.context.ui/build-user.xml
deleted file mode 100644
index 6097713..0000000
--- a/org.eclipse.mylyn.context.ui/build-user.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<target name="help">
-    <echo message="Please run: $ ant -v -projecthelp"/>
-</target>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.context.ui/build.properties b/org.eclipse.mylyn.context.ui/build.properties
deleted file mode 100644
index 87f64a8..0000000
--- a/org.eclipse.mylyn.context.ui/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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 = plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               META-INF/,\
-               about.html,\
-               .
-src.includes = about.html,\
-               schema/
-jre.compilation.profile = J2SE-1.5
-source.. = src/
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/blank.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/blank.gif
deleted file mode 100644
index 45b7594..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/blank.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/bug-refresh.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/bug-refresh.gif
deleted file mode 100644
index bb8538b..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/bug-refresh.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/bug.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/bug.gif
deleted file mode 100644
index 54525a7..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/bug.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/capture-pause.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/capture-pause.gif
deleted file mode 100644
index 98e7743..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/capture-pause.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/capture-resume.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/capture-resume.gif
deleted file mode 100644
index 40bf78e..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/capture-resume.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/color-palette.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/color-palette.gif
deleted file mode 100644
index 4c94527..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/color-palette.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/context-clear.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/context-clear.gif
deleted file mode 100644
index cbb71be..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/context-clear.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/context-transfer.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/context-transfer.gif
deleted file mode 100644
index 0a97a2d..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/context-transfer.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/delete.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/delete.gif
deleted file mode 100644
index b6922ac..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/delete.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/edge-inheritance.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/edge-inheritance.gif
deleted file mode 100644
index bf41cd7..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/edge-inheritance.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/edge-read.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/edge-read.gif
deleted file mode 100644
index 5feec34..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/edge-read.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/edge-reference.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/edge-reference.gif
deleted file mode 100644
index 9f1a284..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/edge-reference.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/edge-write.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/edge-write.gif
deleted file mode 100644
index b438294..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/edge-write.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/file-xml.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/file-xml.gif
deleted file mode 100644
index 8af38f9..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/file-xml.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/file_obj.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/file_obj.gif
deleted file mode 100644
index 7ccc6a7..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/file_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/fldr_obj.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/fldr_obj.gif
deleted file mode 100644
index 51e703b..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/fldr_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/focus-disabled.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/focus-disabled.gif
deleted file mode 100644
index 24bbeae..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/focus-disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/focus.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/focus.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/focus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/import-zip.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/import-zip.gif
deleted file mode 100644
index f3b6648..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/import-zip.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/interest-decrease.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/interest-decrease.gif
deleted file mode 100644
index 645a58f..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/interest-decrease.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/interest-folding.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/interest-folding.gif
deleted file mode 100644
index 360c475..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/interest-folding.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/interest-increase.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/interest-increase.gif
deleted file mode 100644
index 98a2586..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/interest-increase.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/interest-landmark.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/interest-landmark.gif
deleted file mode 100644
index aad6ec2..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/interest-landmark.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/interest-working-set.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/interest-working-set.gif
deleted file mode 100644
index 9e3340d..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/interest-working-set.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/link-with-editor.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/link-with-editor.gif
deleted file mode 100644
index 068d4c9..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/link-with-editor.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/mylyn-overlay.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/mylyn-overlay.gif
deleted file mode 100644
index 0b145cb..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/mylyn-overlay.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/refresh.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/refresh.gif
deleted file mode 100644
index 17002ac..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/remove.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/remove.gif
deleted file mode 100644
index 2cd9c54..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/remove.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/stop_all-color.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/stop_all-color.gif
deleted file mode 100644
index 6d47276..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/stop_all-color.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/stop_all.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/stop_all.gif
deleted file mode 100644
index ded722b..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/stop_all.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/synched.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/synched.gif
deleted file mode 100644
index 870934b..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/synched.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/elcl16/web-document.gif b/org.eclipse.mylyn.context.ui/icons/elcl16/web-document.gif
deleted file mode 100644
index 05a2053..0000000
--- a/org.eclipse.mylyn.context.ui/icons/elcl16/web-document.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/etool16/content-assist-separator.gif b/org.eclipse.mylyn.context.ui/icons/etool16/content-assist-separator.gif
deleted file mode 100644
index 25b1176..0000000
--- a/org.eclipse.mylyn.context.ui/icons/etool16/content-assist-separator.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/etool16/context-attach.gif b/org.eclipse.mylyn.context.ui/icons/etool16/context-attach.gif
deleted file mode 100644
index bee8fc5..0000000
--- a/org.eclipse.mylyn.context.ui/icons/etool16/context-attach.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/etool16/context-retrieve.gif b/org.eclipse.mylyn.context.ui/icons/etool16/context-retrieve.gif
deleted file mode 100644
index 02a46c8..0000000
--- a/org.eclipse.mylyn.context.ui/icons/etool16/context-retrieve.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/etool16/qualify-names.gif b/org.eclipse.mylyn.context.ui/icons/etool16/qualify-names.gif
deleted file mode 100644
index acbd9dc..0000000
--- a/org.eclipse.mylyn.context.ui/icons/etool16/qualify-names.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/etool16/wizard-feedback.gif b/org.eclipse.mylyn.context.ui/icons/etool16/wizard-feedback.gif
deleted file mode 100644
index bd69c45..0000000
--- a/org.eclipse.mylyn.context.ui/icons/etool16/wizard-feedback.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/etool16/wizard-study.gif b/org.eclipse.mylyn.context.ui/icons/etool16/wizard-study.gif
deleted file mode 100644
index 936601c..0000000
--- a/org.eclipse.mylyn.context.ui/icons/etool16/wizard-study.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/eview16/active-search.gif b/org.eclipse.mylyn.context.ui/icons/eview16/active-search.gif
deleted file mode 100644
index 2cc3267..0000000
--- a/org.eclipse.mylyn.context.ui/icons/eview16/active-search.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/eview16/focus-disabled.gif b/org.eclipse.mylyn.context.ui/icons/eview16/focus-disabled.gif
deleted file mode 100644
index 24bbeae..0000000
--- a/org.eclipse.mylyn.context.ui/icons/eview16/focus-disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/eview16/focus-tasklist.gif b/org.eclipse.mylyn.context.ui/icons/eview16/focus-tasklist.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.context.ui/icons/eview16/focus-tasklist.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/eview16/focus.gif b/org.eclipse.mylyn.context.ui/icons/eview16/focus.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.context.ui/icons/eview16/focus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/eview16/overlay-mylyn.gif b/org.eclipse.mylyn.context.ui/icons/eview16/overlay-mylyn.gif
deleted file mode 100644
index 0b145cb..0000000
--- a/org.eclipse.mylyn.context.ui/icons/eview16/overlay-mylyn.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/icons/wizban/banner-prefs.gif b/org.eclipse.mylyn.context.ui/icons/wizban/banner-prefs.gif
deleted file mode 100644
index ce0f6e3..0000000
--- a/org.eclipse.mylyn.context.ui/icons/wizban/banner-prefs.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.context.ui/plugin.properties b/org.eclipse.mylyn.context.ui/plugin.properties
deleted file mode 100644
index cb7d2f6..0000000
--- a/org.eclipse.mylyn.context.ui/plugin.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 Mylyn project committers and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-Bundle-Name = Mylyn Context UI
-Bundle-Vendor = Eclipse Mylyn
-
-InterestDecrementAction.label = Mark Less Interesting
-InterestDecrementAction.tooltip = Mark selected element as uninteresting
-InterestIncrementAction.label = Mark as Landmark
-InterestIncrementAction.tooltip = Make selected element a landmark
-#ContextRetrieveAction.label = Retrieve Context
-
-ContextUiPreferencePage.name = Context
-
-keywords.label = mylyn context focus focused
-
-actionSet.label = Task Context
-actionSet.description = Task Context
-OpenQuickContextPopupDialogAction.label = Quick Context View
-
-commands.category.description = Task-Focused Interface
-commands.category.name = Focused UI
-commands.interest.increment.description = Make Landmark
-commands.interest.increment.name = Make Landmark
-commands.interest.decrement.description = Make Less Interesting
-commands.interest.decrement.name = Make Less Interesting
-commands.open.context.dialog.description = Show Context Quick View
-commands.open.context.dialog.name = Show Context Quick View
-commands.FocusViewHandler.name = Focus View
-commands.FocusViewHandler.commandParameter.name = View ID to Focus
-commands.task.attachContext.name = Attach Context
-commands.task.retrieveContext.name = Retrieve Context
-commands.task.copyContext.name = Copy Context
-commands.task.clearContext.name = Clear Context
-commands.attachment.retrieveContext.name = Retrieve Context Attachment
-
-InterestDecoratorLightweight.label = Task Context Decorator
-InterestDecoratorLightweight.description = Decorates the labels of elements to indicate whether they are a part of the task context.
-
-FocusTaskListAction.label = Focus on Workweek
-FocusTaskListAction.tooltip = Focus on Workweek
-FocusOutlineAction.label = Focus on Active Task
-FocusOutlineAction.tooltip = Focus on Active Task (Alt+click to reveal filtered elements)
-
-menu.task.context.label = Context
-commands.task.attachContext.label = Attach...
-commands.task.retrieveContext.label = Retrieve...
-commands.task.copyContext.label = Copy to...
-commands.task.clearContext.label = Clear
-commands.attachment.retrieveContext.label = Retrieve Context
diff --git a/org.eclipse.mylyn.context.ui/plugin.xml b/org.eclipse.mylyn.context.ui/plugin.xml
deleted file mode 100644
index 6d3b56f..0000000
--- a/org.eclipse.mylyn.context.ui/plugin.xml
+++ /dev/null
@@ -1,553 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-    <extension-point id="bridges" name="bridges" schema="schema/bridges.exsd"/>
-    <extension-point id="startup" name="Context UI Startup" schema="schema/startup.exsd"/>
-
-    <extension 
-         point="org.eclipse.mylyn.context.core.bridges">
-      <structureBridge 
-      		class="org.eclipse.mylyn.internal.context.ui.TaskStructureBridge"/> 
-   </extension>
-   <extension 
-         point="org.eclipse.mylyn.context.ui.bridges">
-      <uiBridge
-            class="org.eclipse.mylyn.internal.context.ui.TaskUiBridge"
-            contentType="meta/task"/>
-   </extension>   
- 
- 	<extension
-         point="org.eclipse.mylyn.tasks.ui.editors">
-      	<pageFactory
-             id="org.eclipse.mylyn.context.ui.pageFactory.Context"
-			 class="org.eclipse.mylyn.internal.context.ui.editors.ContextPageFactory"/>
-   	</extension>
- 
-  	<extension point = "org.eclipse.ui.popupMenus">
-     <objectContribution
-        id="org.eclipse.mylyn.context.ui.actions.interest.contribution"
-        objectClass="org.eclipse.mylyn.context.core.IInteractionElement">
-        <!-- TODO 3.1: remove? -->
-     	<action  
-  		  	label="%InterestDecrementAction.label" 
-	  		tooltip="%InterestDecrementAction.tooltip"
-	  		menubarPath="additions" 
-	  		id="org.eclipse.mylyn.context.ui.actions.interest.decrement" 
-	  		class="org.eclipse.mylyn.internal.context.ui.actions.InterestDecrementAction"
-	  		icon="icons/elcl16/interest-decrease.gif"
-	  		enablesFor="*"/>
-	    <action  
-  		  	label="%InterestIncrementAction.label" 
-	  		tooltip="%InterestIncrementAction.tooltip"
-	  		menubarPath="additions" 
-	  		id="org.eclipse.mylyn.context.ui.actions.interest.increment" 
-	  		class="org.eclipse.mylyn.internal.context.ui.actions.InterestIncrementAction"
-	  		icon="icons/elcl16/interest-increase.gif"
-	  		enablesFor="*"/>
-	 </objectContribution> 
-	 
-	 <!--
-	 <objectContribution
-           adaptable="false"
-           id="org.eclipse.mylyn.context.ui.tasks.contribution"
-           objectClass="org.eclipse.mylyn.internal.tasks.core.AbstractTask">
-		<action
-              class="org.eclipse.mylyn.internal.context.ui.actions.ContextClearAction"
-              enablesFor="1"
-              icon="icons/elcl16/context-clear.gif"
-              id="org.eclipse.mylyn.context.ui.task.clear"
-              label="Clear Context"
-              menubarPath="context"
-              tooltip="Clear Context">
-        </action>
-  		<action
-        	class="org.eclipse.mylyn.internal.context.ui.actions.ContextCopyAction"
-        	icon="icons/elcl16/context-transfer.gif"
-        	id="org.eclipse.mylyn.context.ui.task.copy.context.to"
-        	label="Copy Context to..."
-        	menubarPath="context"
-        	tooltip="Copy Context to...">
-  		</action>
-	 </objectContribution>
-	 -->
-	 
-	 <!--
-     <objectContribution
-           adaptable="false"
-           id="org.eclipse.mylyn.ui.tasks.repository.hits..action.contribution"
-           objectClass="org.eclipse.mylyn.internal.tasks.core.AbstractTask">
-        <action
-              class="org.eclipse.mylyn.internal.context.ui.actions.ContextRetrieveAction"
-              enablesFor="1"
-              icon="icons/etool16/context-retrieve.gif"
-              id="org.eclipse.mylyn.context.ui.repository.task.retrieve"
-              label="Retrieve Context..."
-              menubarPath="context">
-        </action> 
-        <action
-              class="org.eclipse.mylyn.internal.context.ui.actions.ContextAttachAction"
-              enablesFor="1"
-              icon="icons/etool16/context-attach.gif"
-              id="org.eclipse.mylyn.context.ui.repository.task.attach"
-              label="Attach Context..."
-              menubarPath="context">
-        </action>
-	 </objectContribution>
-	 -->
-   </extension>
-    
-    <!-- See org.eclipse.mylyn.tasks.ui/plugin.xml -->
-   	<extension
-         point="org.eclipse.mylyn.context.ui.bridges">
-      <preservedFilters
-			viewId="org.eclipse.ui.navigator.ProjectExplorer">
-			<filter
-				id="org.eclipse.mylyn.tasks.ui.navigator.filters.tasks">
-			</filter>
-	  </preservedFilters> 
-   </extension> 
-    
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="%ContextUiPreferencePage.name"
-            class="org.eclipse.mylyn.internal.context.ui.preferences.ContextUiPreferencePage"
-            id="org.eclipse.mylyn.context.ui.preferences"
-            category="org.eclipse.mylyn.tasks.ui.preferences">
-         <keywordReference id="org.eclipse.mylyn.context.ui.keywords"/>
-      </page> 
-   </extension>
-   
-   <extension
-   		point="org.eclipse.ui.keywords">
-      <keyword
-            label="%keywords.label"
-            id="org.eclipse.mylyn.context.ui.keywords"/>
-   </extension>
- 
-	<!-- ==================== Common Navigator ==================== -->
-    <extension
-         point="org.eclipse.ui.navigator.viewer">
-       <!--
-       <viewer
-             viewerId="org.eclipse.mylyn.context.ui.navigator.context">
-          <popupMenu
-                allowsPlatformContributions="false"
-                id="org.eclipse.mylyn.context.ui.navigator.context#PopupMenu">  
-             <insertionPoint name="group.new"/>
-             <insertionPoint
-                   	name="group.open"
-                   	separator="true"/>
-             <insertionPoint 
-             		name="group.openWith"/>     
-             <insertionPoint
-                   name="additions"
-                   separator="true"/>              
-			 <insertionPoint
-                   name="group.port"
-                   separator="true"/>  
-             <insertionPoint
-                   name="group.properties"
-                   separator="true"/>
-          </popupMenu>
-       </viewer>
-       -->
-       <viewerContentBinding 
-             viewerId="org.eclipse.mylyn.context.ui.navigator.context">
-          <includes>
-       	      <contentExtension pattern="org.eclipse.ui.navigator.resourceContent"/>		       	      
-          </includes>
-       </viewerContentBinding>
-       
-       <viewerContentBinding 
-             viewerId="org.eclipse.mylyn.context.ui.navigator.context.quick">
-          <includes>
-       	      <contentExtension pattern="org.eclipse.ui.navigator.resourceContent"/>		       	      
-          </includes>
-       </viewerContentBinding>
-       
-       <viewerActionBinding
-            viewerId="org.eclipse.mylyn.context.ui.navigator.context">
-         <includes>
-             <actionExtension pattern="org.eclipse.ui.navigator.resources.*" />
-         </includes>
-       </viewerActionBinding>
-   </extension>	
-     
-   <!-- ==================== Actions ==================== -->
-    
-   <extension
-       	 point="org.eclipse.ui.actionSets">
-   	  <actionSet
-            label="%actionSet.label"
-            description="%actionSet.description"
-            visible="true"
-            id="org.eclipse.mylyn.context.ui.actionSet">
-         <!--
-         <action
-               class="org.eclipse.mylyn.internal.context.ui.actions.InterestDecrementAction"
-               definitionId="org.eclipse.mylyn.context.ui.commands.interest.decrement"
-               icon="icons/elcl16/interest-decrease.gif"
-               id="org.eclipse.mylyn.context.ui.actions.interest.decrement"
-               label="Mark Less Interesting"
-               menubarPath="navigate/open.ext2">
-         </action>
-         <action
-               class="org.eclipse.mylyn.internal.context.ui.actions.InterestIncrementAction"
-               definitionId="org.eclipse.mylyn.context.ui.commands.interest.increment"
-               icon="icons/elcl16/interest-increase.gif"
-               id="org.eclipse.mylyn.context.ui.actions.interest.increment"
-               label="Mark as Landmark"
-               menubarPath="navigate/open.ext2">
-         </action>
-		 -->
-	     <action
-               definitionId="org.eclipse.mylyn.context.ui.commands.open.context.dialog"
-               label="%OpenQuickContextPopupDialogAction.label"
-               class="org.eclipse.mylyn.internal.context.ui.actions.OpenQuickContextPopupDialogAction"
-               menubarPath="navigate/showIn"
-               id="org.eclipse.mylyn.context.ui.actions.open.context.dialog">
-         </action>
-      </actionSet>
-   </extension>
-                              
-   <extension point="org.eclipse.ui.commands">
-      <category
-            name="%commands.category.name"
-            description="%commands.category.description"
-            id="org.eclipse.mylyn.context.ui.commands">
-      </category>
-      <command
-            name="%commands.interest.increment.name"
-            description="%commands.interest.increment.description"
-            id="org.eclipse.mylyn.context.ui.commands.interest.increment"
-            categoryId="org.eclipse.mylyn.context.ui.commands">
-      </command>
-      <command
-            name="%commands.interest.decrement.name"
-            description="%commands.interest.decrement.description"
-            id="org.eclipse.mylyn.context.ui.commands.interest.decrement"
-            categoryId="org.eclipse.mylyn.context.ui.commands">
-      </command>
-      <command
-            name="%commands.open.context.dialog.name"
-            description="%commands.open.context.dialog.description"
-            id="org.eclipse.mylyn.context.ui.commands.open.context.dialog"
-            categoryId="org.eclipse.mylyn.context.ui.commands">
-      </command>
-      <command
-            defaultHandler="org.eclipse.mylyn.internal.context.ui.commands.FocusViewHandler"
-            id="org.eclipse.mylyn.context.ui.commands.focus.view"
-            name="%commands.FocusViewHandler.name">
-         <commandParameter
-               id="viewId"
-               name="%commands.FocusViewHandler.commandParameter.name"
-               optional="false">
-         </commandParameter>
-      </command>
-      <command
-            categoryId="org.eclipse.mylyn.context.ui.commands"
-            id="org.eclipse.mylyn.context.ui.commands.task.attachContext"
-            name="%commands.task.attachContext.name">
-      </command>
-      <command
-            categoryId="org.eclipse.mylyn.context.ui.commands"
-            id="org.eclipse.mylyn.context.ui.commands.task.retrieveContext"
-            name="%commands.task.retrieveContext.name">
-      </command>
-      <command
-            categoryId="org.eclipse.mylyn.context.ui.commands"
-            id="org.eclipse.mylyn.context.ui.commands.task.copyContext"
-            name="%commands.task.copyContext.name">
-      </command>
-      <command
-            categoryId="org.eclipse.mylyn.context.ui.commands"
-            id="org.eclipse.mylyn.context.ui.commands.task.clearContext"
-            name="%commands.task.clearContext.name">
-      </command>
-      <command
-            categoryId="org.eclipse.mylyn.context.ui.commands"
-            id="org.eclipse.mylyn.context.ui.commands.attachment.retrieveContext"
-            name="%commands.attachment.retrieveContext.name">
-      </command>
-   </extension>
-     
-   <extension point="org.eclipse.ui.bindings">     
-      <key
-            sequence="M1+M2+M3+ARROW_UP"
-            commandId="org.eclipse.mylyn.context.ui.commands.interest.increment"
-            schemeId ="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            sequence="M1+M2+M3+ARROW_DOWN"
-            commandId="org.eclipse.mylyn.context.ui.commands.interest.decrement"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            sequence="M1+M2+M3+ARROW_RIGHT"
-            commandId="org.eclipse.mylyn.context.ui.commands.open.context.dialog"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-   </extension>     
-
-   <extension point="org.eclipse.ui.decorators">
-      <decorator
-            lightweight="true"
-            label="%InterestDecoratorLightweight.label"
-            class="org.eclipse.mylyn.internal.context.ui.InterestDecoratorLightweight"
-            state="true"
-            id="org.eclipse.mylyn.context.ui.decorator.interest">
-         <description>
-			%InterestDecoratorLightweight.description
-		 </description>
-         <enablement>
-            <objectClass name="java.lang.Object"/>
-         </enablement>
-      </decorator>
-   </extension>
-
- <extension point="org.eclipse.ui.viewActions"> 
- 	<viewContribution 
-		id="org.eclipse.mylyn.context.ui.taskList.contribution" 
-   		targetID="org.eclipse.mylyn.tasks.ui.views.tasks">
-    	<action
-           class="org.eclipse.mylyn.internal.context.ui.actions.FocusTaskListAction"
-           enablesFor="*"
-           icon="icons/eview16/focus-tasklist.gif"
-           id="org.eclipse.mylyn.context.ui.actions.tasklist.focus"
-           label="%FocusTaskListAction.label"
-           menubarPath="additions"
-           style="toggle"
-           toolbarPath="context"
-           tooltip="%FocusTaskListAction.tooltip"/> 
-  	</viewContribution>
-	<viewContribution 
-		id="org.eclipse.mylyn.context.ui.outline.contribution" 
-   		targetID="org.eclipse.ui.views.ContentOutline">
-    	<action
-           class="org.eclipse.mylyn.internal.context.ui.actions.FocusOutlineAction"
-           disabledIcon="icons/elcl16/focus-disabled.gif"
-           enablesFor="*"
-           icon="icons/elcl16/focus.gif"
-           id="org.eclipse.mylyn.context.ui.contentOutline.focus"
-           label="%FocusOutlineAction.label"
-           menubarPath="mylyn"
-           style="toggle"
-           toolbarPath="mylyn"
-           tooltip="%FocusOutlineAction.tooltip">
-        <enablement>
-           <systemProperty
-                 name="org.eclipse.mylyn.context.core.context.active"
-                 value="true">
-           </systemProperty>
-        </enablement>
-  		</action> 
-  	</viewContribution>
-   </extension>
- <extension
-       point="org.eclipse.ui.menus">
-    <menuContribution
-          locationURI="popup:org.eclipse.ui.popup.any?after=operations">
-       <menu
-             id="org.eclipse.mylyn.context.ui.menu.task.context"
-             label="%menu.task.context.label">
-          <visibleWhen
-                checkEnabled="false">
-             <or>
-	             <with
-	             		variable="activeMenuSelection">                
-		             <and>
-		                <count
-		                      value="1">
-		                </count>
-		                <iterate>
-		                   <adapt
-		                         type="org.eclipse.mylyn.tasks.core.ITask">
-		                   </adapt>
-		                </iterate>
-		             </and>
-	             </with>
-	             <and>
-	                <count
-	                      value="1">
-	                </count>
-	                <iterate>
-	                   <adapt
-	                         type="org.eclipse.mylyn.tasks.core.ITask">
-	                   </adapt>
-	                </iterate>
-	             </and>
-		 	</or>	             
-          </visibleWhen>
-          <separator
-                name="group.repository"
-                visible="true">
-          </separator>
-          <command
-                commandId="org.eclipse.mylyn.context.ui.commands.task.attachContext"
-                icon="icons/etool16/context-attach.gif"
-                label="%commands.task.attachContext.label"
-                style="push">
-          </command>
-          <command
-                commandId="org.eclipse.mylyn.context.ui.commands.task.retrieveContext"
-                icon="icons/etool16/context-retrieve.gif"
-                label="%commands.task.retrieveContext.label"
-                style="push">
-          </command>
-          <separator
-                name="group.local"
-                visible="true">
-          </separator>
-          <command
-                commandId="org.eclipse.mylyn.context.ui.commands.task.copyContext"
-                icon="icons/elcl16/context-transfer.gif"
-                label="%commands.task.copyContext.label"
-                style="push">
-          </command>
-          <command
-                commandId="org.eclipse.mylyn.context.ui.commands.task.clearContext"
-                icon="icons/elcl16/context-clear.gif"
-                label="%commands.task.clearContext.label"
-                style="push">
-          </command>
-          <separator
-                name="additions">
-          </separator>
-       </menu>
-    </menuContribution>
-    <menuContribution
-          locationURI="popup:org.eclipse.ui.popup.any?after=additions">
-       <command
-             commandId="org.eclipse.mylyn.context.ui.commands.attachment.retrieveContext"
-             icon="icons/etool16/context-retrieve.gif"
-             label="%commands.attachment.retrieveContext.label"
-             style="push">
-          <visibleWhen
-                checkEnabled="false">
-             <and>
-                <count
-                      value="1">
-                </count>
-                <iterate>
-                   <adapt
-                         type="org.eclipse.mylyn.tasks.core.ITaskAttachment">
-                   </adapt>
-                </iterate>
-             </and>
-          </visibleWhen>
-       </command>
-    </menuContribution>
- </extension>
- <extension
-       point="org.eclipse.ui.handlers">
-    <handler
-          class="org.eclipse.mylyn.internal.context.ui.commands.AttachContextHandler"
-          commandId="org.eclipse.mylyn.context.ui.commands.task.attachContext">
-       <enabledWhen>
-	      <with 
-	      		variable="activeMenuSelection">                       	
-	          <iterate
-	                ifEmpty="false"
-	                operator="and">
-	             <and>
-	                <adapt
-	                      type="org.eclipse.mylyn.tasks.core.ITask">
-	                   <test
-	                         property="org.eclipse.mylyn.task.canPostAttachment"
-	                         value="true">
-	                   </test>
-	                </adapt>
-	             </and>
-	          </iterate>
-	       </with>
-       </enabledWhen>
-    </handler>
-    <handler
-          class="org.eclipse.mylyn.internal.context.ui.commands.RetrieveContextHandler"
-          commandId="org.eclipse.mylyn.context.ui.commands.task.retrieveContext">
-       <enabledWhen>
-	      <with 
-	      		variable="activeMenuSelection">                       	
-	          <iterate
-	                ifEmpty="false"
-	                operator="and">
-	             <and>
-	                <adapt
-	                      type="org.eclipse.mylyn.tasks.core.ITask">
-	                   <test
-	                         property="org.eclipse.mylyn.task.canPostAttachment"
-	                         value="true">
-	                   </test>
-	                   <test
-	                         property="org.eclipse.mylyn.task.hasRepositoryContext"
-	                         value="true">
-	                   </test>
-	                </adapt>
-	             </and>
-	          </iterate>
-	     </with>
-       </enabledWhen>
-    </handler>
-    <handler
-          class="org.eclipse.mylyn.internal.context.ui.commands.CopyContextHandler"
-          commandId="org.eclipse.mylyn.context.ui.commands.task.copyContext">
-       <enabledWhen>
-       	 <with 
-	     		variable="activeMenuSelection">                       	
-	          <iterate
-	                ifEmpty="false"
-	                operator="and">
-	             <and>
-	                <adapt
-	                      type="org.eclipse.mylyn.tasks.core.ITask">
-	                   <test
-	                         property="org.eclipse.mylyn.task.hasLocalContext"
-	                         value="true">
-	                   </test>
-	                </adapt>
-	             </and>
-	          </iterate>
-	      </with>
-       </enabledWhen>
-    </handler>
-    <handler
-          class="org.eclipse.mylyn.internal.context.ui.commands.ClearContextHandler"
-          commandId="org.eclipse.mylyn.context.ui.commands.task.clearContext">
-       <enabledWhen>
-   	      <with 
-	      		variable="activeMenuSelection">                       	
-	          <iterate
-	                ifEmpty="false"
-	                operator="and">
-	             <and>
-	                <adapt
-	                      type="org.eclipse.mylyn.tasks.core.ITask">
-	                   <test
-	                         property="org.eclipse.mylyn.task.hasLocalContext"
-	                         value="true">
-	                   </test>
-	                </adapt>
-	             </and>
-	          </iterate>
-	      </with>
-       </enabledWhen>
-    </handler>
-    <handler
-          class="org.eclipse.mylyn.internal.context.ui.commands.RetrieveContextAttachmentHandler"
-          commandId="org.eclipse.mylyn.context.ui.commands.attachment.retrieveContext">
-       <enabledWhen>
-          <iterate
-                ifEmpty="false"
-                operator="and">
-             <and>
-                <instanceof
-                      value="org.eclipse.mylyn.tasks.core.ITaskAttachment">
-                </instanceof>
-             </and>
-          </iterate>
-       </enabledWhen>
-    </handler>
- </extension>
-   
-</plugin>
diff --git a/org.eclipse.mylyn.context.ui/schema/bridges.exsd b/org.eclipse.mylyn.context.ui/schema/bridges.exsd
deleted file mode 100644
index e85460e..0000000
--- a/org.eclipse.mylyn.context.ui/schema/bridges.exsd
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.context.ui.bridges" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.mylyn.context.ui.bridges" id="bridges" name="bridges"/>
-      </appInfo>
-      <documentation>
-         UI Bridges connect the UI of domain-specific tool, such as the JDT, to the generic context model UI.  For more information please see: http://wiki.eclipse.org/index.php/Mylyn_Integrator_Reference#Context_API
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="uiBridge" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="labelProvider" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="preservedFilters" 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="uiBridge">
-      <complexType>
-         <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>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.mylyn.context.ui.AbstractContextUiBridge"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="contentType" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="activeSearchIcon" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="activeSearchLabel" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="labelProvider">
-      <annotation>
-         <appInfo>
-            <meta.element deprecated="true"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <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>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.jface.viewers.ILabelProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="contentType" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="preservedFilters">
-      <complexType>
-         <sequence>
-            <element ref="filter" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="viewId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="filter">
-      <complexType>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jface.viewers.ViewerFilter"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  Specify either a class or an id, not both.  NOTE: the id mode will only work for commonFilter extensions where you specify a filterExpression.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-
-
-
-
-</schema>
diff --git a/org.eclipse.mylyn.context.ui/schema/startup.exsd b/org.eclipse.mylyn.context.ui/schema/startup.exsd
deleted file mode 100644
index ba8562b..0000000
--- a/org.eclipse.mylyn.context.ui/schema/startup.exsd
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.context.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.mylyn.context.ui" id="startup" name="Context UI Startup"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="startup"/>
-         </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="startup">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.mylyn.context.ui.IContextUiStartup"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractAutoFocusViewAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractAutoFocusViewAction.java
deleted file mode 100644
index d9fbebd..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractAutoFocusViewAction.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.context.ui.IContextUiPreferenceContstants;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Extend to focus a view on task context, e.g. the filtering and expansion of a tree view such as the Package Explorer.
- * A structure bridge should be implemented or reused to determine the degree-of-interest of elements in the view.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public abstract class AbstractAutoFocusViewAction extends AbstractFocusViewAction {
-
-	private boolean initialized = false;
-
-	private final AbstractContextListener CONTEXT_LISTENER = new AbstractContextListener() {
-
-		@SuppressWarnings("deprecation")
-		@Override
-		public void contextActivated(IInteractionContext context) {
-			if (ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
-					IContextUiPreferenceContstants.AUTO_FOCUS_NAVIGATORS)) {
-				AbstractAutoFocusViewAction.super.internalSuppressExpandAll = true;
-				AbstractAutoFocusViewAction.super.update(true);
-			} else {
-				AbstractAutoFocusViewAction.super.internalSuppressExpandAll = true;
-				AbstractAutoFocusViewAction.super.update(false);
-			}
-		}
-	};
-
-	public AbstractAutoFocusViewAction(InterestFilter interestFilter, boolean manageViewer, boolean manageFilters,
-			boolean manageLinking) {
-		super(interestFilter, manageViewer, manageFilters, manageLinking);
-		super.showEmptyViewMessage = true;
-		ContextCore.getContextManager().addListener(CONTEXT_LISTENER);
-	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-		ContextCore.getContextManager().removeListener(CONTEXT_LISTENER);
-	}
-
-	@Override
-	public void init(IViewPart view) {
-		super.init(view);
-		configureAction();
-	}
-
-	@Override
-	public void init(IAction action) {
-		super.init(action);
-		configureAction();
-	}
-
-	private void configureAction() {
-		if (initialized) {
-			return;
-		}
-		initialized = true;
-
-		// can not run this until the view has been initialized
-		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-			@SuppressWarnings("deprecation")
-			public void run() {
-				try {
-					if (ContextCore.getContextManager().isContextActive()
-							&& ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
-									IContextUiPreferenceContstants.AUTO_FOCUS_NAVIGATORS)) {
-						internalSuppressExpandAll = true;
-						update(true);
-					}
-				} catch (Exception e) {
-					StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-							"Could not toggle focus action on view: " + getPartForAction(), e)); //$NON-NLS-1$
-				}
-			}
-		});
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractContextUiBridge.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractContextUiBridge.java
deleted file mode 100644
index eda0e5b..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractContextUiBridge.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.ui;
-
-import java.util.List;
-
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * Extend to bridge between a tool's UI and the generic facilities invoked by the Context UI.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public abstract class AbstractContextUiBridge {
-
-	public abstract void open(IInteractionElement element);
-
-	public abstract void close(IInteractionElement element);
-
-	public abstract boolean acceptsEditor(IEditorPart editorPart);
-
-	public abstract IInteractionElement getElement(IEditorInput input);
-
-	/**
-	 * Note that a single editor part can correspond to multipe outlines (e.g. the PDE manifest editor).
-	 * 
-	 * @return an empty list if none
-	 */
-	public abstract List<TreeViewer> getContentOutlineViewers(IEditorPart editorPart);
-
-	public abstract Object getObjectForTextSelection(TextSelection selection, IEditorPart editor);
-
-	public abstract String getContentType();
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractFocusViewAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractFocusViewAction.java
deleted file mode 100644
index 40af108..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/AbstractFocusViewAction.java
+++ /dev/null
@@ -1,577 +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.context.ui;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.context.ui.Messages;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
-import org.eclipse.mylyn.monitor.ui.MonitorUi;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Extending this class makes it possible to apply Mylyn management to a structured view (e.g. to provide interest-based
- * filtering).
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public abstract class AbstractFocusViewAction extends Action implements IViewActionDelegate, IActionDelegate2,
-		ISelectionListener {
-
-	public static final String PREF_ID_PREFIX = "org.eclipse.mylyn.ui.interest.filter."; //$NON-NLS-1$
-
-	private static Map<IViewPart, AbstractFocusViewAction> partMap = new WeakHashMap<IViewPart, AbstractFocusViewAction>();
-
-	protected String globalPrefId;
-
-	protected IAction initAction = null;
-
-	protected final InterestFilter interestFilter;
-
-	protected IViewPart viewPart;
-
-	protected Map<StructuredViewer, List<ViewerFilter>> previousFilters = new WeakHashMap<StructuredViewer, List<ViewerFilter>>();
-
-	private final boolean manageViewer;
-
-	private final boolean manageFilters;
-
-	private final boolean manageLinking;
-
-	private boolean wasLinkingEnabled = false;
-
-	private boolean wasRun = false;
-
-	private Set<Class<?>> cachedPreservedFilters;
-
-	/**
-	 * Work-around for suppressing expansion without breaking API. Will be remove post 3.0
-	 */
-	@Deprecated
-	protected boolean internalSuppressExpandAll = false;
-
-	/**
-	 * @since 3.0
-	 */
-	protected boolean showEmptyViewMessage = false;
-
-	private final Map<StructuredViewer, EmptyContextDrawer> viewerToDrawerMap = new HashMap<StructuredViewer, EmptyContextDrawer>();
-
-	private class EmptyContextDrawer implements Listener {
-
-		private final String LABEL = getEmptyViewMessage();
-
-		private final Image IMAGE = CommonImages.getImage(TasksUiImages.CONTEXT_FOCUS);
-
-		private final Tree tree;
-
-		EmptyContextDrawer(Tree tree) {
-			this.tree = tree;
-		}
-
-		public void handleEvent(Event event) {
-			if (tree != null && tree.getItemCount() == 0) {
-				switch (event.type) {
-				case SWT.Paint: {
-					int offset = 7;
-					event.gc.drawImage(IMAGE, offset, offset);
-					event.gc.drawText(LABEL, offset + IMAGE.getBounds().width + 5, offset);
-					break;
-				}
-				}
-			}
-		}
-	}
-
-	private final AbstractContextListener CONTEXT_LISTENER = new AbstractContextListener() {
-
-		@Override
-		public void contextChanged(ContextChangeEvent event) {
-			switch (event.getEventKind()) {
-			case ACTIVATED:
-				if (updateEnablementWithContextActivation()) {
-					updateEnablement(initAction);
-				}
-				break;
-			case DEACTIVATED:
-				if (updateEnablementWithContextActivation()) {
-					updateEnablement(initAction);
-					update(false);
-				}
-				break;
-			}
-		};
-	};
-
-	private final IWorkbenchListener WORKBENCH_LISTENER = new IWorkbenchListener() {
-
-		public boolean preShutdown(IWorkbench workbench, boolean forced) {
-			// restore the viewers' previous state
-			if (wasRun && manageLinking) {
-				setDefaultLinkingEnabled(wasLinkingEnabled);
-			}
-
-			List<StructuredViewer> viewers = getViewers();
-			Set<Class<?>> excludedFilters = getPreservedFilterClasses(false);
-			for (StructuredViewer viewer : viewers) {
-				if (previousFilters.containsKey(viewer)) {
-					for (ViewerFilter filter : previousFilters.get(viewer)) {
-						if (!excludedFilters.contains(filter.getClass())) {
-							try {
-								viewer.addFilter(filter);
-							} catch (Throwable t) {
-								StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-										"Failed to restore filter: " + filter, t)); //$NON-NLS-1$
-							}
-						}
-					}
-					previousFilters.remove(viewer);
-				}
-			}
-			return true;
-		}
-
-		public void postShutdown(IWorkbench workbench) {
-			// ignore
-		}
-	};
-
-	/**
-	 * TODO: not thread safe.
-	 */
-	public static AbstractFocusViewAction getActionForPart(IViewPart part) {
-		return partMap.get(part);
-	}
-
-	public IViewPart getPartForAction() {
-		if (viewPart == null) {
-			if (this instanceof IWorkbenchWindowActionDelegate) {
-				if (!PlatformUI.getWorkbench().isClosing()) {
-					// ignore, could be called from the Configure Perspective dialog, see bug 2308532
-				}
-			} else {
-				throw new RuntimeException("error: viewPart is null"); //$NON-NLS-1$
-			}
-		}
-		return viewPart;
-	}
-
-	public AbstractFocusViewAction(InterestFilter interestFilter, boolean manageViewer, boolean manageFilters,
-			boolean manageLinking) {
-		super();
-		this.interestFilter = interestFilter;
-		this.manageViewer = manageViewer;
-		this.manageFilters = manageFilters;
-		this.manageLinking = manageLinking;
-		setText(Messages.AbstractFocusViewAction_Apply_Mylyn);
-		setToolTipText(Messages.AbstractFocusViewAction_Apply_Mylyn);
-		setImageDescriptor(TasksUiImages.CONTEXT_FOCUS);
-		PlatformUI.getWorkbench().addWorkbenchListener(WORKBENCH_LISTENER);
-		ContextCore.getContextManager().addListener(CONTEXT_LISTENER);
-	}
-
-	public void dispose() {
-		partMap.remove(getPartForAction());
-		if (viewPart != null && !PlatformUI.getWorkbench().isClosing()) {
-			for (StructuredViewer viewer : getViewers()) {
-				ContextUiPlugin.getViewerManager().removeManagedViewer(viewer, viewPart);
-			}
-		}
-
-		MonitorUi.removeWindowPostSelectionListener(this);
-		ContextCore.getContextManager().removeListener(CONTEXT_LISTENER);
-		PlatformUI.getWorkbench().removeWorkbenchListener(WORKBENCH_LISTENER);
-	}
-
-	public void init(IAction action) {
-		initAction = action;
-		initAction.setChecked(action.isChecked());
-	}
-
-	public void init(IViewPart view) {
-		String id = view.getSite().getId();
-		globalPrefId = PREF_ID_PREFIX + id;
-		viewPart = view;
-		partMap.put(view, this);
-		wasLinkingEnabled = isDefaultLinkingEnabled();
-	}
-
-	protected boolean updateEnablementWithContextActivation() {
-		return true;
-	}
-
-	public void run(IAction action) {
-		setChecked(action.isChecked());
-		valueChanged(action, action.isChecked(), true);
-		wasRun = true;
-	}
-
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-
-	/**
-	 * Don't update if the preference has not been initialized.
-	 */
-	public void update() {
-		if (globalPrefId != null) {
-			update(ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(globalPrefId));
-		}
-	}
-
-	/**
-	 * This operation is expensive.
-	 */
-	public void update(boolean on) {
-		valueChanged(initAction, on, false);
-		updateEnablement(initAction);
-	}
-
-	protected void valueChanged(IAction action, final boolean on, boolean store) {
-		if (PlatformUI.getWorkbench().isClosing()) {
-			return;
-		}
-
-		boolean wasPaused = ContextCore.getContextManager().isContextCapturePaused();
-		try {
-			if (!wasPaused) {
-				ContextCore.getContextManager().setContextCapturePaused(true);
-			}
-			setChecked(on);
-			if (action != null) {
-				action.setChecked(on);
-			}
-			if (store && ContextCorePlugin.getDefault() != null) {
-				ContextUiPlugin.getDefault().getPreferenceStore().setValue(globalPrefId, on);
-			}
-
-			List<StructuredViewer> viewers = getViewers();
-			for (StructuredViewer viewer : viewers) {
-				if (viewPart != null && !viewer.getControl().isDisposed() && manageViewer) {
-					ContextUiPlugin.getViewerManager().addManagedViewer(viewer, viewPart);
-				}
-				updateInterestFilter(on, viewer);
-			}
-
-			setManualFilteringAndLinkingEnabled(!on);
-			if (manageLinking) {
-				updateLinking(on);
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-					"Could not install viewer manager on: " + globalPrefId, t)); //$NON-NLS-1$
-		} finally {
-			if (!wasPaused) {
-				ContextCore.getContextManager().setContextCapturePaused(false);
-			}
-		}
-	}
-
-	protected void updateEnablement(IAction action) {
-		if (updateEnablementWithContextActivation()) {
-			if (action != null) {
-				action.setEnabled(ContextCore.getContextManager().isContextActivePropertySet());
-			}
-		}
-	}
-
-	private void updateLinking(boolean on) {
-		if (on) {
-			wasLinkingEnabled = isDefaultLinkingEnabled();
-			MonitorUi.addWindowPostSelectionListener(this);
-		} else {
-			MonitorUi.removeWindowPostSelectionListener(this);
-			setDefaultLinkingEnabled(wasLinkingEnabled);
-		}
-	}
-
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (manageLinking && selection instanceof ITextSelection && part instanceof IEditorPart) {
-			try {
-				List<StructuredViewer> viewers = getViewers();
-				if (viewers.size() == 1) {
-					StructuredViewer viewer = getViewers().get(0);
-					ITextSelection textSelection = (ITextSelection) selection;
-					ISelection toSelect = resolveSelection((IEditorPart) part, textSelection, viewer);
-					if (toSelect != null) {
-						ISelection currentSelection = viewer.getSelection();
-						if (!toSelect.equals(currentSelection)) {
-							select(viewer, toSelect);
-						}
-					}
-					// NOTE: if we could make the code below work we could set the selection the first time the elment is shown
-//					boolean canSelectElement = true;
-//					if (viewer instanceof TreeViewer) {
-//						TreeViewer treeViewer = (TreeViewer) viewer;
-//						Object[] expanded = treeViewer.getExpandedElements();
-//						canSelectElement = false;
-//						if (Arrays.asList(expanded).contains(((StructuredSelection) toSelect).getFirstElement())) {
-//							canSelectElement = true;
-//						}
-//					}
-				}
-			} catch (Throwable t) {
-				// ignore, linking failure is not fatal
-			}
-		}
-	}
-
-	protected void select(StructuredViewer viewer, ISelection selection) {
-		viewer.setSelection(selection, true);
-	}
-
-	/**
-	 * Override to provide managed linking
-	 */
-	protected ISelection resolveSelection(IEditorPart part, ITextSelection selection, StructuredViewer viewer)
-			throws CoreException {
-		return null;
-	}
-
-	/**
-	 * Override to provide managed linking
-	 */
-	protected void setDefaultLinkingEnabled(boolean on) {
-		// ignore
-	}
-
-	/**
-	 * Override to provide managed linking
-	 */
-	protected boolean isDefaultLinkingEnabled() {
-		return false;
-	}
-
-	protected void setManualFilteringAndLinkingEnabled(boolean on) {
-		// ignore
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		updateEnablement(action);
-	}
-
-	/**
-	 * Public for testing
-	 */
-	public void updateInterestFilter(final boolean on, StructuredViewer viewer) {
-		if (viewer != null) {
-			if (on) {
-				if (showEmptyViewMessage && viewer instanceof TreeViewer) {
-					Tree tree = ((TreeViewer) viewer).getTree();
-					Listener drawingListener = viewerToDrawerMap.get(viewer);
-					if (drawingListener == null) {
-						EmptyContextDrawer drawer = new EmptyContextDrawer(tree);
-						viewerToDrawerMap.put(viewer, drawer);
-						tree.addListener(SWT.Paint, drawer);
-					}
-				}
-
-				installInterestFilter(viewer);
-				ContextUiPlugin.getViewerManager().addFilteredViewer(viewer);
-			} else {
-				if (showEmptyViewMessage && viewer instanceof TreeViewer) {
-					Tree tree = ((TreeViewer) viewer).getTree();
-					EmptyContextDrawer drawer = viewerToDrawerMap.remove(viewer);
-					if (drawer != null) {
-						tree.removeListener(SWT.Paint, drawer);
-					}
-				}
-				ContextUiPlugin.getViewerManager().removeFilteredViewer(viewer);
-				uninstallInterestFilter(viewer);
-			}
-		}
-	}
-
-	/**
-	 * Public for testing
-	 */
-	public abstract List<StructuredViewer> getViewers();
-
-	/**
-	 * @return filters that should not be removed when the interest filter is installed
-	 */
-	private Set<Class<?>> getPreservedFilterClasses(boolean cacheFilters) {
-		if (ContextUiPlugin.getDefault() == null || viewPart == null) {
-			return Collections.emptySet();
-		}
-		if (cachedPreservedFilters == null && cacheFilters) {
-			try {
-				cachedPreservedFilters = ContextUiPlugin.getDefault().getPreservedFilterClasses(
-						viewPart.getSite().getId());
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-						"Could not determine preserved filters", e)); //$NON-NLS-1$
-			}
-		}
-
-		if (cachedPreservedFilters != null) {
-			return cachedPreservedFilters;
-		} else {
-			// fall back for if the preserved filters have never been cached or there was a problem getting them from context core
-			return Collections.emptySet();
-		}
-	}
-
-	protected boolean installInterestFilter(StructuredViewer viewer) {
-		if (viewer == null) {
-			// FIXME Assert.isNotNull(viewer)
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-					"The viewer to install interest filter is null", new Exception())); //$NON-NLS-1$
-			return false;
-		} else if (viewer.getControl().isDisposed() && manageViewer) {
-			// TODO: do this with part listener, not lazily?
-			return false;
-		} else if (previousFilters.containsKey(viewer)) {
-			// install has already run, this can happen if AbstractAutoFocusViewAction.init() executes
-			// initialization asynchronously
-			return false;
-		}
-
-		try {
-			viewer.getControl().setRedraw(false);
-			previousFilters.put(viewer, Arrays.asList(viewer.getFilters()));
-
-			if (viewPart != null && manageFilters) {
-				Set<ViewerFilter> toAdd = new HashSet<ViewerFilter>();
-				Set<Class<?>> preservedFilterClasses = getPreservedFilterClasses(true);
-
-				for (ViewerFilter filter : previousFilters.get(viewer)) {
-					if (preservedFilterClasses.contains(filter.getClass()) || isPreservedFilter(filter)) {
-						toAdd.add(filter);
-					}
-				}
-
-				toAdd.add(interestFilter);
-				viewer.setFilters(toAdd.toArray(new ViewerFilter[toAdd.size()]));
-			} else {
-				viewer.addFilter(interestFilter);
-			}
-
-			if (viewer instanceof TreeViewer && !internalSuppressExpandAll) {
-				((TreeViewer) viewer).expandAll();
-			}
-			return true;
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-					"Could not install viewer filter on: " + globalPrefId, t)); //$NON-NLS-1$
-		} finally {
-			viewer.getControl().setRedraw(true);
-			internalSuppressExpandAll = false;
-		}
-		return false;
-	}
-
-	/**
-	 * Subclasses can provide additional viewer filters that should not be removed when focusing.
-	 * 
-	 * @since 3.1
-	 */
-	protected boolean isPreservedFilter(ViewerFilter filter) {
-		return false;
-	}
-
-	protected void uninstallInterestFilter(StructuredViewer viewer) {
-		if (viewer == null) {
-			// FIXME Assert.isNotNull(viewer)
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-					"The viewer to uninstall interest filter is null", new Exception())); //$NON-NLS-1$
-			return;
-		} else if (viewer.getControl().isDisposed()) {
-			// TODO: do this with part listener, not lazily?
-			ContextUiPlugin.getViewerManager().removeManagedViewer(viewer, viewPart);
-			return;
-		}
-
-		try {
-			viewer.getControl().setRedraw(false);
-
-			List<ViewerFilter> restoreFilters = previousFilters.remove(viewer);
-			if (restoreFilters != null && viewPart != null && manageFilters) {
-				// install all previous filters and all current filters
-				Set<ViewerFilter> filters = new HashSet<ViewerFilter>(restoreFilters);
-				filters.addAll(Arrays.asList(viewer.getFilters()));
-				// ensure that all interest filters are removed
-				for (Iterator<ViewerFilter> it = filters.iterator(); it.hasNext();) {
-					if (it.next() instanceof InterestFilter) {
-						it.remove();
-					}
-				}
-				viewer.setFilters(filters.toArray(new ViewerFilter[filters.size()]));
-			}
-			viewer.removeFilter(interestFilter);
-			interestFilter.resetTemporarilyUnfiltered();
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-					"Could not uninstall interest viewer filter on: " + globalPrefId, t)); //$NON-NLS-1$
-		} finally {
-			viewer.getControl().setRedraw(true);
-		}
-	}
-
-	public String getGlobalPrefId() {
-		return globalPrefId;
-	}
-
-	/**
-	 * For testing.
-	 */
-	public InterestFilter getInterestFilter() {
-		return interestFilter;
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	protected String getEmptyViewMessage() {
-		return Messages.AbstractFocusViewAction_Empty_task_context;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/ContextUi.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/ContextUi.java
deleted file mode 100644
index 44a4019..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/ContextUi.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.ui;
-
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.ui.ColorMap;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.context.ui.IContextUiPreferenceContstants;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- * @since 3.0
- */
-public final class ContextUi {
-
-	/**
-	 * @return the corresponding adapter if found, or an adapter with no behavior otherwise (so null is never returned)
-	 */
-	public static AbstractContextUiBridge getUiBridge(String contentType) {
-		return ContextUiPlugin.getDefault().getUiBridge(contentType);
-	}
-
-	/**
-	 * TODO: cache this to improve performance?
-	 */
-	public static AbstractContextUiBridge getUiBridgeForEditor(IEditorPart editorPart) {
-		return ContextUiPlugin.getDefault().getUiBridgeForEditor(editorPart);
-	}
-
-	public static Color getForeground(IInteractionElement node) {
-		if (node == null) {
-			return null;
-		}
-		if (node.getInterest().isPredicted() || node.getInterest().isPropagated()) {
-			return ColorMap.GRAY_MEDIUM;
-		} else if (node.getInterest().isLandmark()) {
-			return ColorMap.LANDMARK;
-		} else if (node.getInterest().isInteresting()) {
-			return null;
-		}
-		return ColorMap.GRAY_MEDIUM;
-	}
-
-	public static boolean isEditorAutoCloseEnabled() {
-		return ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
-				IContextUiPreferenceContstants.AUTO_MANAGE_EDITOR_CLOSE);
-	}
-
-	public static boolean isEditorAutoManageEnabled() {
-		return ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
-				IContextUiPreferenceContstants.AUTO_MANAGE_EDITORS);
-	}
-
-	/**
-	 * ID of the factory that provides the context page for the task editor.
-	 * 
-	 * @since 3.1
-	 * @see AbstractTaskEditorPageFactory
-	 */
-	public static String ID_CONTEXT_PAGE_FACTORY = "org.eclipse.mylyn.context.ui.editor.context"; //$NON-NLS-1$
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/IContextAwareEditor.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/IContextAwareEditor.java
deleted file mode 100644
index cc23b17..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/IContextAwareEditor.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.context.ui;
-
-/**
- * Tag interface for editors that do not get closed when a context is deactivated. The editor can specify whether or not
- * it should closed based on its input.
- * 
- * @author Mik Kersten
- * @since 3.0
- */
-// TODO 4.0 consider making this be based on editor inputs, not editors. See bug 208625.
-public interface IContextAwareEditor {
-
-	public boolean canClose();
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/IContextUiStartup.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/IContextUiStartup.java
deleted file mode 100644
index d2d2c70..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/IContextUiStartup.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.context.ui;
-
-/**
- * Plug-ins that register a context startup extension will be activated before the first context is activated.
- * 
- * @since 2.3
- * @author Steffen Pingel
- */
-public interface IContextUiStartup {
-
-	/**
-	 * Invoked before the first context activation.
-	 */
-	public abstract void lazyStartup();
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/InterestFilter.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/InterestFilter.java
deleted file mode 100644
index 890758f..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/InterestFilter.java
+++ /dev/null
@@ -1,170 +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
- *     Christian Dupuis - bug 193003
- *     David Green - fix for bug 261446
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-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.context.core.IImplicitlyIntersting;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.CompositeContextElement;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.internal.WorkingSet;
-
-/**
- * A generic degree-of-interest viewer filter that can be applied to any StructuredViewer. It figures out whether an
- * object is interesting by getting it's handle from the corresponding structure bridge.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public class InterestFilter extends ViewerFilter {
-
-	private Object temporarilyUnfiltered = null;
-
-	@Override
-	public boolean select(Viewer viewer, Object parent, Object object) {
-		try {
-			if (!(viewer instanceof StructuredViewer)) {// || !containsMylarInterestFilter((StructuredViewer) viewer)) {
-				return true;
-			}
-			if (isTemporarilyUnfiltered(parent)) {
-				return true;
-			} else if (temporarilyUnfiltered instanceof Tree
-					&& (isRootElement(object) || isRootElement(viewer, parent, object))) {
-				return true;
-			}
-
-			IInteractionElement element = null;
-			if (object instanceof IImplicitlyIntersting) {
-				return true;
-			} else if (object instanceof IInteractionElement) {
-				element = (IInteractionElement) object;
-			} else {
-				AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(object);
-				if (bridge.getContentType() == null) {
-					// try to resolve the resource
-					if (object instanceof IAdaptable) {
-						Object adapted = ((IAdaptable) object).getAdapter(IResource.class);
-						if (adapted instanceof IResource) {
-							object = adapted;
-						}
-						bridge = ContextCore.getStructureBridge(object);
-					} else {
-						return false;
-					}
-				}
-				if (!bridge.canFilter(object)) {
-					return true;
-				}
-
-				if (!object.getClass().getName().equals(Object.class.getCanonicalName())) {
-					String handle = bridge.getHandleIdentifier(object);
-					element = ContextCore.getContextManager().getElement(handle);
-
-					// if we can't find the element, check the parent bridge
-					if (element == null
-							|| (element instanceof CompositeContextElement && ((CompositeContextElement) element).getNodes()
-									.isEmpty())) {
-						String parentContentType = bridge.getParentContentType();
-						AbstractContextStructureBridge parentBridge = ContextCore.getStructureBridge(parentContentType);
-						if (parentBridge != null) {
-							String parentHandle = parentBridge.getHandleIdentifier(object);
-							IInteractionElement parentElement = ContextCore.getContextManager()
-									.getElement(parentHandle);
-							if (parentElement != null && isInteresting(parentElement)) {
-								// do a sanity check to make sure that we are trying to display the element
-								// and not some other representation
-								// If this is removed, you can see the undesired behavior of the parent default 
-								// packages showing up in the package explorer
-								Object objectForHandle = parentBridge.getObjectForHandle(parentHandle);
-								return objectForHandle != null && objectForHandle.equals(object);
-							}
-						}
-					}
-
-				} else {
-					return true;
-				}
-			}
-			if (element != null) {
-				return isInteresting(element);
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, "Interest filter failed on viewer: " //$NON-NLS-1$
-					+ viewer.getClass(), t));
-		}
-		return false;
-	}
-
-	private boolean isRootElement(Viewer viewer, Object parent, Object object) {
-		if (viewer.getInput() == parent) {
-			return true;
-		}
-		return false;
-	}
-
-	protected boolean isRootElement(Object object) {
-		return object instanceof IProjectNature || object instanceof IProject || object instanceof WorkingSet;
-	}
-
-	protected boolean isInteresting(IInteractionElement element) {
-		// FIXME temporarily disabled, see bug 210011
-		//		if (element.getInterest().isPredicted()) {
-//			return false;
-//		} else {
-		return element.getInterest().isInteresting();
-//		}
-	}
-
-	private boolean isTemporarilyUnfiltered(Object parent) {
-		if (parent instanceof TreePath) {
-			TreePath treePath = (TreePath) parent;
-			parent = treePath.getLastSegment();
-		}
-		return temporarilyUnfiltered != null && temporarilyUnfiltered.equals(parent);
-	}
-
-	public void setTemporarilyUnfiltered(Object temprarilyUnfiltered) {
-		this.temporarilyUnfiltered = temprarilyUnfiltered;
-	}
-
-	/**
-	 * @return true if there was an unfiltered node
-	 */
-	public boolean resetTemporarilyUnfiltered() {
-		if (temporarilyUnfiltered != null) {
-			this.temporarilyUnfiltered = null;
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public Object getTemporarilyUnfiltered() {
-		return temporarilyUnfiltered;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/InterestSorter.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/InterestSorter.java
deleted file mode 100644
index 3c043d0..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/context/ui/InterestSorter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.context.ui;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.InterestComparator;
-
-/**
- * Sorts view elements by degree-of-interest.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public class InterestSorter extends ViewerSorter {
-
-	protected InterestComparator<Object> comparator = new InterestComparator<Object>();
-
-	@Override
-	public int compare(Viewer viewer, Object e1, Object e2) {
-		IInteractionElement element1 = getCorresponding(e1);
-		IInteractionElement element2 = getCorresponding(e2);
-		if (element1 != null && element2 != null) {
-			return comparator.compare(element1, element2);
-		} else {
-			return 0;
-		}
-	}
-
-	private IInteractionElement getCorresponding(Object object) {
-		if (object instanceof IInteractionElement) {
-			return (IInteractionElement) object;
-		} else {
-			AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(object);
-			String handle = bridge.getHandleIdentifier(object);
-			return ContextCore.getContextManager().getElement(handle);
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/AbstractContextLabelProvider.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/AbstractContextLabelProvider.java
deleted file mode 100644
index 256ed68..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/AbstractContextLabelProvider.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * TODO: this delegation idiom is breaking, refactor
- * 
- * @author Mik Kersten
- */
-public abstract class AbstractContextLabelProvider implements ILabelProvider {
-
-	public Image getImage(Object object) {
-		if (object instanceof IInteractionRelation) {
-			return getImage((IInteractionRelation) object);
-		} else if (object instanceof IInteractionElement) {
-			return getImage((IInteractionElement) object);
-		} else {
-			return getImageForObject(object);
-		}
-	}
-
-	public String getText(Object object) {
-		if (object instanceof IInteractionRelation) {
-			return getText((IInteractionRelation) object);
-		} else if (object instanceof IInteractionElement) {
-			return getText((IInteractionElement) object);
-		} else {
-			return getTextForObject(object);
-		}
-	}
-
-	protected abstract Image getImage(IInteractionElement node);
-
-	protected abstract Image getImage(IInteractionRelation edge);
-
-	protected abstract Image getImageForObject(Object object);
-
-	protected abstract String getText(IInteractionElement node);
-
-	protected abstract String getTextForObject(Object object);
-
-	protected abstract String getText(IInteractionRelation edge);
-
-	public void addListener(ILabelProviderListener listener) {
-		// TODO Auto-generated method stub
-	}
-
-	public void dispose() {
-		// TODO Auto-generated method stub
-
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ActiveViewSelectionDragAdapter.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ActiveViewSelectionDragAdapter.java
deleted file mode 100644
index 7e865d9..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ActiveViewSelectionDragAdapter.java
+++ /dev/null
@@ -1,62 +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.context.ui;
-
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.util.TransferDragSourceListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DragSourceAdapter;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.Transfer;
-
-/**
- * @author Mik Kersten
- */
-public class ActiveViewSelectionDragAdapter extends DragSourceAdapter implements TransferDragSourceListener {
-
-	private final ISelectionProvider fProvider;
-
-	public ActiveViewSelectionDragAdapter(ISelectionProvider provider) {
-		assert provider != null;
-		fProvider = provider;
-	}
-
-	public Transfer getTransfer() {
-		return LocalSelectionTransfer.getTransfer();
-	}
-
-	@Override
-	public void dragStart(DragSourceEvent event) {
-		ISelection selection = fProvider.getSelection();
-		LocalSelectionTransfer.getTransfer().setSelection(selection);
-		LocalSelectionTransfer.getTransfer().setSelectionSetTime(event.time & 0xFFFFFFFFL);
-		event.doit = isDragable(selection);
-	}
-
-	protected boolean isDragable(ISelection selection) {
-		return true;
-	}
-
-	@Override
-	public void dragSetData(DragSourceEvent event) {
-		event.data = LocalSelectionTransfer.getTransfer().getSelection();
-	}
-
-	@Override
-	public void dragFinished(DragSourceEvent event) {
-		assert event.detail != DND.DROP_MOVE;
-		LocalSelectionTransfer.getTransfer().setSelection(null);
-		LocalSelectionTransfer.getTransfer().setSelectionSetTime(0);
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/BrowseFilteredListener.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/BrowseFilteredListener.java
deleted file mode 100644
index c245fb3..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/BrowseFilteredListener.java
+++ /dev/null
@@ -1,184 +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.context.ui;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.progress.UIJob;
-
-/**
- * @author Mik Kersten
- */
-public class BrowseFilteredListener implements MouseListener, KeyListener {
-
-	private final StructuredViewer viewer;
-
-	public BrowseFilteredListener(StructuredViewer viewer) {
-		this.viewer = viewer;
-	}
-
-	/**
-	 * @param treeViewer
-	 *            cannot be null
-	 * @param targetSelection
-	 *            cannot be null
-	 */
-	public void unfilterSelection(TreeViewer treeViewer, IStructuredSelection targetSelection) {
-		InterestFilter filter = getInterestFilter(treeViewer);
-		Object targetObject = targetSelection.getFirstElement();
-		if (filter != null && targetObject != null) {
-			filter.setTemporarilyUnfiltered(targetObject);
-			if (targetObject instanceof Tree) {
-				treeViewer.refresh();
-			} else {
-				treeViewer.refresh(targetObject, true);
-				treeViewer.expandToLevel(targetObject, 1);
-			}
-		}
-	}
-
-	private void unfilter(final InterestFilter filter, final TreeViewer treeViewer, Object targetObject) {
-		if (targetObject != null) {
-			filter.setTemporarilyUnfiltered(targetObject);
-			if (targetObject instanceof Tree) {
-				treeViewer.refresh();
-			} else {
-				treeViewer.refresh(targetObject, true);
-				treeViewer.expandToLevel(targetObject, 1);
-			}
-		}
-	}
-
-	public void keyPressed(KeyEvent event) {
-		// ignore
-	}
-
-	public void keyReleased(KeyEvent event) {
-		InterestFilter filter = getInterestFilter(viewer);
-
-		if (event.keyCode == SWT.ARROW_RIGHT) {
-			if (filter == null || !(viewer instanceof TreeViewer)) {
-				return;
-			}
-
-			final TreeViewer treeViewer = (TreeViewer) viewer;
-			ISelection selection = treeViewer.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				Object targetObject = ((IStructuredSelection) selection).getFirstElement();
-				unfilter(filter, treeViewer, targetObject);
-			}
-		}
-	}
-
-	public void mouseDown(MouseEvent event) {
-		// ignore
-	}
-
-	public void mouseDoubleClick(MouseEvent e) {
-		// ignore
-	}
-
-	public void mouseUp(MouseEvent event) {
-		final InterestFilter filter = getInterestFilter(viewer);
-		if (filter == null || !(viewer instanceof TreeViewer)) {
-			return;
-		}
-
-		TreeViewer treeViewer = (TreeViewer) viewer;
-		Object selectedObject = null;
-		Object clickedObject = getClickedItem(event);
-		if (clickedObject != null) {
-			selectedObject = clickedObject;
-		} else {
-			selectedObject = treeViewer.getTree();
-		}
-
-		if (isUnfilterEvent(event)) {
-			if (treeViewer instanceof CommonViewer) {
-				CommonViewer commonViewer = (CommonViewer) treeViewer;
-				commonViewer.setSelection(new StructuredSelection(selectedObject), true);
-			}
-			unfilter(filter, treeViewer, selectedObject);
-		} else {
-			if (event.button == 1) {
-				if ((event.stateMask & SWT.MOD1) != 0) {
-					viewer.refresh(selectedObject);
-				} else {
-					final Object unfiltered = filter.getTemporarilyUnfiltered();
-					if (unfiltered != null) {
-						// NOTE: delaying refresh to ensure double click is handled, see bug 208702
-						new UIJob("") { //$NON-NLS-1$
-							@Override
-							public IStatus runInUIThread(IProgressMonitor monitor) {
-								filter.resetTemporarilyUnfiltered();
-								viewer.refresh(unfiltered);
-								return Status.OK_STATUS;
-							}
-						}.schedule(event.display.getDoubleClickTime() + 50);
-					}
-				}
-			}
-		}
-	}
-
-	private Object getClickedItem(MouseEvent event) {
-		if (event.getSource() instanceof Table) {
-			TableItem item = ((Table) event.getSource()).getItem(new Point(event.x, event.y));
-			if (item != null) {
-				return item.getData();
-			} else {
-				return null;
-			}
-		} else if (event.getSource() instanceof Tree) {
-			TreeItem item = ((Tree) event.getSource()).getItem(new Point(event.x, event.y));
-			if (item != null) {
-				return item.getData();
-			} else {
-				return null;
-			}
-		}
-		return null;
-	}
-
-	public static boolean isUnfilterEvent(MouseEvent event) {
-		return (event.stateMask & SWT.ALT) != 0;
-	}
-
-	private InterestFilter getInterestFilter(StructuredViewer structuredViewer) {
-		ViewerFilter[] filters = structuredViewer.getFilters();
-		for (ViewerFilter filter : filters) {
-			if (filter instanceof InterestFilter) {
-				return (InterestFilter) filter;
-			}
-		}
-		return null;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ColorMap.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ColorMap.java
deleted file mode 100644
index f8fc6fc..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ColorMap.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.context.ui;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Mik Kersten
- */
-public class ColorMap {
-
-	// TODO: use themes?
-	public static final Color LANDMARK = new Color(Display.getDefault(), 36, 22, 50);
-
-	public static final Color BACKGROUND_COLOR = new Color(Display.getDefault(), 255, 255, 255);
-
-	public static final Color DEFAULT = null;//Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);//new Color(Display.getDefault(), 255, 255, 255); 
-
-	public static final Color GRAY_DARK = new Color(Display.getDefault(), 70, 70, 70);
-
-	public static final Color GRAY_MEDIUM = new Color(Display.getDefault(), 105, 105, 105);
-
-	public static final Color GRAY_LIGHT = new Color(Display.getDefault(), 145, 145, 145);
-
-	public static final Color GRAY_VERY_LIGHT = new Color(Display.getDefault(), 200, 200, 200);
-
-	public static final Color RELATIONSHIP = new Color(Display.getDefault(), 32, 104, 157);
-
-	public static final Color HIGLIGHTER_RED_INTERSECTION = new Color(Display.getDefault(), 200, 0, 0);
-
-	public static final Color HIGHLIGHTER_ORANGE_GRADIENT = new Color(Display.getDefault(), 222, 137, 71);
-
-	public static final Color HIGLIGHTER_BLUE_GRADIENT = new Color(Display.getDefault(), 81, 158, 235);
-
-	public static final Color HIGHLIGHTER_YELLOW = new Color(Display.getDefault(), 255, 238, 99);
-
-	public static final Color PANTONE_PASTEL_YELLOW = new Color(Display.getDefault(), 244, 238, 175);
-
-	public static final Color PANTONE_PASTEL_ROSE = new Color(Display.getDefault(), 254, 179, 190);
-
-	public static final Color PANTONE_PASTEL_MAUVE = new Color(Display.getDefault(), 241, 183, 216);
-
-	public static final Color PANTONE_PASTEL_PURPLE = new Color(Display.getDefault(), 202, 169, 222);
-
-	public static final Color PANTONE_PASTEL_BLUE = new Color(Display.getDefault(), 120, 160, 250);
-
-	public static final Color PANTONE_PASTERL_GREEN = new Color(Display.getDefault(), 162, 231, 215);
-
-	public static final Color COLOR_WHITE = new Color(Display.getCurrent(), 255, 255, 255);
-
-	public static final Color COLOR_BLACK = new Color(Display.getCurrent(), 0, 0, 0);
-
-	public void dispose() {
-		LANDMARK.dispose();
-		BACKGROUND_COLOR.dispose();
-		GRAY_DARK.dispose();
-		GRAY_MEDIUM.dispose();
-		GRAY_LIGHT.dispose();
-		GRAY_VERY_LIGHT.dispose();
-		RELATIONSHIP.dispose();
-		HIGLIGHTER_RED_INTERSECTION.dispose();
-		HIGHLIGHTER_ORANGE_GRADIENT.dispose();
-		HIGHLIGHTER_YELLOW.dispose();
-		PANTONE_PASTERL_GREEN.dispose();
-		PANTONE_PASTEL_BLUE.dispose();
-		PANTONE_PASTEL_MAUVE.dispose();
-		PANTONE_PASTEL_PURPLE.dispose();
-		PANTONE_PASTEL_ROSE.dispose();
-		PANTONE_PASTEL_YELLOW.dispose();
-		COLOR_WHITE.dispose();
-		COLOR_BLACK.dispose();
-
-		// below disposed by registry
-		// DEFAULT.dispose();
-	}
-
-	private GammaSetting gammaSetting = GammaSetting.STANDARD;
-
-	public enum GammaSetting {
-		LIGHTEN, DARKEN, STANDARD;
-
-		public static int compare(GammaSetting gs1, GammaSetting gs2) {
-			if (gs1 == LIGHTEN) {
-				if (gs2 == STANDARD) {
-					return 1;
-				} else if (gs2 == DARKEN) {
-					return 2;
-				} else {
-					return 0;
-				}
-			} else if (gs1 == STANDARD) {
-				if (gs2 == LIGHTEN) {
-					return -1;
-				} else if (gs2 == DARKEN) {
-					return 1;
-				} else {
-					return 0;
-				}
-			} else {
-				if (gs2 == LIGHTEN) {
-					return -2;
-				} else if (gs2 == STANDARD) {
-					return -1;
-				} else {
-					return 0;
-				}
-			}
-		}
-	}
-
-	public GammaSetting getGammaSetting() {
-		return gammaSetting;
-	}
-
-	public void setGammaSetting(GammaSetting gammaSetting) {
-		this.gammaSetting = gammaSetting;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContentOutlineManager.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContentOutlineManager.java
deleted file mode 100644
index 3fc6266..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContentOutlineManager.java
+++ /dev/null
@@ -1,55 +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.context.ui;
-
-import org.eclipse.mylyn.internal.context.ui.actions.FocusOutlineAction;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Mik Kersten
- */
-public class ContentOutlineManager implements IPartListener {
-
-	public void partBroughtToTop(final IWorkbenchPart part) {
-		// use the display async due to bug 261977: [context] outline view does not filter contents when new editor is opened
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				if (part instanceof IEditorPart) {
-					IEditorPart editorPart = (IEditorPart) part;
-					FocusOutlineAction applyAction = FocusOutlineAction.getOutlineActionForEditor(editorPart);
-					if (applyAction != null) {
-						applyAction.update(editorPart);
-					}
-				}
-			}
-		});
-	}
-
-	public void partActivated(IWorkbenchPart part) {
-		// ignore
-	}
-
-	public void partOpened(IWorkbenchPart part) {
-		// ignore
-	}
-
-	public void partClosed(IWorkbenchPart partRef) {
-		// ignore
-	}
-
-	public void partDeactivated(IWorkbenchPart partRef) {
-		// ignore
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextEditorManager.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextEditorManager.java
deleted file mode 100644
index 20fc76f..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextEditorManager.java
+++ /dev/null
@@ -1,444 +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.context.ui;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-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.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.mylyn.context.ui.IContextAwareEditor;
-import org.eclipse.mylyn.internal.tasks.ui.editors.TaskMigrator;
-import org.eclipse.mylyn.monitor.ui.MonitorUi;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.XMLMemento;
-import org.eclipse.ui.internal.EditorManager;
-import org.eclipse.ui.internal.IPreferenceConstants;
-import org.eclipse.ui.internal.IWorkbenchConstants;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.ui.internal.WorkbenchPage;
-import org.eclipse.ui.internal.WorkbenchWindow;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- */
-public class ContextEditorManager extends AbstractContextListener {
-
-	private static final String PREFS_PREFIX = "editors.task."; //$NON-NLS-1$
-
-	private static final String KEY_CONTEXT_EDITORS = "ContextOpenEditors"; //$NON-NLS-1$
-
-	private static final String KEY_MONITORED_WINDOW_OPEN_EDITORS = "MonitoredWindowOpenEditors"; //$NON-NLS-1$
-
-	private static final String ATTRIBUTE_CLASS = "class"; //$NON-NLS-1$
-
-	private static final String ATTRIBUTE_NUMER = "number"; //$NON-NLS-1$
-
-	private static final String ATTRIBUTE_IS_LAUNCHING = "isLaunching"; //$NON-NLS-1$
-
-	private static final String ATTRIBUTE_IS_ACTIVE = "isActive"; //$NON-NLS-1$
-
-	private boolean previousCloseEditorsSetting = Workbench.getInstance().getPreferenceStore().getBoolean(
-			IPreferenceConstants.REUSE_EDITORS_BOOLEAN);
-
-	private final IPreferenceStore preferenceStore;
-
-	public ContextEditorManager() {
-		preferenceStore = new ScopedPreferenceStore(new InstanceScope(), "org.eclipse.mylyn.resources.ui"); //$NON-NLS-1$
-	}
-
-	@Override
-	public void contextChanged(ContextChangeEvent event) {
-		switch (event.getEventKind()) {
-		case ACTIVATED:
-			openEditorsFromMemento(event.getContext());
-			break;
-		case DEACTIVATED:
-			closeEditorsAndSaveMemento(event.getContext());
-			break;
-		case INTEREST_CHANGED:
-			for (IInteractionElement element : event.getElements()) {
-				closeEditor(element, false);
-			}
-			break;
-		case ELEMENTS_DELETED:
-			for (IInteractionElement element : event.getElements()) {
-				closeEditor(element, true);
-			}
-			break;
-		case CLEARED:
-			// use the handle since the context is null when it is cleared
-			// bug 255588
-			clearEditorMemento(event.getContextHandle(), event.isActiveContext());
-			break;
-
-		}
-	}
-
-	public void openEditorsFromMemento(IInteractionContext context) {
-		if (!Workbench.getInstance().isStarting()
-				&& ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
-						IContextUiPreferenceContstants.AUTO_MANAGE_EDITORS) && !TaskMigrator.isActive()) {
-			Workbench workbench = (Workbench) PlatformUI.getWorkbench();
-			previousCloseEditorsSetting = workbench.getPreferenceStore().getBoolean(
-					IPreferenceConstants.REUSE_EDITORS_BOOLEAN);
-			workbench.getPreferenceStore().setValue(IPreferenceConstants.REUSE_EDITORS_BOOLEAN, false);
-			boolean wasPaused = ContextCore.getContextManager().isContextCapturePaused();
-			try {
-				if (!wasPaused) {
-					ContextCore.getContextManager().setContextCapturePaused(true);
-				}
-				String mementoString = null;
-				// TODO change where memento is stored
-				IWorkbenchWindow activeWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-				try {
-					mementoString = readEditorMemento(context);
-					if (mementoString != null && !mementoString.trim().equals("")) { //$NON-NLS-1$
-						IMemento memento = XMLMemento.createReadRoot(new StringReader(mementoString));
-						IMemento[] children = memento.getChildren(KEY_MONITORED_WINDOW_OPEN_EDITORS);
-						if (children.length > 0) {
-							// This code supports restore from multiple windows
-							for (IMemento child : children) {
-								WorkbenchPage page = getWorkbenchPageForMemento(child, activeWindow);
-								if (child != null && page != null) {
-									restoreEditors(page, child, page.getWorkbenchWindow() == activeWindow);
-								}
-							}
-						} else {
-							// This code is for supporting the old editor management - only the active window
-							WorkbenchPage page = (WorkbenchPage) activeWindow.getActivePage();
-							if (memento != null) {
-								restoreEditors(page, memento, true);
-							}
-						}
-					}
-				} catch (Exception e) {
-					StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-							"Could not restore all editors, memento: \"" + mementoString + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				activeWindow.setActivePage(activeWindow.getActivePage());
-				IInteractionElement activeNode = context.getActiveNode();
-				if (activeNode != null) {
-					ContextUi.getUiBridge(activeNode.getContentType()).open(activeNode);
-				}
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-						"Failed to open editors on activation", e)); //$NON-NLS-1$
-			} finally {
-				ContextCore.getContextManager().setContextCapturePaused(false);
-			}
-		}
-	}
-
-	private WorkbenchPage getWorkbenchPageForMemento(IMemento memento, IWorkbenchWindow activeWindow) {
-
-		String windowToRestoreClassName = memento.getString(ATTRIBUTE_CLASS);
-		if (windowToRestoreClassName == null) {
-			windowToRestoreClassName = ""; //$NON-NLS-1$
-		}
-		Integer windowToRestorenumber = memento.getInteger(ATTRIBUTE_NUMER);
-		if (windowToRestorenumber == null) {
-			windowToRestorenumber = 0;
-		}
-
-		// try to match the open windows to the one that we want to restore
-		Set<IWorkbenchWindow> monitoredWindows = MonitorUi.getMonitoredWindows();
-		for (IWorkbenchWindow window : monitoredWindows) {
-			int windowNumber = 0;
-			if (window instanceof WorkbenchWindow) {
-				windowNumber = ((WorkbenchWindow) window).getNumber();
-			}
-			if (window.getClass().getCanonicalName().equals(windowToRestoreClassName)
-					&& windowNumber == windowToRestorenumber) {
-				return (WorkbenchPage) window.getActivePage();
-			}
-		}
-
-		// we don't have a good match here, try to make an educated guess
-		// TODO e3.4 replace by memento.getBoolean()
-		Boolean isActive = Boolean.valueOf(memento.getString(ATTRIBUTE_IS_ACTIVE));
-		if (isActive == null) {
-			isActive = false;
-		}
-
-		// both of these defaulting to true should ensure that all editors are opened even if their previous editor is not around
-		boolean shouldRestoreUnknownWindowToActive = true; // TODO could add a preference here
-		boolean shouldRestoreActiveWindowToActive = true; // TODO could add a preference here
-
-		if (isActive && shouldRestoreActiveWindowToActive) {
-			// if the window that we are trying to restore was the active window, restore it to the active window
-			return (WorkbenchPage) activeWindow.getActivePage();
-		}
-
-		if (shouldRestoreUnknownWindowToActive) {
-			// we can't find a good window, so restore it to the active one
-			return (WorkbenchPage) activeWindow.getActivePage();
-		}
-
-		if (shouldRestoreActiveWindowToActive && shouldRestoreUnknownWindowToActive) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-					"Unable to find window to restore memento to.", new Exception())); //$NON-NLS-1$
-		}
-
-		// we dont have a window that will work, so don't restore the editors
-		// we shouldn't get here if both *WindowToActive booleans are true
-		return null;
-	}
-
-	private String readEditorMemento(IInteractionContext context) {
-		return preferenceStore.getString(PREFS_PREFIX + context.getHandleIdentifier());
-	}
-
-	public void closeEditorsAndSaveMemento(IInteractionContext context) {
-		if (!PlatformUI.getWorkbench().isClosing()
-				&& ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
-						IContextUiPreferenceContstants.AUTO_MANAGE_EDITORS) && !TaskMigrator.isActive()) {
-			closeAllButActiveTaskEditor(context.getHandleIdentifier());
-
-			XMLMemento rootMemento = XMLMemento.createWriteRoot(KEY_CONTEXT_EDITORS);
-
-			IWorkbenchWindow activeWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-			IWorkbenchWindow launchingWindow = MonitorUi.getLaunchingWorkbenchWindow();
-			Set<IWorkbenchWindow> monitoredWindows = MonitorUi.getMonitoredWindows();
-
-			for (IWorkbenchWindow window : monitoredWindows) {
-				IMemento memento = rootMemento.createChild(KEY_MONITORED_WINDOW_OPEN_EDITORS);
-
-				memento.putString(ATTRIBUTE_CLASS, window.getClass().getCanonicalName());
-				int number = 0;
-				if (window instanceof WorkbenchWindow) {
-					number = ((WorkbenchWindow) window).getNumber();
-				}
-				memento.putInteger(ATTRIBUTE_NUMER, number);
-				// TODO e3.4 replace by memento.putBoolean()
-				memento.putString(ATTRIBUTE_IS_LAUNCHING, (window == launchingWindow) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-				memento.putString(ATTRIBUTE_IS_ACTIVE, (window == activeWindow) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-				((WorkbenchPage) window.getActivePage()).getEditorManager().saveState(memento);
-			}
-			// TODO: avoid storing with preferences due to bloat?
-			StringWriter writer = new StringWriter();
-			try {
-				rootMemento.save(writer);
-				writeEditorMemento(context.getHandleIdentifier(), writer.getBuffer().toString());
-			} catch (IOException e) {
-				StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, "Could not store editor state", //$NON-NLS-1$
-						e));
-			}
-
-			Workbench.getInstance().getPreferenceStore().setValue(IPreferenceConstants.REUSE_EDITORS_BOOLEAN,
-					previousCloseEditorsSetting);
-			closeAllEditors();
-		}
-	}
-
-	public void writeEditorMemento(String contextHandle, String memento) {
-		preferenceStore.setValue(PREFS_PREFIX + contextHandle, memento);
-	}
-
-	public void clearEditorMemento(String contextHandle, boolean closeEditors) {
-
-		if (closeEditors) {
-			closeAllButActiveTaskEditor(contextHandle);
-		}
-
-		XMLMemento memento = XMLMemento.createWriteRoot(KEY_CONTEXT_EDITORS);
-
-		// TODO: avoid storing with preferences due to bloat?
-		StringWriter writer = new StringWriter();
-		try {
-			memento.save(writer);
-			writeEditorMemento(contextHandle, writer.getBuffer().toString());
-		} catch (IOException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, "Could not store editor state", e)); //$NON-NLS-1$
-		}
-
-		Workbench.getInstance().getPreferenceStore().setValue(IPreferenceConstants.REUSE_EDITORS_BOOLEAN,
-				previousCloseEditorsSetting);
-		if (closeEditors) {
-			closeAllEditors();
-		}
-	}
-
-	/**
-	 * HACK: will fail to restore different parts with same name
-	 */
-	@SuppressWarnings("unchecked")
-	private void restoreEditors(WorkbenchPage page, IMemento memento, boolean isActiveWindow) {
-		EditorManager editorManager = page.getEditorManager();
-		final ArrayList visibleEditors = new ArrayList(5);
-		final IEditorReference activeEditor[] = new IEditorReference[1];
-		final MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK, "", null); //$NON-NLS-1$
-
-		try {
-			IMemento[] editorMementos = memento.getChildren(IWorkbenchConstants.TAG_EDITOR);
-			Set<IMemento> editorMementoSet = new HashSet<IMemento>();
-			editorMementoSet.addAll(Arrays.asList(editorMementos));
-			// HACK: same parts could have different editors
-			Set<String> restoredPartNames = new HashSet<String>();
-			List<IEditorReference> alreadyVisibleEditors = Arrays.asList(editorManager.getEditors());
-			for (IEditorReference editorReference : alreadyVisibleEditors) {
-				restoredPartNames.add(editorReference.getPartName());
-			}
-			for (IMemento editorMemento : editorMementoSet) {
-				String partName = editorMemento.getString(IWorkbenchConstants.TAG_PART_NAME);
-				if (!restoredPartNames.contains(partName)) {
-					editorManager.restoreEditorState(editorMemento, visibleEditors, activeEditor, result);
-				} else {
-					restoredPartNames.add(partName);
-				}
-			}
-
-			for (int i = 0; i < visibleEditors.size(); i++) {
-				editorManager.setVisibleEditor((IEditorReference) visibleEditors.get(i), false);
-			}
-
-			if (activeEditor[0] != null && isActiveWindow) {
-				IWorkbenchPart editor = activeEditor[0].getPart(true);
-				if (editor != null) {
-					page.activate(editor);
-				}
-			}
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, "Could not restore editors", e)); //$NON-NLS-1$
-		}
-	}
-
-	public void closeAllButActiveTaskEditor(String taskHandle) {
-		try {
-			if (PlatformUI.getWorkbench().isClosing()) {
-				return;
-			}
-			for (IWorkbenchWindow window : MonitorUi.getMonitoredWindows()) {
-				IWorkbenchPage page = window.getActivePage();
-				if (page != null) {
-					IEditorReference[] references = page.getEditorReferences();
-					List<IEditorReference> toClose = new ArrayList<IEditorReference>();
-					for (IEditorReference reference : references) {
-						if (canClose(reference)) {
-							try {
-								IEditorInput input = reference.getEditorInput();
-								if (input instanceof TaskEditorInput) {
-									ITask task = ((TaskEditorInput) input).getTask();
-									if (task != null && task.getHandleIdentifier().equals(taskHandle)) {
-										// do not close
-									} else {
-										toClose.add(reference);
-									}
-								}
-							} catch (PartInitException e) {
-								// ignore
-							}
-						}
-					}
-					page.closeEditors(toClose.toArray(new IEditorReference[toClose.size()]), true);
-				}
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, "Could not auto close editor", t)); //$NON-NLS-1$
-		}
-	}
-
-	public void closeAllEditors() {
-		try {
-			if (PlatformUI.getWorkbench().isClosing()) {
-				return;
-			}
-			for (IWorkbenchWindow window : MonitorUi.getMonitoredWindows()) {
-				IWorkbenchPage page = window.getActivePage();
-				if (page != null) {
-					IEditorReference[] references = page.getEditorReferences();
-					List<IEditorReference> toClose = new ArrayList<IEditorReference>();
-					for (IEditorReference reference : references) {
-						if (canClose(reference)) {
-							toClose.add(reference);
-						}
-					}
-					page.closeEditors(toClose.toArray(new IEditorReference[toClose.size()]), true);
-				}
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, "Could not auto close editor", t)); //$NON-NLS-1$
-		}
-	}
-
-	private boolean canClose(final IEditorReference editorReference) {
-		final IEditorPart editor = editorReference.getEditor(false);
-		if (editor != null) {
-			final boolean[] result = new boolean[1];
-			result[0] = true;
-			SafeRunnable.run(new ISafeRunnable() {
-				public void run() throws Exception {
-					if (editor instanceof IContextAwareEditor) {
-						result[0] = ((IContextAwareEditor) editor).canClose();
-					} else {
-						IContextAwareEditor contextAware = (IContextAwareEditor) editor.getAdapter(IContextAwareEditor.class);
-						if (contextAware != null) {
-							result[0] = contextAware.canClose();
-						}
-					}
-				}
-
-				public void handleException(Throwable e) {
-					StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-							"Failed to verify editor status", e)); //$NON-NLS-1$
-				}
-			});
-			return result[0];
-		}
-		return true;
-	}
-
-	private void closeEditor(IInteractionElement element, boolean force) {
-		if (ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
-				IContextUiPreferenceContstants.AUTO_MANAGE_EDITORS)) {
-			if (force || !element.getInterest().isInteresting()) {
-				AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(element.getContentType());
-				if (bridge.isDocument(element.getHandleIdentifier())) {
-					AbstractContextUiBridge uiBridge = ContextUi.getUiBridge(element.getContentType());
-					uiBridge.close(element);
-				}
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextPerspectiveManager.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextPerspectiveManager.java
deleted file mode 100644
index 26a7911..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextPerspectiveManager.java
+++ /dev/null
@@ -1,200 +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.context.ui;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.mylyn.monitor.ui.MonitorUi;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskActivationListener;
-import org.eclipse.ui.IPerspectiveDescriptor;
-import org.eclipse.ui.IPerspectiveListener4;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.Perspective;
-import org.eclipse.ui.internal.WorkbenchPage;
-import org.eclipse.ui.internal.registry.IActionSetDescriptor;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- */
-public class ContextPerspectiveManager implements ITaskActivationListener, IPerspectiveListener4 {
-
-	private final Set<String> managedPerspectiveIds;
-
-	private final Set<String> actionSetsToSuppress;
-
-	private final IPreferenceStore preferenceStore;
-
-	public ContextPerspectiveManager(IPreferenceStore preferenceStore) {
-		this.preferenceStore = preferenceStore;
-		this.managedPerspectiveIds = new HashSet<String>();
-		this.actionSetsToSuppress = new HashSet<String>();
-		actionSetsToSuppress.add("org.eclipse.ui.edit.text.actionSet.annotationNavigation"); //$NON-NLS-1$
-		actionSetsToSuppress.add("org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo"); //$NON-NLS-1$
-		actionSetsToSuppress.add("org.eclipse.ui.externaltools.ExternalToolsSet"); //$NON-NLS-1$
-	}
-
-	public void addManagedPerspective(String id) {
-		managedPerspectiveIds.add(id);
-	}
-
-	public void removeManagedPerspective(String id) {
-		managedPerspectiveIds.remove(id);
-	}
-
-	public void taskActivated(ITask task) {
-		try {
-			IWorkbenchWindow launchingWindow = MonitorUi.getLaunchingWorkbenchWindow();
-			if (launchingWindow != null) {
-				IPerspectiveDescriptor descriptor = launchingWindow.getActivePage().getPerspective();
-				setPerspectiveIdFor(null, descriptor.getId());
-
-				String perspectiveId = getPerspectiveIdFor(task);
-				showPerspective(perspectiveId);
-			}
-		} catch (Exception e) {
-			// ignore, perspective may not have been saved, e.g. due to crash
-		}
-	}
-
-	public void taskDeactivated(ITask task) {
-		try {
-			if (PlatformUI.isWorkbenchRunning()
-					&& ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
-							IContextUiPreferenceContstants.AUTO_MANAGE_PERSPECTIVES)) {
-				IWorkbenchWindow launchingWindow = MonitorUi.getLaunchingWorkbenchWindow();
-				if (launchingWindow != null) {
-					IPerspectiveDescriptor descriptor = launchingWindow.getActivePage().getPerspective();
-					setPerspectiveIdFor(task, descriptor.getId());
-
-					String previousPerspectiveId = getPerspectiveIdFor(null);
-					showPerspective(previousPerspectiveId);
-				}
-			}
-		} catch (Exception e) {
-			// ignore, perspective may not have been saved, e.g. due to crash
-		}
-	}
-
-	private void showPerspective(String perspectiveId) {
-		if (perspectiveId != null
-				&& perspectiveId.length() > 0
-				&& ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
-						IContextUiPreferenceContstants.AUTO_MANAGE_PERSPECTIVES)) {
-			IWorkbenchWindow launchingWindow = MonitorUi.getLaunchingWorkbenchWindow();
-			try {
-				if (launchingWindow != null) {
-					launchingWindow.getShell().setRedraw(false);
-					PlatformUI.getWorkbench().showPerspective(perspectiveId, launchingWindow);
-				}
-			} catch (Exception e) {
-				// perspective's preserved id not found, ignore
-			} finally {
-				if (launchingWindow != null) {
-					launchingWindow.getShell().setRedraw(true);
-				}
-			}
-		}
-	}
-
-	public void perspectivePreDeactivate(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
-		// ignore
-	}
-
-	public void perspectiveClosed(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
-		// ignore
-	}
-
-	public void perspectiveDeactivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
-		// ignore
-	}
-
-	public void perspectiveOpened(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
-		cleanActionSets(page, perspective);
-	}
-
-	public void perspectiveSavedAs(IWorkbenchPage page, IPerspectiveDescriptor oldPerspective,
-			IPerspectiveDescriptor newPerspective) {
-		// ignore
-	}
-
-	public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective,
-			IWorkbenchPartReference partRef, String changeId) {
-		// ignore
-	}
-
-	public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspectiveDescriptor) {
-		cleanActionSets(page, perspectiveDescriptor);
-	}
-
-	private void cleanActionSets(IWorkbenchPage page, IPerspectiveDescriptor perspectiveDescriptor) {
-		if (managedPerspectiveIds.contains(perspectiveDescriptor.getId())) {
-			if (page instanceof WorkbenchPage) {
-				Perspective perspective = ((WorkbenchPage) page).getActivePerspective();
-
-				Set<IActionSetDescriptor> toRemove = new HashSet<IActionSetDescriptor>();
-				IActionSetDescriptor[] actionSetDescriptors = ((WorkbenchPage) page).getActionSets();
-				for (IActionSetDescriptor actionSetDescriptor : actionSetDescriptors) {
-					if (actionSetsToSuppress.contains(actionSetDescriptor.getId())) {
-						toRemove.add(actionSetDescriptor);
-					}
-				}
-				perspective.turnOffActionSets(toRemove.toArray(new IActionSetDescriptor[toRemove.size()]));
-			}
-		}
-	}
-
-	public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) {
-		// ignore
-	}
-
-	public void preTaskActivated(ITask task) {
-		// ignore	
-	}
-
-	public void preTaskDeactivated(ITask task) {
-		// ignore		
-	}
-
-	/**
-	 * @param task
-	 *            can be null to indicate no task
-	 */
-	private String getPerspectiveIdFor(ITask task) {
-		if (task != null) {
-			return preferenceStore.getString(IContextUiPreferenceContstants.PREFIX_TASK_TO_PERSPECTIVE
-					+ task.getHandleIdentifier());
-		} else {
-			return preferenceStore.getString(IContextUiPreferenceContstants.PERSPECTIVE_NO_ACTIVE_TASK);
-		}
-	}
-
-	/**
-	 * @param task
-	 *            can be null to indicate no task
-	 */
-	private void setPerspectiveIdFor(ITask task, String perspectiveId) {
-		if (task != null) {
-			preferenceStore.setValue(IContextUiPreferenceContstants.PREFIX_TASK_TO_PERSPECTIVE
-					+ task.getHandleIdentifier(), perspectiveId);
-		} else {
-			preferenceStore.setValue(IContextUiPreferenceContstants.PERSPECTIVE_NO_ACTIVE_TASK, perspectiveId);
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextUiImages.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextUiImages.java
deleted file mode 100644
index 18c807f..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextUiImages.java
+++ /dev/null
@@ -1,110 +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.context.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Mik Kersten
- */
-public class ContextUiImages {
-
-	private static ImageRegistry imageRegistry;
-
-	private static final String T_ELCL = "elcl16"; //$NON-NLS-1$
-
-	private static final String T_TOOL = "etool16"; //$NON-NLS-1$
-
-	private static final URL baseURL = ContextUiPlugin.getDefault().getBundle().getEntry("/icons/"); //$NON-NLS-1$
-
-	// TODO 3.3 move images below to sandbox
-
-	@Deprecated
-	public static final ImageDescriptor COLOR_PALETTE = create(T_ELCL, "color-palette.gif"); //$NON-NLS-1$
-
-	@Deprecated
-	public static final ImageDescriptor STOP_SEARCH = create(T_ELCL, "stop_all.gif"); //$NON-NLS-1$
-
-	@Deprecated
-	public static final ImageDescriptor QUALIFY_NAMES = create(T_TOOL, "qualify-names.gif"); //$NON-NLS-1$
-
-	@Deprecated
-	public static final ImageDescriptor EDGE_INHERITANCE = create(T_ELCL, "edge-inheritance.gif"); //$NON-NLS-1$
-
-	@Deprecated
-	public static final ImageDescriptor EDGE_REFERENCE = create(T_ELCL, "edge-reference.gif"); //$NON-NLS-1$
-
-	@Deprecated
-	public static final ImageDescriptor EDGE_ACCESS_READ = create(T_ELCL, "edge-read.gif"); //$NON-NLS-1$
-
-	@Deprecated
-	public static final ImageDescriptor EDGE_ACCESS_WRITE = create(T_ELCL, "edge-write.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FILE_XML = create(T_ELCL, "file-xml.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FILE_GENERIC = create(T_ELCL, "file_obj.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FOLDER_GENERIC = create(T_ELCL, "fldr_obj.gif"); //$NON-NLS-1$
-
-	public static ImageDescriptor create(String prefix, String name) {
-		return create(prefix, name, baseURL);
-	}
-
-	public static ImageDescriptor create(String prefix, String name, URL baseURL) {
-		try {
-			return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name, baseURL));
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-
-	private static URL makeIconFileURL(String prefix, String name, URL baseURL) 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 ImageRegistry getImageRegistry() {
-		if (imageRegistry == null) {
-			imageRegistry = new ImageRegistry();
-		}
-
-		return imageRegistry;
-	}
-
-	/**
-	 * Lazily initializes image map.
-	 */
-	public static Image getImage(ImageDescriptor imageDescriptor) {
-		if (imageDescriptor == null) {
-			return null;
-		}
-
-		ImageRegistry imageRegistry = getImageRegistry();
-		Image image = imageRegistry.get("" + imageDescriptor.hashCode()); //$NON-NLS-1$
-		if (image == null) {
-			image = imageDescriptor.createImage();
-			imageRegistry.put("" + imageDescriptor.hashCode(), image); //$NON-NLS-1$
-		}
-		return image;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextUiPlugin.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextUiPlugin.java
deleted file mode 100644
index 604dda4..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextUiPlugin.java
+++ /dev/null
@@ -1,652 +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.context.ui;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-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.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.mylyn.commons.core.CoreUtil;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.mylyn.context.ui.IContextUiStartup;
-import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
-import org.eclipse.mylyn.monitor.ui.MonitorUi;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskActivationListener;
-import org.eclipse.mylyn.tasks.core.TaskActivationAdapter;
-import org.eclipse.mylyn.tasks.ui.ITasksUiConstants;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * Main entry point for the Context UI.
- * 
- * @author Mik Kersten
- * @author Steffen Pingel
- * @since 3.0
- */
-public class ContextUiPlugin extends AbstractUIPlugin {
-
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.context.ui"; //$NON-NLS-1$
-
-	private class ContextActivationListener extends AbstractContextListener {
-
-		@Override
-		public void contextChanged(ContextChangeEvent event) {
-			switch (event.getEventKind()) {
-			case PRE_ACTIVATED:
-				initLazyStart();
-				break;
-			}
-		}
-	}
-
-	private final ContextActivationListener contextActivationListener = new ContextActivationListener();
-
-	private final Map<String, AbstractContextUiBridge> bridges = new HashMap<String, AbstractContextUiBridge>();
-
-	private final Map<String, ILabelProvider> contextLabelProviders = new HashMap<String, ILabelProvider>();
-
-	private static ContextUiPlugin INSTANCE;
-
-	private FocusedViewerManager viewerManager;
-
-	private ContextPerspectiveManager perspectiveManager;
-
-	private final ContentOutlineManager contentOutlineManager = new ContentOutlineManager();
-
-	private final Map<AbstractContextUiBridge, ImageDescriptor> activeSearchIcons = new HashMap<AbstractContextUiBridge, ImageDescriptor>();
-
-	private final Map<AbstractContextUiBridge, String> activeSearchLabels = new HashMap<AbstractContextUiBridge, String>();
-
-	private final Map<String, Set<Class<?>>> preservedFilterClasses = new HashMap<String, Set<Class<?>>>();
-
-	private final Map<String, Set<String>> preservedFilterIds = new HashMap<String, Set<String>>();
-
-	private static final AbstractContextLabelProvider DEFAULT_LABEL_PROVIDER = new AbstractContextLabelProvider() {
-
-		@Override
-		protected Image getImage(IInteractionElement node) {
-			return null;
-		}
-
-		@Override
-		protected Image getImage(IInteractionRelation edge) {
-			return null;
-		}
-
-		@Override
-		protected String getText(IInteractionElement node) {
-			return "? " + node; //$NON-NLS-1$
-		}
-
-		@Override
-		protected String getText(IInteractionRelation edge) {
-			return "? " + edge; //$NON-NLS-1$
-		}
-
-		@Override
-		protected Image getImageForObject(Object object) {
-			return null;
-		}
-
-		@Override
-		protected String getTextForObject(Object node) {
-			return "? " + node; //$NON-NLS-1$
-		}
-
-	};
-
-	private static final AbstractContextUiBridge DEFAULT_UI_BRIDGE = new AbstractContextUiBridge() {
-
-		@Override
-		public void open(IInteractionElement node) {
-			// ignore
-		}
-
-		@Override
-		public void close(IInteractionElement node) {
-			// ignore
-		}
-
-		@Override
-		public boolean acceptsEditor(IEditorPart editorPart) {
-			return false;
-		}
-
-		@Override
-		public List<TreeViewer> getContentOutlineViewers(IEditorPart editor) {
-			return Collections.emptyList();
-		}
-
-		@Override
-		public Object getObjectForTextSelection(TextSelection selection, IEditorPart editor) {
-			return null;
-		}
-
-		@Override
-		public IInteractionElement getElement(IEditorInput input) {
-			return null;
-		}
-
-		@Override
-		public String getContentType() {
-			return null;
-		}
-	};
-
-	private static final ITaskActivationListener TASK_ACTIVATION_LISTENER = new TaskActivationAdapter() {
-
-		@SuppressWarnings( { "deprecation", "restriction" })
-		@Override
-		public void taskActivated(ITask task) {
-			if (CoreUtil.TEST_MODE) {
-				// avoid blocking the test suite
-				return;
-			}
-
-			boolean hasLocalContext = ContextCore.getContextManager().hasContext(task.getHandleIdentifier());
-			if (!hasLocalContext) {
-				if (org.eclipse.mylyn.internal.tasks.ui.util.AttachmentUtil.hasContextAttachment(task)) {
-					boolean getRemote = MessageDialog.openQuestion(PlatformUI.getWorkbench()
-							.getActiveWorkbenchWindow()
-							.getShell(), Messages.ContextUiPlugin_Task_Activation,
-							Messages.ContextUiPlugin_No_local_task_context_exists);
-					if (getRemote) {
-						new org.eclipse.mylyn.internal.context.ui.actions.ContextRetrieveAction().run(task);
-					}
-				}
-			}
-		}
-	};
-
-	private final AtomicBoolean lazyStarted = new AtomicBoolean(false);
-
-	private ContextEditorManager editorManager;
-
-	public ContextUiPlugin() {
-		INSTANCE = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-
-		initDefaultPrefs(getPreferenceStore());
-
-		viewerManager = new FocusedViewerManager();
-		perspectiveManager = new ContextPerspectiveManager(getPreferenceStore());
-
-		ContextCore.getContextManager().addListener(contextActivationListener);
-		if (ContextCore.getContextManager().isContextActive()) {
-			initLazyStart();
-		}
-	}
-
-	private void initLazyStart() {
-		if (!lazyStarted.getAndSet(true)) {
-			IWorkbench workbench = PlatformUI.getWorkbench();
-			try {
-				lazyStart(workbench);
-			} catch (Throwable t) {
-				StatusHandler.log(new Status(IStatus.ERROR, super.getBundle().getSymbolicName(), IStatus.ERROR,
-						"Could not lazy start context plug-in", t)); //$NON-NLS-1$
-			}
-			if (TasksUi.getTaskActivityManager() != null) {
-				ContextCore.getContextManager().removeListener(contextActivationListener);
-			}
-		}
-	}
-
-	@SuppressWarnings("restriction")
-	private void lazyStart(IWorkbench workbench) {
-		try {
-			MonitorUiPlugin.getDefault()
-					.getPreferenceStore()
-					.setValue(MonitorUiPlugin.PREF_USER_ACTIVITY_ENABLED, true);
-			MonitorUiPlugin.getDefault().savePluginPreferences();
-			ContextCore.getContextManager().addListener(viewerManager);
-			MonitorUi.addWindowPartListener(contentOutlineManager);
-			perspectiveManager.addManagedPerspective(ITasksUiConstants.ID_PERSPECTIVE_PLANNING);
-			TasksUi.getTaskActivityManager().addActivationListener(perspectiveManager);
-			MonitorUi.addWindowPerspectiveListener(perspectiveManager);
-			TasksUi.getTaskActivityManager().addActivationListener(TASK_ACTIVATION_LISTENER);
-
-			editorManager = new ContextEditorManager();
-			ContextCore.getContextManager().addListener(editorManager);
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, "Context UI initialization failed", //$NON-NLS-1$
-					e));
-		}
-
-		// activate all UI bridges and load all focused view actions before setting the selections (see below)
-		UiStartupExtensionPointReader.runStartupExtensions();
-
-		try {
-			// NOTE: this needs to be done because some views (e.g. Project Explorer) are not
-			// correctly initialized on startup and do not have the dummy selection event
-			// sent to them.  See PartPluginAction and bug 213545.
-			// TODO consider a mechanism to identify only views that provide focus
-			for (IWorkbenchWindow window : PlatformUI.getWorkbench().getWorkbenchWindows()) {
-				if (window.getActivePage() != null) {
-					IViewReference[] views = window.getActivePage().getViewReferences();
-					for (IViewReference viewReference : views) {
-						IViewPart viewPart = viewReference.getView(false);
-						if (viewPart != null) {
-							UiUtil.initializeViewerSelection(viewPart);
-						}
-					}
-				}
-			}
-			viewerManager.forceRefresh();
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-					"Could not initialize focused viewers", e)); //$NON-NLS-1$
-		}
-	}
-
-	private void lazyStop() {
-		if (editorManager != null) {
-			ContextCore.getContextManager().removeListener(editorManager);
-		}
-
-		ContextCore.getContextManager().removeListener(viewerManager);
-		MonitorUi.removeWindowPartListener(contentOutlineManager);
-
-		TasksUi.getTaskActivityManager().removeActivationListener(perspectiveManager);
-		MonitorUi.removeWindowPerspectiveListener(perspectiveManager);
-		TasksUi.getTaskActivityManager().removeActivationListener(TASK_ACTIVATION_LISTENER);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		if (lazyStarted.get()) {
-			lazyStop();
-		}
-		if (TasksUi.getTaskActivityManager() != null) {
-			ContextCore.getContextManager().removeListener(contextActivationListener);
-		}
-
-		super.stop(context);
-		perspectiveManager.removeManagedPerspective(ITasksUiConstants.ID_PERSPECTIVE_PLANNING);
-		viewerManager.dispose();
-	}
-
-	private void initDefaultPrefs(IPreferenceStore store) {
-		store.setDefault(IContextUiPreferenceContstants.AUTO_FOCUS_NAVIGATORS, true);
-		store.setDefault(IContextUiPreferenceContstants.AUTO_MANAGE_PERSPECTIVES, false);
-		store.setDefault(IContextUiPreferenceContstants.AUTO_MANAGE_EDITORS, true);
-		store.setDefault(IContextUiPreferenceContstants.AUTO_MANAGE_EXPANSION, true);
-		store.setDefault(IContextUiPreferenceContstants.AUTO_MANAGE_EDITOR_CLOSE, true);
-		store.setDefault(IContextUiPreferenceContstants.AUTO_MANAGE_EDITOR_CLOSE_WARNING, true);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ContextUiPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not found.
-	 */
-	@Deprecated
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = ContextUiPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not found.
-	 */
-	@Deprecated
-	public static String getMessage(String key) {
-		ResourceBundle bundle = getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	@Deprecated
-	public ResourceBundle getResourceBundle() {
-		return null;
-	}
-
-	public List<AbstractContextUiBridge> getUiBridges() {
-		UiExtensionPointReader.initExtensions();
-		return new ArrayList<AbstractContextUiBridge>(bridges.values());
-	}
-
-	/**
-	 * @return the corresponding adapter if found, or an adapter with no behavior otherwise (so null is never returned)
-	 */
-	public AbstractContextUiBridge getUiBridge(String contentType) {
-		UiExtensionPointReader.initExtensions();
-		AbstractContextUiBridge bridge = bridges.get(contentType);
-		if (bridge != null) {
-			return bridge;
-		} else {
-			return DEFAULT_UI_BRIDGE;
-		}
-	}
-
-	/**
-	 * TODO: cache this to improve performance?
-	 */
-	public AbstractContextUiBridge getUiBridgeForEditor(IEditorPart editorPart) {
-		UiExtensionPointReader.initExtensions();
-		AbstractContextUiBridge foundBridge = null;
-		for (AbstractContextUiBridge bridge : bridges.values()) {
-			if (bridge.acceptsEditor(editorPart)) {
-				foundBridge = bridge;
-				break;
-			}
-		}
-		if (foundBridge != null) {
-			return foundBridge;
-		} else {
-			return DEFAULT_UI_BRIDGE;
-		}
-	}
-
-	private void internalAddBridge(String extension, AbstractContextUiBridge bridge) {
-		this.bridges.put(extension, bridge);
-	}
-
-	public ILabelProvider getContextLabelProvider(String extension) {
-		ILabelProvider provider = contextLabelProviders.get(extension);
-		if (provider != null) {
-			return provider;
-		} else {
-			return DEFAULT_LABEL_PROVIDER;
-		}
-	}
-
-	private void internalAddContextLabelProvider(String extension, ILabelProvider provider) {
-		this.contextLabelProviders.put(extension, provider);
-	}
-
-	public static FocusedViewerManager getViewerManager() {
-		return INSTANCE.viewerManager;
-	}
-
-	static class UiExtensionPointReader {
-
-		private static boolean extensionsRead = false;
-
-		public static final String EXTENSION_ID_CONTEXT = "org.eclipse.mylyn.context.ui.bridges"; //$NON-NLS-1$
-
-		public static final String ELEMENT_UI_BRIDGE = "uiBridge"; //$NON-NLS-1$
-
-		public static final String ELEMENT_PRESERVED_FILTERS = "preservedFilters"; //$NON-NLS-1$
-
-		public static final String ELEMENT_VIEW_ID = "viewId"; //$NON-NLS-1$
-
-		public static final String ELEMENT_ID = "id"; //$NON-NLS-1$
-
-		public static final String ELEMENT_FILTER = "filter"; //$NON-NLS-1$
-
-		public static final String ELEMENT_CLASS = "class"; //$NON-NLS-1$
-
-		public static final String ELEMENT_UI_CONTEXT_LABEL_PROVIDER = "labelProvider"; //$NON-NLS-1$
-
-		public static final String ELEMENT_UI_BRIDGE_CONTENT_TYPE = "contentType"; //$NON-NLS-1$
-
-		public static final String ELEMENT_STRUCTURE_BRIDGE_SEARCH_ICON = "activeSearchIcon"; //$NON-NLS-1$
-
-		public static final String ELEMENT_STRUCTURE_BRIDGE_SEARCH_LABEL = "activeSearchLabel"; //$NON-NLS-1$
-
-		public static void initExtensions() {
-			if (!extensionsRead) {
-				IExtensionRegistry registry = Platform.getExtensionRegistry();
-				IExtensionPoint extensionPoint = registry.getExtensionPoint(UiExtensionPointReader.EXTENSION_ID_CONTEXT);
-				IExtension[] extensions = extensionPoint.getExtensions();
-				for (IExtension extension : extensions) {
-					IConfigurationElement[] elements = extension.getConfigurationElements();
-					for (IConfigurationElement element : elements) {
-						if (element.getName().equals(UiExtensionPointReader.ELEMENT_UI_BRIDGE)) {
-							readBridge(element);
-						} else if (element.getName().equals(UiExtensionPointReader.ELEMENT_UI_CONTEXT_LABEL_PROVIDER)) {
-							readLabelProvider(element);
-						} else if (element.getName().equals(UiExtensionPointReader.ELEMENT_PRESERVED_FILTERS)) {
-							readPreservedFilters(element);
-						}
-					}
-				}
-				extensionsRead = true;
-			}
-		}
-
-		private static void readLabelProvider(IConfigurationElement element) {
-			try {
-				Object provider = element.createExecutableExtension(UiExtensionPointReader.ELEMENT_CLASS);
-				Object contentType = element.getAttribute(UiExtensionPointReader.ELEMENT_UI_BRIDGE_CONTENT_TYPE);
-				if (provider instanceof ILabelProvider && contentType != null) {
-					ContextUiPlugin.getDefault().internalAddContextLabelProvider((String) contentType,
-							(ILabelProvider) provider);
-				} else {
-					StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-							"Could not load label provider: " + provider.getClass().getCanonicalName() //$NON-NLS-1$
-									+ " must implement " + ILabelProvider.class.getCanonicalName())); //$NON-NLS-1$
-				}
-			} catch (CoreException e) {
-				StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-						"Could not load label provider extension", e)); //$NON-NLS-1$
-			}
-		}
-
-		private static void readPreservedFilters(IConfigurationElement element) {
-			String viewId = element.getAttribute(UiExtensionPointReader.ELEMENT_VIEW_ID);
-			IConfigurationElement[] children = element.getChildren();
-			for (IConfigurationElement child : children) {
-				if (child.getName().equals(UiExtensionPointReader.ELEMENT_FILTER)) {
-					try {
-						Object filterClass = child.createExecutableExtension(UiExtensionPointReader.ELEMENT_CLASS);
-						ContextUiPlugin.getDefault().addPreservedFilterClass(viewId, (ViewerFilter) filterClass);
-					} catch (Exception e) {
-						String filterId = child.getAttribute(ELEMENT_ID);
-						ContextUiPlugin.getDefault().addPreservedFilterId(viewId, filterId);
-					}
-				}
-			}
-		}
-
-		private static void readBridge(IConfigurationElement element) {
-			try {
-				Object bridge = element.createExecutableExtension(UiExtensionPointReader.ELEMENT_CLASS);
-				Object contentType = element.getAttribute(UiExtensionPointReader.ELEMENT_UI_BRIDGE_CONTENT_TYPE);
-				if (bridge instanceof AbstractContextUiBridge && contentType != null) {
-					ContextUiPlugin.getDefault().internalAddBridge((String) contentType,
-							(AbstractContextUiBridge) bridge);
-
-					String iconPath = element.getAttribute(ELEMENT_STRUCTURE_BRIDGE_SEARCH_ICON);
-					if (iconPath != null) {
-						ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(
-								element.getDeclaringExtension().getContributor().getName(), iconPath);
-						if (descriptor != null) {
-							ContextUiPlugin.getDefault().setActiveSearchIcon((AbstractContextUiBridge) bridge,
-									descriptor);
-						}
-					}
-					String label = element.getAttribute(ELEMENT_STRUCTURE_BRIDGE_SEARCH_LABEL);
-					if (label != null) {
-						ContextUiPlugin.getDefault().setActiveSearchLabel((AbstractContextUiBridge) bridge, label);
-					}
-
-				} else {
-					StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, "Could not load bridge: " //$NON-NLS-1$
-							+ bridge.getClass().getCanonicalName() + " must implement " //$NON-NLS-1$
-							+ AbstractContextUiBridge.class.getCanonicalName()));
-				}
-			} catch (CoreException e) {
-				StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-						"Could not load bridge extension", e)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	static class UiStartupExtensionPointReader {
-
-		private static final String EXTENSION_ID_STARTUP = "org.eclipse.mylyn.context.ui.startup"; //$NON-NLS-1$
-
-		private static final String ELEMENT_STARTUP = "startup"; //$NON-NLS-1$
-
-		private static final String ELEMENT_CLASS = "class"; //$NON-NLS-1$
-
-		public static void runStartupExtensions() {
-			IExtensionRegistry registry = Platform.getExtensionRegistry();
-			IExtensionPoint extensionPoint = registry.getExtensionPoint(EXTENSION_ID_STARTUP);
-			IExtension[] extensions = extensionPoint.getExtensions();
-			for (IExtension extension : extensions) {
-				IConfigurationElement[] elements = extension.getConfigurationElements();
-				for (IConfigurationElement element : elements) {
-					if (element.getName().compareTo(ELEMENT_STARTUP) == 0) {
-						runStartupExtension(element);
-					}
-				}
-			}
-		}
-
-		private static void runStartupExtension(IConfigurationElement configurationElement) {
-			try {
-				Object object = WorkbenchPlugin.createExtension(configurationElement, ELEMENT_CLASS);
-				if (!(object instanceof IContextUiStartup)) {
-					StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, "Could not : " //$NON-NLS-1$
-							+ object.getClass().getCanonicalName() + " must implement " //$NON-NLS-1$
-							+ AbstractContextStructureBridge.class.getCanonicalName()));
-					return;
-				}
-
-				IContextUiStartup startup = (IContextUiStartup) object;
-				startup.lazyStartup();
-			} catch (CoreException e) {
-				StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-						"Could not load startup extension", e)); //$NON-NLS-1$
-			}
-		}
-
-	}
-
-	private void setActiveSearchIcon(AbstractContextUiBridge bridge, ImageDescriptor descriptor) {
-		activeSearchIcons.put(bridge, descriptor);
-	}
-
-	public ImageDescriptor getActiveSearchIcon(AbstractContextUiBridge bridge) {
-		UiExtensionPointReader.initExtensions();
-		return activeSearchIcons.get(bridge);
-	}
-
-	private void setActiveSearchLabel(AbstractContextUiBridge bridge, String label) {
-		activeSearchLabels.put(bridge, label);
-	}
-
-	public String getActiveSearchLabel(AbstractContextUiBridge bridge) {
-		UiExtensionPointReader.initExtensions();
-		return activeSearchLabels.get(bridge);
-	}
-
-	public void addPreservedFilterClass(String viewId, ViewerFilter filter) {
-		Set<Class<?>> preservedList = preservedFilterClasses.get(viewId);
-		if (preservedList == null) {
-			preservedList = new HashSet<Class<?>>();
-			preservedFilterClasses.put(viewId, preservedList);
-		}
-		preservedList.add(filter.getClass());
-	}
-
-	public Set<Class<?>> getPreservedFilterClasses(String viewId) {
-		UiExtensionPointReader.initExtensions();
-		if (preservedFilterClasses.containsKey(viewId)) {
-			return preservedFilterClasses.get(viewId);
-		} else {
-			return Collections.emptySet();
-		}
-	}
-
-	public void addPreservedFilterId(String viewId, String filterId) {
-		Set<String> preservedList = preservedFilterIds.get(viewId);
-		if (preservedList == null) {
-			preservedList = new HashSet<String>();
-			preservedFilterIds.put(viewId, preservedList);
-		}
-		preservedList.add(filterId);
-	}
-
-	public Set<String> getPreservedFilterIds(String viewId) {
-		UiExtensionPointReader.initExtensions();
-		if (preservedFilterIds.containsKey(viewId)) {
-			return preservedFilterIds.get(viewId);
-		} else {
-			return Collections.emptySet();
-		}
-	}
-
-	public static ContextEditorManager getEditorManager() {
-		return INSTANCE.editorManager;
-	}
-
-	public static ContextPerspectiveManager getPerspectiveManager() {
-		return INSTANCE.perspectiveManager;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextWorkingSetManager.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextWorkingSetManager.java
deleted file mode 100644
index 65831d2..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextWorkingSetManager.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.IWorkingSetUpdater;
-
-/**
- * TODO: consider removing
- * 
- * @author Shawn Minto
- * @author Mik Kersten
- */
-public class ContextWorkingSetManager implements IWorkingSetUpdater {
-
-	private static ContextWorkingSetManager INSTANCE = new ContextWorkingSetManager();
-
-	private List<ContextWorkingSetManager> workingSetUpdaters = null;
-
-	private final AbstractContextListener CONTEXT_LISTENER = new AbstractContextListener() {
-
-		@Override
-		public void contextChanged(ContextChangeEvent event) {
-			switch (event.getEventKind()) {
-			case ACTIVATED:
-			case DEACTIVATED:
-			case CLEARED:
-			case INTEREST_CHANGED:
-			case ELEMENTS_DELETED:
-			case LANDMARKS_ADDED:
-			case LANDMARKS_REMOVED:
-				updateWorkingSet();
-				break;
-			}
-		}
-
-	};
-
-	public void addWorkingSetManager(ContextWorkingSetManager updater) {
-		if (workingSetUpdaters == null) {
-			workingSetUpdaters = new ArrayList<ContextWorkingSetManager>();
-		}
-		workingSetUpdaters.add(updater);
-		ContextCore.getContextManager().addListener(CONTEXT_LISTENER);
-	}
-
-	public void dispose() {
-		ContextCore.getContextManager().removeListener(CONTEXT_LISTENER);
-	}
-
-	public ContextWorkingSetManager getWorkingSetUpdater() {
-		if (workingSetUpdaters == null) {
-			return null;
-		} else {
-			return workingSetUpdaters.get(0);
-		}
-	}
-
-	/** Should only ever have 1 working set */
-	private final List<IWorkingSet> workingSets = new ArrayList<IWorkingSet>();
-
-	public void add(IWorkingSet workingSet) {
-		workingSets.add(workingSet);
-	}
-
-	public boolean remove(IWorkingSet workingSet) {
-		return workingSets.remove(workingSet);
-
-	}
-
-	public boolean contains(IWorkingSet workingSet) {
-		return workingSets.contains(workingSet);
-	}
-
-	private void updateWorkingSet() {
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				if (workingSets.size() <= 0) {
-					return;
-				}
-				IWorkingSet set = workingSets.get(0);
-				set.setElements(new IAdaptable[] {});
-				List<IAdaptable> elements = new ArrayList<IAdaptable>();
-				getElementsFromContext(elements);
-				set.setElements(elements.toArray(new IAdaptable[elements.size()]));
-			}
-		});
-	}
-
-	public static void getElementsFromContext(List<IAdaptable> elements) {
-		for (IInteractionElement node : ContextCorePlugin.getContextManager().getActiveDocuments()) {
-			AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(node.getContentType());
-
-			// HACK comparing extension to string
-			// No need to add bugzilla resources to the taskscape
-			// search...really slow and eclipese doesn't know about them
-			if (bridge.getContentType().equals("bugzilla")) { //$NON-NLS-1$
-				continue;
-			}
-
-			Object o = bridge.getObjectForHandle(node.getHandleIdentifier());
-			if (o instanceof IAdaptable) {
-				elements.add((IAdaptable) o);
-			}
-
-		}
-	}
-
-	public IWorkingSet getWorkingSet() {
-		return workingSets.get(0);
-	}
-
-	public static ContextWorkingSetManager getDefault() {
-		return INSTANCE;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/DoiOrderSorter.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/DoiOrderSorter.java
deleted file mode 100644
index 46164ae..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/DoiOrderSorter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.mylyn.context.core.InterestComparator;
-
-/**
- * @author Mik Kersten
- */
-public class DoiOrderSorter extends ViewerSorter {
-	protected InterestComparator<Object> comparator = new InterestComparator<Object>();
-
-	@Override
-	public int compare(Viewer viewer, Object e1, Object e2) {
-		return comparator.compare(e1, e2);
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/FocusedViewerManager.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/FocusedViewerManager.java
deleted file mode 100644
index 861e994..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/FocusedViewerManager.java
+++ /dev/null
@@ -1,368 +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.context.ui;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.provisional.commons.ui.DelayedRefreshJob;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Encapsulates the element refresh and expansion state policy for all viewers focused on context.
- * 
- * @author Mik Kersten
- * @author Shawn Minto
- */
-public class FocusedViewerManager extends AbstractContextListener implements ISelectionListener {
-
-	private final CopyOnWriteArrayList<StructuredViewer> managedViewers = new CopyOnWriteArrayList<StructuredViewer>();
-
-	private final CopyOnWriteArrayList<StructuredViewer> filteredViewers = new CopyOnWriteArrayList<StructuredViewer>();
-
-	private final Map<StructuredViewer, BrowseFilteredListener> listenerMap = new HashMap<StructuredViewer, BrowseFilteredListener>();
-
-	private final Map<IWorkbenchPart, StructuredViewer> partToViewerMap = new HashMap<IWorkbenchPart, StructuredViewer>();
-
-	private final Map<StructuredViewer, FocusedViewerDelayedRefreshJob> fullRefreshJobs = new HashMap<StructuredViewer, FocusedViewerDelayedRefreshJob>();
-
-	// TODO: consider merging in order to discard minors when majors come in, see bug 209846
-	private final Map<StructuredViewer, FocusedViewerDelayedRefreshJob> minorRefreshJobs = new HashMap<StructuredViewer, FocusedViewerDelayedRefreshJob>();
-
-	private class FocusedViewerDelayedRefreshJob extends DelayedRefreshJob {
-
-		private boolean minor = false;
-
-		public FocusedViewerDelayedRefreshJob(StructuredViewer viewer, String name, boolean minor) {
-			super(viewer, name);
-			this.minor = minor;
-		}
-
-		@Override
-		protected void doRefresh(Object[] items) {
-			if (viewer == null) {
-				return;
-			} else if (viewer.getControl().isDisposed()) {
-				managedViewers.remove(viewer);
-			} else {
-				if (items == null || items.length == 0) {
-					if (!minor) {
-						viewer.refresh(false);
-						FocusedViewerManager.this.updateExpansionState(viewer, null);
-					} else {
-						try {
-							viewer.getControl().setRedraw(false);
-							viewer.refresh(true);
-							FocusedViewerManager.this.updateExpansionState(viewer, null);
-						} finally {
-							viewer.getControl().setRedraw(true);
-						}
-					}
-				} else {
-					if (filteredViewers.contains(viewer)) {
-						try {
-							viewer.getControl().setRedraw(false);
-							viewer.refresh(minor);
-							// prior to Mylyn 3.1 used: FocusedViewerManager.this.updateExpansionState(viewer, null);
-							for (Object item : items) {
-								Object objectToRefresh = getObjectToRefresh(item);
-								if (objectToRefresh != null) {
-									FocusedViewerManager.this.updateExpansionState(viewer, objectToRefresh);
-								}
-							}
-
-						} finally {
-							viewer.getControl().setRedraw(true);
-						}
-					} else { // don't need to worry about content changes
-						try {
-							viewer.getControl().setRedraw(false);
-
-							for (Object item : items) {
-								Object objectToRefresh = getObjectToRefresh(item);
-								if (objectToRefresh != null) {
-									viewer.update(objectToRefresh, null);
-									FocusedViewerManager.this.updateExpansionState(viewer, objectToRefresh);
-								}
-							}
-						} finally {
-							viewer.getControl().setRedraw(true);
-						}
-					}
-				}
-			}
-
-		}
-
-		private Object getObjectToRefresh(Object item) {
-			Object objectToRefresh = item;
-			if (item instanceof IInteractionElement) {
-				IInteractionElement node = (IInteractionElement) item;
-				AbstractContextStructureBridge structureBridge = ContextCorePlugin.getDefault().getStructureBridge(
-						node.getContentType());
-				objectToRefresh = structureBridge.getObjectForHandle(node.getHandleIdentifier());
-			}
-			return objectToRefresh;
-		}
-	}
-
-	/**
-	 * For testing.
-	 */
-	private boolean syncRefreshMode = false;
-
-//	private boolean internalExpandExceptionLogged;
-
-	public FocusedViewerManager() {
-		// NOTE: no longer using viewer part tracker due to bug 162346
-//		VIEWER_PART_TRACKER.install(PlatformUI.getWorkbench());
-	}
-
-	public void dispose() {
-//		VIEWER_PART_TRACKER.dispose(PlatformUI.getWorkbench());
-	}
-
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		// ignore
-	}
-
-	public void addManagedViewer(StructuredViewer viewer, IWorkbenchPart viewPart) {
-		if (viewer != null && !managedViewers.contains(viewer)) {
-			managedViewers.add(viewer);
-			partToViewerMap.put(viewPart, viewer);
-			BrowseFilteredListener listener = new BrowseFilteredListener(viewer);
-			listenerMap.put(viewer, listener);
-			viewer.getControl().addMouseListener(listener);
-			viewer.getControl().addKeyListener(listener);
-
-			try {
-				// NOTE: this needs to be done because some views (e.g. Project Explorer) are not
-				// correctly initialized on startup and do not have the dummy selection event
-				// sent to them.  See PartPluginAction and bug 213545.
-				// TODO consider a mechanism to identify only views that provide focus
-				UiUtil.initializeViewerSelection(viewPart);
-				Set<IInteractionElement> emptySet = Collections.emptySet();
-				refreshViewer(emptySet, true, viewer);
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-						"Could not initialize focused viewer", e)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public void removeManagedViewer(StructuredViewer viewer, IWorkbenchPart viewPart) {
-		managedViewers.remove(viewer);
-		partToViewerMap.remove(viewPart);
-		BrowseFilteredListener listener = listenerMap.get(viewer);
-		if (listener != null && viewer != null && !viewer.getControl().isDisposed()) {
-			viewer.getControl().removeMouseListener(listener);
-			viewer.getControl().removeKeyListener(listener);
-		}
-	}
-
-	public void addFilteredViewer(StructuredViewer viewer) {
-		if (viewer != null && !filteredViewers.contains(viewer)) {
-			filteredViewers.add(viewer);
-		}
-	}
-
-	public void removeFilteredViewer(StructuredViewer viewer) {
-		filteredViewers.remove(viewer);
-	}
-
-	@Override
-	public void contextChanged(ContextChangeEvent event) {
-		switch (event.getEventKind()) {
-		case ACTIVATED:
-			refreshViewers();
-			break;
-		case DEACTIVATED:
-			refreshViewers();
-			for (StructuredViewer structuredViewer : managedViewers) {
-				if (structuredViewer instanceof TreeViewer) {
-					((TreeViewer) structuredViewer).collapseAll();
-				}
-			}
-			break;
-		case CLEARED:
-			if (event.isActiveContext()) {
-				// ensure we dont refresh the viewers if a context other than the active one is deleted or cleared
-				// bug #265688
-				refreshViewers();
-				for (StructuredViewer structuredViewer : managedViewers) {
-					if (structuredViewer instanceof TreeViewer) {
-						((TreeViewer) structuredViewer).collapseAll();
-					}
-				}
-			}
-			break;
-		case INTEREST_CHANGED:
-			refreshViewers(event.getElements(), false);
-			break;
-		case LANDMARKS_ADDED:
-			refreshViewers(event.getElements(), true);
-			break;
-		case LANDMARKS_REMOVED:
-			refreshViewers(event.getElements(), true);
-			break;
-		case ELEMENTS_DELETED:
-			/*
-			 * TODO: consider making this work per-element and parent
-			 * Should we collect all parents before calling refresh?
-			 */
-			ArrayList<IInteractionElement> toRefresh = new ArrayList<IInteractionElement>();
-			for (IInteractionElement interactionElement : event.getElements()) {
-				AbstractContextStructureBridge structureBridge = ContextCore.getStructureBridge(interactionElement.getContentType());
-				IInteractionElement parent = ContextCore.getContextManager().getElement(
-						structureBridge.getParentHandle(interactionElement.getHandleIdentifier()));
-				if (parent != null) {
-					toRefresh.add(parent);
-				}
-			}
-			refreshViewers(toRefresh, false);
-
-			break;
-		}
-	}
-
-	protected void refreshViewers() {
-		List<IInteractionElement> toRefresh = Collections.emptyList();
-		refreshViewers(toRefresh, true);
-	}
-
-	protected void refreshViewers(IInteractionElement node, boolean updateLabels) {
-		List<IInteractionElement> toRefresh = new ArrayList<IInteractionElement>();
-		toRefresh.add(node);
-		refreshViewers(toRefresh, updateLabels);
-	}
-
-	protected void refreshViewers(final List<IInteractionElement> nodesToRefresh, final boolean updateLabels) {
-		// TODO replace by Assert.isNotNull(nodesToRefresh);
-		if (nodesToRefresh == null) {
-			return;
-		}
-
-		if (syncRefreshMode) {
-			internalRefresh(new HashSet<IInteractionElement>(nodesToRefresh), updateLabels);
-		} else {
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					internalRefresh(new HashSet<IInteractionElement>(nodesToRefresh), updateLabels);
-				}
-			});
-		}
-	}
-
-	private void internalRefresh(final Set<IInteractionElement> nodesToRefresh, final boolean updateLabels) {
-		try {
-			for (StructuredViewer viewer : managedViewers) {
-				refreshViewer(nodesToRefresh, updateLabels, viewer);
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, "Could not refresh viewer", t)); //$NON-NLS-1$
-		}
-	}
-
-	public void refreshViewer(final Set<IInteractionElement> nodesToRefresh, final boolean updateLabels,
-			StructuredViewer viewer) {
-
-		Map<StructuredViewer, FocusedViewerDelayedRefreshJob> refreshJobs = null;
-		if (updateLabels) {
-			refreshJobs = minorRefreshJobs;
-		} else {
-			refreshJobs = fullRefreshJobs;
-		}
-		FocusedViewerDelayedRefreshJob job = refreshJobs.get(viewer);
-		if (job == null) {
-			job = new FocusedViewerDelayedRefreshJob(viewer, "refresh viewer", updateLabels); //$NON-NLS-1$
-			refreshJobs.put(viewer, job);
-		}
-		job.refreshElements(nodesToRefresh.toArray());
-
-	}
-
-	private void updateExpansionState(StructuredViewer viewer, Object objectToRefresh) {
-		if (viewer instanceof TreeViewer
-				&& filteredViewers.contains(viewer)
-				&& ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
-						IContextUiPreferenceContstants.AUTO_MANAGE_EXPANSION)) {
-			TreeViewer treeViewer = (TreeViewer) viewer;
-
-			// HACK to fix bug 278569: [context] errors with Markers view and active Mylyn task
-			if ("org.eclipse.ui.internal.views.markers.MarkersTreeViewer".equals(treeViewer.getClass() //$NON-NLS-1$
-					.getCanonicalName())) {
-				objectToRefresh = null;
-			}
-
-			if (objectToRefresh == null) {
-				treeViewer.expandAll();
-			} else {
-
-//				treeViewer.reveal(objectToRefresh);
-//				boolean failed = false;
-//				try {
-//					// reveal will fail if the content provider does not properly implement getParent();
-//					// check if node is now visible in view and fallback to expandAll() in 
-//					// case of an error
-//					Method method = AbstractTreeViewer.class.getDeclaredMethod(
-//							"internalGetWidgetToSelect", Object.class); //$NON-NLS-1$
-//					method.setAccessible(true);
-//					if (method.invoke(treeViewer, objectToRefresh) == null) {
-//						failed = true;
-//					}
-//				} catch (Exception e) {
-//					if (!internalExpandExceptionLogged) {
-//						internalExpandExceptionLogged = true;
-//						StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-//								"Failed to verify expansion state, falling back to expanding all nodes", e)); //$NON-NLS-1$
-//					}
-//					failed = true;
-//				}
-//				if (failed) {
-				treeViewer.expandAll();
-//				}
-			}
-		}
-	}
-
-	/**
-	 * Set to true for testing
-	 */
-	public void setSyncRefreshMode(boolean syncRefreshMode) {
-		this.syncRefreshMode = syncRefreshMode;
-	}
-
-	public void forceRefresh() {
-		refreshViewers();
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/HighlighterImageDescriptor.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/HighlighterImageDescriptor.java
deleted file mode 100644
index 88619a4..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/HighlighterImageDescriptor.java
+++ /dev/null
@@ -1,245 +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.context.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.PaletteData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Mik Kersten
- */
-public class HighlighterImageDescriptor extends ImageDescriptor {
-
-	private final Image image;
-
-	public HighlighterImageDescriptor(Color fromColor, Color toColor) {
-		super();
-		if (fromColor == null) {
-			fromColor = Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-		}
-		if (toColor == null) {
-			toColor = Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-		}
-		ImageData band = createGradientBand(50, 20, false, new RGB(fromColor.getRed(), fromColor.getGreen(),
-				fromColor.getBlue()), new RGB(toColor.getRed(), toColor.getGreen(), toColor.getBlue()), 7, 7, 7);
-		image = new Image(Display.getCurrent(), band);
-	}
-
-	@Override
-	public void destroyResource(Object previouslyCreatedObject) {
-		image.dispose();
-		super.destroyResource(previouslyCreatedObject);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		return obj instanceof HighlighterImageDescriptor && image.equals(((HighlighterImageDescriptor) obj).image);
-	}
-
-	@Override
-	public ImageData getImageData() {
-		return image.getImageData();
-	}
-
-	@Override
-	public int hashCode() {
-		return image.hashCode();
-	}
-
-	public Image getImage() {
-		return image;
-	}
-
-	// ----------- COPIED FROM ImageData ---------------
-
-	/**
-	 * Creates an ImageData containing one band's worth of a gradient filled block. If <code>vertical</code> is true,
-	 * the band must be tiled horizontally to fill a region, otherwise it must be tiled vertically.
-	 * 
-	 * @param width
-	 *            the width of the region to be filled
-	 * @param height
-	 *            the height of the region to be filled
-	 * @param vertical
-	 *            if true sweeps from top to bottom, else sweeps from left to right
-	 * @param fromRGB
-	 *            the color to start with
-	 * @param toRGB
-	 *            the color to end with
-	 * @param redBits
-	 *            the number of significant red bits, 0 for palette modes
-	 * @param greenBits
-	 *            the number of significant green bits, 0 for palette modes
-	 * @param blueBits
-	 *            the number of significant blue bits, 0 for palette modes
-	 * @return the new ImageData
-	 */
-	static ImageData createGradientBand(int width, int height, boolean vertical, RGB fromRGB, RGB toRGB, int redBits,
-			int greenBits, int blueBits) {
-		/* Gradients are drawn as tiled bands */
-		final int bandWidth, bandHeight, bitmapDepth;
-		final byte[] bitmapData;
-		final PaletteData paletteData;
-		/* Select an algorithm depending on the depth of the screen */
-		if (redBits != 0 && greenBits != 0 && blueBits != 0) {
-			paletteData = new PaletteData(0x0000ff00, 0x00ff0000, 0xff000000);
-			bitmapDepth = 32;
-			if (redBits >= 8 && greenBits >= 8 && blueBits >= 8) {
-				/* Precise color */
-				final int steps;
-				if (vertical) {
-					bandWidth = 1;
-					bandHeight = height;
-					steps = bandHeight > 1 ? bandHeight - 1 : 1;
-				} else {
-					bandWidth = width;
-					bandHeight = 1;
-					steps = bandWidth > 1 ? bandWidth - 1 : 1;
-				}
-				final int bytesPerLine = bandWidth * 4;
-				bitmapData = new byte[bandHeight * bytesPerLine];
-				buildPreciseGradientChannel(fromRGB.blue, toRGB.blue, steps, bandWidth, bandHeight, vertical,
-						bitmapData, 0, bytesPerLine);
-				buildPreciseGradientChannel(fromRGB.green, toRGB.green, steps, bandWidth, bandHeight, vertical,
-						bitmapData, 1, bytesPerLine);
-				buildPreciseGradientChannel(fromRGB.red, toRGB.red, steps, bandWidth, bandHeight, vertical, bitmapData,
-						2, bytesPerLine);
-			} else {
-				/* Dithered color */
-				final int steps;
-				if (vertical) {
-					bandWidth = (width < 8) ? width : 8;
-					bandHeight = height;
-					steps = bandHeight > 1 ? bandHeight - 1 : 1;
-				} else {
-					bandWidth = width;
-					bandHeight = (height < 8) ? height : 8;
-					steps = bandWidth > 1 ? bandWidth - 1 : 1;
-				}
-				final int bytesPerLine = bandWidth * 4;
-				bitmapData = new byte[bandHeight * bytesPerLine];
-				buildDitheredGradientChannel(fromRGB.blue, toRGB.blue, steps, bandWidth, bandHeight, vertical,
-						bitmapData, 0, bytesPerLine, blueBits);
-				buildDitheredGradientChannel(fromRGB.green, toRGB.green, steps, bandWidth, bandHeight, vertical,
-						bitmapData, 1, bytesPerLine, greenBits);
-				buildDitheredGradientChannel(fromRGB.red, toRGB.red, steps, bandWidth, bandHeight, vertical,
-						bitmapData, 2, bytesPerLine, redBits);
-			}
-		} else {
-			/* Dithered two tone */
-			paletteData = new PaletteData(new RGB[] { fromRGB, toRGB });
-			bitmapDepth = 8;
-			final int blendi;
-			if (vertical) {
-				bandWidth = (width < 8) ? width : 8;
-				bandHeight = height;
-				blendi = (bandHeight > 1) ? 0x1040000 / (bandHeight - 1) + 1 : 1;
-			} else {
-				bandWidth = width;
-				bandHeight = (height < 8) ? height : 8;
-				blendi = (bandWidth > 1) ? 0x1040000 / (bandWidth - 1) + 1 : 1;
-			}
-			final int bytesPerLine = (bandWidth + 3) & -4;
-			bitmapData = new byte[bandHeight * bytesPerLine];
-			if (vertical) {
-				for (int dy = 0, blend = 0, dp = 0; dy < bandHeight; ++dy, blend += blendi, dp += bytesPerLine) {
-					for (int dx = 0; dx < bandWidth; ++dx) {
-						bitmapData[dp + dx] = (blend + DITHER_MATRIX[dy & 7][dx]) < 0x1000000 ? (byte) 0 : (byte) 1;
-					}
-				}
-			} else {
-				for (int dx = 0, blend = 0; dx < bandWidth; ++dx, blend += blendi) {
-					for (int dy = 0, dptr = dx; dy < bandHeight; ++dy, dptr += bytesPerLine) {
-						bitmapData[dptr] = (blend + DITHER_MATRIX[dy][dx & 7]) < 0x1000000 ? (byte) 0 : (byte) 1;
-					}
-				}
-			}
-		}
-		return new ImageData(bandWidth, bandHeight, bitmapDepth, paletteData, 4, bitmapData);
-	}
-
-	/*
-	 * Fill in dithered gradated values for a color channel
-	 */
-	static final void buildDitheredGradientChannel(int from, int to, int steps, int bandWidth, int bandHeight,
-			boolean vertical, byte[] bitmapData, int dp, int bytesPerLine, int bits) {
-		final int mask = 0xff00 >>> bits;
-		int val = from << 16;
-		final int inc = ((to << 16) - val) / steps + 1;
-		if (vertical) {
-			for (int dy = 0; dy < bandHeight; ++dy, dp += bytesPerLine) {
-				for (int dx = 0, dptr = dp; dx < bandWidth; ++dx, dptr += 4) {
-					final int thresh = DITHER_MATRIX[dy & 7][dx] >>> bits;
-					int temp = val + thresh;
-					if (temp > 0xffffff) {
-						bitmapData[dptr] = -1;
-					} else {
-						bitmapData[dptr] = (byte) ((temp >>> 16) & mask);
-					}
-				}
-				val += inc;
-			}
-		} else {
-			for (int dx = 0; dx < bandWidth; ++dx, dp += 4) {
-				for (int dy = 0, dptr = dp; dy < bandHeight; ++dy, dptr += bytesPerLine) {
-					final int thresh = DITHER_MATRIX[dy][dx & 7] >>> bits;
-					int temp = val + thresh;
-					if (temp > 0xffffff) {
-						bitmapData[dptr] = -1;
-					} else {
-						bitmapData[dptr] = (byte) ((temp >>> 16) & mask);
-					}
-				}
-				val += inc;
-			}
-		}
-	}
-
-	/*
-	 * Fill in gradated values for a color channel
-	 */
-	static final void buildPreciseGradientChannel(int from, int to, int steps, int bandWidth, int bandHeight,
-			boolean vertical, byte[] bitmapData, int dp, int bytesPerLine) {
-		int val = from << 16;
-		final int inc = ((to << 16) - val) / steps + 1;
-		if (vertical) {
-			for (int dy = 0; dy < bandHeight; ++dy, dp += bytesPerLine) {
-				bitmapData[dp] = (byte) (val >>> 16);
-				val += inc;
-			}
-		} else {
-			for (int dx = 0; dx < bandWidth; ++dx, dp += 4) {
-				bitmapData[dp] = (byte) (val >>> 16);
-				val += inc;
-			}
-		}
-	}
-
-	/**
-	 * Scaled 8x8 Bayer dither matrix.
-	 */
-	static final int[][] DITHER_MATRIX = {
-			{ 0xfc0000, 0x7c0000, 0xdc0000, 0x5c0000, 0xf40000, 0x740000, 0xd40000, 0x540000 },
-			{ 0x3c0000, 0xbc0000, 0x1c0000, 0x9c0000, 0x340000, 0xb40000, 0x140000, 0x940000 },
-			{ 0xcc0000, 0x4c0000, 0xec0000, 0x6c0000, 0xc40000, 0x440000, 0xe40000, 0x640000 },
-			{ 0x0c0000, 0x8c0000, 0x2c0000, 0xac0000, 0x040000, 0x840000, 0x240000, 0xa40000 },
-			{ 0xf00000, 0x700000, 0xd00000, 0x500000, 0xf80000, 0x780000, 0xd80000, 0x580000 },
-			{ 0x300000, 0xb00000, 0x100000, 0x900000, 0x380000, 0xb80000, 0x180000, 0x980000 },
-			{ 0xc00000, 0x400000, 0xe00000, 0x600000, 0xc80000, 0x480000, 0xe80000, 0x680000 },
-			{ 0x000000, 0x800000, 0x200000, 0xa00000, 0x080000, 0x880000, 0x280000, 0xa80000 } };
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/IContextUiPreferenceContstants.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/IContextUiPreferenceContstants.java
deleted file mode 100644
index a2b7a7f..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/IContextUiPreferenceContstants.java
+++ /dev/null
@@ -1,35 +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.context.ui;
-
-/**
- * @author Mik Kersten
- */
-public interface IContextUiPreferenceContstants {
-
-	public static final String AUTO_MANAGE_EDITOR_CLOSE = "org.eclipse.mylyn.context.ui.close.action.manage"; //$NON-NLS-1$
-
-	public static final String AUTO_MANAGE_EDITOR_CLOSE_WARNING = "org.eclipse.mylyn.context.ui.close.action.manage.warning"; //$NON-NLS-1$
-
-	public static final String AUTO_MANAGE_EDITORS = "org.eclipse.mylyn.context.ui.editors.auto.manage"; //$NON-NLS-1$
-
-	public static final String AUTO_MANAGE_PERSPECTIVES = "org.eclipse.mylyn.ide.ui.perspectives.auto.manage"; //$NON-NLS-1$
-
-	public static final String AUTO_MANAGE_EXPANSION = "org.eclipse.mylyn.ide.ui.expansion.auto.manage"; //$NON-NLS-1$
-
-	public static final String AUTO_FOCUS_NAVIGATORS = "org.eclipse.mylyn.context.ui.navigators.filter.auto.enable"; //$NON-NLS-1$
-
-	public static final String PERSPECTIVE_NO_ACTIVE_TASK = "org.eclipse.mylyn.ui.perspectives.task.none"; //$NON-NLS-1$
-
-	public static final String PREFIX_TASK_TO_PERSPECTIVE = "org.eclipse.mylyn.ui.perspectives.task."; //$NON-NLS-1$
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/InterestDecorator.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/InterestDecorator.java
deleted file mode 100644
index 5aa1e56..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/InterestDecorator.java
+++ /dev/null
@@ -1,94 +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.context.ui;
-
-import org.eclipse.jface.viewers.IColorDecorator;
-import org.eclipse.jface.viewers.IFontDecorator;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.mylyn.internal.context.core.InteractionContextRelation;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFonts;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Not currently used.
- * 
- * @author Mik Kersten
- */
-@Deprecated
-public class InterestDecorator implements ILabelDecorator, IFontDecorator, IColorDecorator {
-
-	private IInteractionElement getNode(Object element) {
-		IInteractionElement node = null;
-		if (element instanceof IInteractionElement) {
-			node = (IInteractionElement) element;
-		} else {
-			AbstractContextStructureBridge adapter = ContextCore.getStructureBridge(element);
-			node = ContextCore.getContextManager().getElement(adapter.getHandleIdentifier(element));
-		}
-		return node;
-	}
-
-	public void addListener(ILabelProviderListener listener) {
-		// don't care about listeners
-	}
-
-	public void dispose() {
-		// don't care when we are disposed
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-		// don't care about listeners
-	}
-
-	public Image decorateImage(Image image, Object element) {
-		return null;
-	}
-
-	public String decorateText(String text, Object element) {
-		return null;
-	}
-
-	public Font decorateFont(Object element) {
-		IInteractionElement node = getNode(element);
-		if (node != null) {
-			if (node.getInterest().isLandmark() && !node.getInterest().isPropagated()) {
-				return CommonFonts.BOLD;
-			}
-		}
-		return null;
-	}
-
-	public Color decorateForeground(Object element) {
-		IInteractionElement node = getNode(element);
-		if (element instanceof InteractionContextRelation) {
-			return ColorMap.RELATIONSHIP;
-		} else if (node != null) {
-			return ContextUi.getForeground(node);
-		}
-		return null;
-	}
-
-	public Color decorateBackground(Object element) {
-		return null;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/InterestDecoratorLightweight.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/InterestDecoratorLightweight.java
deleted file mode 100644
index 461350d..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/InterestDecoratorLightweight.java
+++ /dev/null
@@ -1,97 +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.context.ui;
-
-import java.util.ConcurrentModificationException;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-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.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.InteractionContextRelation;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFonts;
-import org.eclipse.mylyn.tasks.core.ITask;
-
-/**
- * @author Mik Kersten
- */
-public class InterestDecoratorLightweight implements ILightweightLabelDecorator {
-
-	public InterestDecoratorLightweight() {
-		super();
-	}
-
-	public void decorate(Object element, IDecoration decoration) {
-		if (ContextCore.getContextManager() != null && !ContextCore.getContextManager().isContextActive()) {
-			return;
-		}
-
-		AbstractContextStructureBridge bridge = null;
-		try {
-			if (ContextCorePlugin.getDefault() == null) {
-				return;
-			}
-			bridge = ContextCore.getStructureBridge(element);
-		} catch (ConcurrentModificationException cme) {
-			// ignored, because we can add structure bridges during decoration
-		}
-		try {
-			// NOTE: awkward coupling and special rule to deal with tasks, see bug 212639
-			if (!(element instanceof ITask)) {
-				IInteractionElement node = null;
-				if (element instanceof InteractionContextRelation) {
-					decoration.setForegroundColor(ColorMap.RELATIONSHIP);
-				} else if (element instanceof IInteractionElement) {
-					node = (IInteractionElement) element;
-				} else {
-					if (bridge != null && bridge.getContentType() != null) {
-						node = ContextCore.getContextManager().getElement(bridge.getHandleIdentifier(element));
-					}
-				}
-				if (node != null) {
-					decoration.setForegroundColor(ContextUi.getForeground(node));
-					if (bridge != null && bridge.canBeLandmark(node.getHandleIdentifier())
-							&& node.getInterest().isLandmark() && !node.getInterest().isPropagated()
-							&& !node.getInterest().isPredicted()) {
-						decoration.setFont(CommonFonts.BOLD);
-					}
-				}
-			}
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, "Decoration failed", e)); //$NON-NLS-1$
-		}
-	}
-
-	public void addListener(ILabelProviderListener listener) {
-		// don't care about listeners
-	}
-
-	public void dispose() {
-		// don't care when we are disposed
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-		// don't care about listeners
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/Messages.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/Messages.java
deleted file mode 100644
index 5dcb50b..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/Messages.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.internal.context.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.context.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 ContextUiPlugin_No_local_task_context_exists;
-
-	public static String ContextUiPlugin_Task_Activation;
-
-	public static String TaskContextWorkingSetPage_Cannot_create_another_Active_Taskscape_Working_Set;
-
-	public static String TaskContextWorkingSetPage_CREATE_THE_MYLYN_CONTEXT_WORKING_SET;
-
-	public static String TaskContextWorkingSetPage_Mylyn_Task_Context_Working_Set;
-
-	public static String TaskContextWorkingSetPage_Name;
-
-	public static String TaskContextWorkingSetPage_NOTE_THIS_WORKING_SET_SHOULD_ONLY_BE_USED_FOR_SEARCHS;
-
-	public static String TaskContextWorkingSetPage_TASK_CONTEXT_FOR_SEARCH;
-
-	public static String UiUtil_Mylyn_Interest_Manipulation;
-
-	public static String UiUtil_Not_a_valid_landmark;
-
-	public static String AbstractFocusViewAction_Apply_Mylyn;
-
-	public static String AbstractFocusViewAction_Empty_task_context;
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskContextWorkingSetPage.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskContextWorkingSetPage.java
deleted file mode 100644
index 1f56ef1..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskContextWorkingSetPage.java
+++ /dev/null
@@ -1,130 +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.context.ui;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFonts;
-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.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.IWorkingSetManager;
-import org.eclipse.ui.dialogs.IWorkingSetPage;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Shawn Minto
- */
-public class TaskContextWorkingSetPage extends WizardPage implements IWorkingSetPage {
-
-	private Text workingSetNameText;
-
-	private IWorkingSet workingSet;
-
-	public static final String WORKING_SET_NAME = Messages.TaskContextWorkingSetPage_TASK_CONTEXT_FOR_SEARCH;
-
-	public TaskContextWorkingSetPage() {
-		super(
-				"org.eclipse.mylyn.monitor.ui.workingSetPage", Messages.TaskContextWorkingSetPage_Mylyn_Task_Context_Working_Set, //$NON-NLS-1$
-				AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.mylyn.context.ui", //$NON-NLS-1$
-						"icons/wizban/banner-prefs.gif")); //$NON-NLS-1$
-		setDescription(Messages.TaskContextWorkingSetPage_CREATE_THE_MYLYN_CONTEXT_WORKING_SET);
-	}
-
-	public void createControl(Composite parent) {
-		initializeDialogUnits(parent);
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		setControl(composite);
-
-		Label label = new Label(composite, SWT.WRAP);
-		label.setText(Messages.TaskContextWorkingSetPage_Name);
-		GridData gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL
-				| GridData.VERTICAL_ALIGN_CENTER);
-		label.setLayoutData(gd);
-
-		workingSetNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		workingSetNameText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-		workingSetNameText.setFocus();
-		workingSetNameText.setEditable(false);
-		workingSetNameText.setText(WORKING_SET_NAME);
-
-		label = new Label(composite, SWT.WRAP);
-		label.setText(""); //$NON-NLS-1$
-		gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
-		label.setLayoutData(gd);
-
-		label = new Label(composite, SWT.WRAP);
-		label.setText(Messages.TaskContextWorkingSetPage_NOTE_THIS_WORKING_SET_SHOULD_ONLY_BE_USED_FOR_SEARCHS);
-		label.setFont(CommonFonts.BOLD);
-		gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
-		label.setLayoutData(gd);
-
-		label = new Label(composite, SWT.WRAP);
-		label.setText(""); //$NON-NLS-1$
-		gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
-		label.setLayoutData(gd);
-
-		// label = new Label(composite, SWT.WRAP);
-		// label.setText("PLEASE DO NOT ACTIVATE THIS WORKING SET AT
-		// ANYTIME.\nTHIS WORKING SET IS ONLY USEFUL FOR SEARCHING.");
-		// label.setFont(UiUtil.BOLD);
-		// gd= new GridData(GridData.GRAB_HORIZONTAL |
-		// GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
-		// label.setLayoutData(gd);
-
-		Dialog.applyDialogFont(composite);
-	}
-
-	public IWorkingSet getSelection() {
-		return workingSet;
-	}
-
-	public void setSelection(IWorkingSet workingSet) {
-		// don't need to do anything here
-	}
-
-	public void finish() {
-		String workingSetName = workingSetNameText.getText();
-		ArrayList<IAdaptable> elements = new ArrayList<IAdaptable>(1);
-		ContextWorkingSetManager.getElementsFromContext(elements);
-		if (workingSet == null) {
-			IWorkingSetManager workingSetManager = ContextUiPlugin.getDefault().getWorkbench().getWorkingSetManager();
-			if ((workingSet = workingSetManager.getWorkingSet(workingSetName)) == null) {
-				workingSet = workingSetManager.createWorkingSet(workingSetName,
-						elements.toArray(new IAdaptable[elements.size()]));
-			}
-		}
-	}
-
-	@Override
-	public boolean isPageComplete() {
-		String workingSetName = workingSetNameText.getText();
-		IWorkingSetManager workingSetManager = ContextUiPlugin.getDefault().getWorkbench().getWorkingSetManager();
-		if (workingSetManager.getWorkingSet(workingSetName) != null) {
-			setErrorMessage(Messages.TaskContextWorkingSetPage_Cannot_create_another_Active_Taskscape_Working_Set);
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskStructureBridge.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskStructureBridge.java
deleted file mode 100644
index 71f040e..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskStructureBridge.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.internal.context.ui;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.tasks.core.IRepositoryElement;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-
-/**
- * @author Mik Kersten
- */
-public class TaskStructureBridge extends AbstractContextStructureBridge {
-
-	public static final String CONTENT_TYPE = "meta/task"; //$NON-NLS-1$
-
-	@Override
-	public String getContentType() {
-		return CONTENT_TYPE;
-	}
-
-	@Override
-	public String getHandleIdentifier(Object object) {
-		if (object instanceof ITask) {
-			return ((ITask) object).getHandleIdentifier();
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public String getParentHandle(String handle) {
-		return null;
-	}
-
-	@Override
-	public Object getObjectForHandle(String handle) {
-		return TasksUi.getRepositoryModel().getTask(handle);
-	}
-
-	@Override
-	public List<String> getChildHandles(String handle) {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public String getLabel(Object object) {
-		if (object instanceof ITask) {
-			return ((ITask) object).getSummary();
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public boolean canBeLandmark(String handle) {
-		return false;
-	}
-
-	@Override
-	public boolean acceptsObject(Object object) {
-		return object instanceof IRepositoryElement;
-	}
-
-	@Override
-	public boolean canFilter(Object object) {
-		return object instanceof ITask;
-	}
-
-	@Override
-	public boolean isDocument(String handle) {
-		return getObjectForHandle(handle) instanceof ITask;
-	}
-
-	@Override
-	public String getHandleForOffsetInObject(Object resource, int offset) {
-		return null;
-	}
-
-	@Override
-	public String getContentType(String elementHandle) {
-		return getContentType();
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskUiBridge.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskUiBridge.java
deleted file mode 100644
index da91c4b..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/TaskUiBridge.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @author Mik Kersten
- */
-public class TaskUiBridge extends AbstractContextUiBridge {
-
-	@Override
-	public void open(IInteractionElement node) {
-		// ignore
-	}
-
-	@Override
-	public void close(IInteractionElement node) {
-		// ignore
-	}
-
-	@Override
-	public boolean acceptsEditor(IEditorPart editorPart) {
-		return editorPart instanceof TaskEditor;
-	}
-
-	@Override
-	public List<TreeViewer> getContentOutlineViewers(IEditorPart editorPart) {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public Object getObjectForTextSelection(TextSelection selection, IEditorPart editor) {
-		return null;
-	}
-
-	@Override
-	public IInteractionElement getElement(IEditorInput input) {
-		return null;
-	}
-
-	@Override
-	public String getContentType() {
-		return TaskStructureBridge.CONTENT_TYPE;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/UiUtil.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/UiUtil.java
deleted file mode 100644
index 473a78e..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/UiUtil.java
+++ /dev/null
@@ -1,47 +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.context.ui;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Mik Kersten
- */
-// TODO 3.3 move methods to other class
-public class UiUtil {
-
-	public static void initializeViewerSelection(IWorkbenchPart part) {
-		ISelectionProvider selectionProvider = part.getSite().getSelectionProvider();
-		if (selectionProvider != null) {
-			ISelection selection = selectionProvider.getSelection();
-			try {
-				if (selection != null) {
-					selectionProvider.setSelection(selection);
-				} else {
-					selectionProvider.setSelection(StructuredSelection.EMPTY);
-				}
-			} catch (UnsupportedOperationException e) {
-				// ignore if the selection does not support setting a selection, see bug 217634
-			}
-		}
-	}
-
-	public static void displayInterestManipulationFailure() {
-		MessageDialog.openInformation(Display.getCurrent().getActiveShell(),
-				Messages.UiUtil_Mylyn_Interest_Manipulation, Messages.UiUtil_Not_a_valid_landmark);
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/AbstractInterestManipulationAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/AbstractInterestManipulationAction.java
deleted file mode 100644
index 1731189..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/AbstractInterestManipulationAction.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.ui.UiUtil;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public abstract class AbstractInterestManipulationAction implements IViewActionDelegate, IWorkbenchWindowActionDelegate {
-
-	public static final String SOURCE_ID = "org.eclipse.mylyn.ui.interest.user"; //$NON-NLS-1$
-
-	protected IViewPart view;
-
-	protected IWorkbenchWindow window;
-
-	protected boolean preserveUninteresting = false;
-
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-
-	public void init(IViewPart view) {
-		this.view = view;
-	}
-
-	@Deprecated
-	protected boolean isRemove() {
-		return !isIncrement();
-	}
-
-	protected abstract boolean isIncrement();
-
-	/**
-	 * Override to return a different context.
-	 */
-	protected IInteractionContext getContext() {
-		return ContextCore.getContextManager().getActiveContext();
-	}
-
-	public void run(IAction action) {
-		if (!ContextCore.getContextManager().isContextActive()) {
-			MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.AbstractInterestManipulationAction_Interest_Manipulation, Messages.AbstractInterestManipulationAction_No_task_context_is_active);
-			return;
-		}
-
-		boolean increment = !isRemove();
-
-		if (selection instanceof StructuredSelection) {
-			StructuredSelection structuredSelection = (StructuredSelection) selection;
-			for (Object object : structuredSelection.toList()) {
-				IInteractionElement node = convertSelectionToInteractionElement(object);
-				if (node != null) {
-					if (!increment) {
-						try {
-							// NOTE: need to set the selection null so the
-							// automatic reselection does not induce interest
-							PlatformUI.getWorkbench()
-									.getActiveWorkbenchWindow()
-									.getActivePage()
-									.getActivePart()
-									.getSite()
-									.getSelectionProvider()
-									.setSelection(null);
-						} catch (Exception e) {
-							// ignore
-						}
-					}
-					boolean manipulated = ContextCorePlugin.getContextManager().manipulateInterestForElement(node,
-							increment, false, preserveUninteresting, SOURCE_ID, getContext());
-					if (!manipulated) {
-						UiUtil.displayInterestManipulationFailure();
-					}
-				}
-			}
-		} else {
-			IInteractionElement node = ContextCore.getContextManager().getActiveElement();
-			if (node != null) {
-				boolean manipulated = ContextCorePlugin.getContextManager().manipulateInterestForElement(node,
-						increment, false, false, SOURCE_ID, getContext());
-				if (!manipulated) {
-					UiUtil.displayInterestManipulationFailure();
-				}
-			} else {
-				MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.AbstractInterestManipulationAction_Interest_Manipulation, Messages.AbstractInterestManipulationAction_No_task_context_is_active);
-			}
-		}
-	}
-
-	/**
-	 * TODO: consider moving this extensibility to the UI Bridge
-	 */
-	protected IInteractionElement convertSelectionToInteractionElement(Object object) {
-		IInteractionElement node = null;
-		if (object instanceof IInteractionElement) {
-			node = (IInteractionElement) object;
-		} else {
-			AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(object);
-			String handle = bridge.getHandleIdentifier(object);
-			node = ContextCore.getContextManager().getElement(handle);
-		}
-		return node;
-	}
-
-	public void dispose() {
-		// ignore
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextActiveActionFilter.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextActiveActionFilter.java
deleted file mode 100644
index 11afdb6..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextActiveActionFilter.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.internal.context.ui.actions;
-
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.ui.IActionFilter;
-
-/**
- * @author Mik Kersten
- */
-public class ContextActiveActionFilter implements IActionFilter {
-
-	public boolean testAttribute(Object target, String name, String value) {
-		return ContextCore.getContextManager().isContextActive();
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextAttachAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextAttachAction.java
deleted file mode 100644
index 8068910..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextAttachAction.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.context.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.context.ui.commands.AttachContextHandler;
-import org.eclipse.mylyn.internal.context.ui.wizards.ContextAttachWizard;
-import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.tasks.ui.util.AttachmentUtil;
-import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- * @author Rob Elves
- * @author Steffen Pingel
- * @deprecated use {@link AttachContextHandler} instead
- */
-@SuppressWarnings("restriction")
-@Deprecated
-public class ContextAttachAction extends Action implements IViewActionDelegate {
-
-	private ITask task;
-
-	private static final String ID_ACTION = "org.eclipse.mylyn.context.ui.repository.task.attach"; //$NON-NLS-1$
-
-	public ContextAttachAction() {
-		setText(Messages.ContextAttachAction_Attach_);
-		setToolTipText(Messages.ContextAttachAction_Attach_Task_Context);
-		setId(ID_ACTION);
-		setImageDescriptor(TasksUiImages.CONTEXT_ATTACH);
-	}
-
-	public void init(IViewPart view) {
-		// ignore
-	}
-
-	@Override
-	public void run() {
-		run(this);
-	}
-
-	public void run(IAction action) {
-		if (task == null) {
-			return;
-		} else {
-			run(task);
-		}
-	}
-
-	public void run(ITask task) {
-		if (task.getSynchronizationState() != SynchronizationState.SYNCHRONIZED) {
-			MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-					Messages.ContextAttachAction_Context_Attachment,
-					Messages.ContextAttachAction_Task_must_be_synchronized_before_attaching_context);
-			return;
-		}
-
-		ContextAttachWizard wizard = new ContextAttachWizard(task);
-		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		if (shell != null && !shell.isDisposed()) {
-			WizardDialog dialog = new WizardDialog(shell, wizard);
-			dialog.create();
-			dialog.setBlockOnOpen(true);
-			if (dialog.open() == Window.CANCEL) {
-				dialog.close();
-				return;
-			}
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		AbstractTask selectedTask = TaskListView.getSelectedTask(selection);
-		if (selectedTask != null) {
-			task = selectedTask;
-			action.setEnabled(AttachmentUtil.canUploadAttachment(task)
-					&& (task.isActive() || ContextCore.getContextManager().hasContext(task.getHandleIdentifier())));
-		} else {
-			task = null;
-			action.setEnabled(false);
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextClearAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextClearAction.java
deleted file mode 100644
index baf7a12..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextClearAction.java
+++ /dev/null
@@ -1,74 +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.context.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.context.ui.commands.ClearContextHandler;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- * @deprecated use {@link ClearContextHandler} instead
- */
-@SuppressWarnings("restriction")
-@Deprecated
-public class ContextClearAction extends TaskContextAction {
-
-	public static final String ID = "org.eclipse.mylyn.ui.clear.context"; //$NON-NLS-1$
-
-	private static final String ID_ACTION = "org.eclipse.mylyn.context.ui.task.clear"; //$NON-NLS-1$
-
-	public ContextClearAction() {
-		setText(Messages.ContextClearAction_Clear);
-		setToolTipText(Messages.ContextClearAction_Clear);
-		setId(ID_ACTION);
-		setImageDescriptor(TasksUiImages.CONTEXT_CLEAR);
-	}
-
-	public void init(IViewPart view) {
-
-	}
-
-	@Override
-	public void run() {
-		run(this);
-	}
-
-	public void run(IAction action) {
-		ITask task = TaskListView.getFromActivePerspective().getSelectedTask();
-		if (task != null) {
-			run(task);
-		}
-	}
-
-	public boolean run(ITask task) {
-		boolean deleteConfirmed = MessageDialog.openQuestion(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getShell(), Messages.ContextClearAction_Confirm_clear_context,
-				Messages.ContextClearAction_Clear_the_context_for_the_selected_task);
-		if (!deleteConfirmed) {
-			return false;
-		}
-
-		ContextCore.getContextManager().deleteContext(task.getHandleIdentifier());
-		TasksUiInternal.getTaskList().notifyElementChanged(task);
-		return true;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextCopyAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextCopyAction.java
deleted file mode 100644
index 9f70ee7..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextCopyAction.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.internal.context.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.internal.context.ui.commands.CopyContextHandler;
-import org.eclipse.mylyn.internal.tasks.ui.actions.TaskSelectionDialog;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- * @deprecated use {@link CopyContextHandler} instead
- */
-@SuppressWarnings("restriction")
-@Deprecated
-public class ContextCopyAction extends TaskContextAction {
-
-	private static final String ID_ACTION = "org.eclipse.mylyn.context.ui.task.copy.context.to"; //$NON-NLS-1$
-
-	public ContextCopyAction() {
-		setText(Messages.ContextCopyAction_Copy_to_);
-		setToolTipText(Messages.ContextCopyAction_Copy_Task_Context_to_);
-		setId(ID_ACTION);
-		setImageDescriptor(TasksUiImages.CONTEXT_TRANSFER);
-	}
-
-	public void init(IViewPart view) {
-		// ignore
-	}
-
-	@Override
-	public void run() {
-		run(getSelectedTask(selection));
-	}
-
-	public void run(IAction action) {
-		run(getSelectedTask(selection));
-	}
-
-	public void run(ITask sourceTask) {
-		if (sourceTask == null) {
-			MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-					Messages.ContextCopyAction_Copy_Context, Messages.ContextCopyAction_No_source_task_selected);
-			return;
-		}
-
-		TaskSelectionDialog dialog = new TaskSelectionDialog(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getShell());
-		dialog.setNeedsCreateTask(false);
-		dialog.setTitle(Messages.ContextCopyAction_Select_Target_Task);
-		dialog.setMessage(Messages.ContextCopyAction_Select_the_target_task__);
-
-		if (dialog.open() != Window.OK) {
-			return;
-		}
-
-		Object result = dialog.getFirstResult();
-
-		if (result instanceof ITask) {
-			ITask targetTask = (ITask) result;
-			TasksUi.getTaskActivityManager().deactivateActiveTask();
-			if (targetTask.equals(sourceTask)) {
-				MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						Messages.ContextCopyAction_Copy_Context, Messages.ContextCopyAction_Target_task_can_not_be_the_same_as_source_task);
-			} else {
-				IInteractionContext context = ContextCore.getContextStore().cloneContext(
-						sourceTask.getHandleIdentifier(), targetTask.getHandleIdentifier());
-				if (context == null) {
-					MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-							Messages.ContextCopyAction_Copy_Context, Messages.ContextCopyAction_Source_task_does_not_have_a_context);
-				} else {
-					TasksUi.getTaskActivityManager().activateTask(targetTask);
-				}
-			}
-		} else {
-			MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-					Messages.ContextCopyAction_Copy_Context, Messages.ContextCopyAction_No_target_task_selected);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextRetrieveAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextRetrieveAction.java
deleted file mode 100644
index d73eb7d..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ContextRetrieveAction.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.internal.context.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.mylyn.internal.context.ui.commands.RetrieveContextAttachmentHandler;
-import org.eclipse.mylyn.internal.context.ui.commands.RetrieveContextHandler;
-import org.eclipse.mylyn.internal.context.ui.wizards.ContextRetrieveWizard;
-import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.tasks.ui.util.AttachmentUtil;
-import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- * @author Rob Elves
- * @author Steffen Pingel
- * @deprecated use {@link RetrieveContextHandler} or {@link RetrieveContextAttachmentHandler} instead
- */
-@SuppressWarnings("restriction")
-@Deprecated
-public class ContextRetrieveAction extends Action implements IViewActionDelegate {
-
-	private AbstractTask task;
-
-	private static final String ID_ACTION = "org.eclipse.mylyn.context.ui.repository.task.retrieve"; //$NON-NLS-1$
-
-	public ContextRetrieveAction() {
-		setText(Messages.ContextRetrieveAction_Retrieve_);
-		setToolTipText(Messages.ContextRetrieveAction_Retrieve_Task_Context);
-		setId(ID_ACTION);
-		setImageDescriptor(TasksUiImages.CONTEXT_RETRIEVE);
-	}
-
-	public void init(IViewPart view) {
-		// ignore
-	}
-
-	@Override
-	public void run() {
-		run(this);
-	}
-
-	public void run(IAction action) {
-		if (task != null) {
-			run(task);
-		}
-	}
-
-	public void run(ITask task) {
-		ContextRetrieveWizard wizard = new ContextRetrieveWizard(task);
-		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		if (shell != null && !shell.isDisposed()) {
-			WizardDialog dialog = new WizardDialog(shell, wizard);
-			dialog.create();
-			dialog.setBlockOnOpen(true);
-			if (dialog.open() == Window.CANCEL) {
-				dialog.close();
-				return;
-			}
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		AbstractTask selectedTask = TaskListView.getSelectedTask(selection);
-		if (selectedTask != null) {
-			task = selectedTask;
-			action.setEnabled(AttachmentUtil.canDownloadAttachment(task) && AttachmentUtil.hasContextAttachment(task));
-		} else {
-			action.setEnabled(false);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/FocusOutlineAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/FocusOutlineAction.java
deleted file mode 100644
index f058dba..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/FocusOutlineAction.java
+++ /dev/null
@@ -1,115 +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.context.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Shawn Minto
- * @author Mik Kersten
- */
-public class FocusOutlineAction extends AbstractFocusViewAction {
-
-	// TODO: move or delete?
-	public static final String ID_CONTENT_OUTLINE = "org.eclipse.ui.views.ContentOutline"; //$NON-NLS-1$
-
-	public FocusOutlineAction() {
-		super(new InterestFilter(), true, false, false);
-	}
-
-	/**
-	 * TODO: refactor this optimization?
-	 */
-	public void update(IEditorPart editorPart) {
-		if (!super.isChecked()) {
-			return;
-		}
-		boolean on = ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(getGlobalPrefId());
-
-		AbstractContextUiBridge bridge = ContextUi.getUiBridgeForEditor(editorPart);
-		List<TreeViewer> outlineViewers = bridge.getContentOutlineViewers(editorPart);
-		for (TreeViewer viewer : outlineViewers) {
-			if (viewPart != null) {
-				ContextUiPlugin.getViewerManager().addManagedViewer(viewer, viewPart);
-			}
-			updateInterestFilter(on, viewer);
-			configureDecorator(viewer);
-		}
-	}
-
-	/**
-	 * TODO: remove once all outlines have platform decorator
-	 */
-	private void configureDecorator(TreeViewer viewer) {
-		if (viewer != null) {
-			if (!(viewer.getLabelProvider() instanceof DecoratingLabelProvider)) {
-				viewer.setLabelProvider(new DecoratingLabelProvider((ILabelProvider) viewer.getLabelProvider(),
-						PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator()));
-			}
-		}
-	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public List<StructuredViewer> getViewers() {
-		List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-		if (PlatformUI.getWorkbench().isClosing()) {
-			return viewers;
-		}
-		for (IWorkbenchWindow w : PlatformUI.getWorkbench().getWorkbenchWindows()) {
-			IWorkbenchPage page = w.getActivePage();
-			if (page != null) {
-				IEditorPart[] parts = page.getEditors();
-				for (IEditorPart part : parts) {
-					AbstractContextUiBridge bridge = ContextUi.getUiBridgeForEditor(part);
-					List<TreeViewer> outlineViewers = bridge.getContentOutlineViewers(part);
-					for (TreeViewer viewer : outlineViewers) {
-						if (viewer != null && !viewers.contains(viewer)) {
-							viewers.add(viewer);
-						}
-					}
-				}
-			}
-		}
-		return viewers;
-	}
-
-	public void propertyChange(PropertyChangeEvent event) {
-		// ignore
-	}
-
-	public static FocusOutlineAction getOutlineActionForEditor(IEditorPart part) {
-		IViewPart outlineView = part.getSite().getPage().findView(ID_CONTENT_OUTLINE);
-		if (outlineView != null) {
-			return (FocusOutlineAction) AbstractFocusViewAction.getActionForPart(outlineView);
-		} else {
-			return null;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/FocusTaskListAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/FocusTaskListAction.java
deleted file mode 100644
index 75d7d9d..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/FocusTaskListAction.java
+++ /dev/null
@@ -1,186 +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.context.ui.actions;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.mylyn.internal.provisional.commons.ui.IFilteredTreeListener;
-import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.internal.tasks.ui.views.TaskListInterestFilter;
-import org.eclipse.mylyn.internal.tasks.ui.views.TaskListInterestSorter;
-import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IViewPart;
-
-/**
- * TODO: abuses contract from super class
- * 
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public class FocusTaskListAction extends AbstractFocusViewAction implements IFilteredTreeListener {
-
-	private final TaskListInterestFilter taskListInterestFilter = new TaskListInterestFilter();
-
-	private final TaskListInterestSorter taskListInterestSorter = new TaskListInterestSorter();
-
-	private Set<AbstractTaskListFilter> previousFilters = new HashSet<AbstractTaskListFilter>();
-
-	private ViewerSorter previousSorter;
-
-	public FocusTaskListAction() {
-		super(new InterestFilter(), false, true, false);
-	}
-
-	@Override
-	public void init(IViewPart view) {
-		super.init(view);
-		IViewPart part = super.getPartForAction();
-		if (part instanceof TaskListView) {
-			((TaskListView) part).getFilteredTree().getRefreshPolicy().addListener(this);
-		}
-
-		update();
-		((TaskListView) part).getFilteredTree().setShowProgress(super.isChecked());
-	}
-
-	@Override
-	protected boolean updateEnablementWithContextActivation() {
-		return false;
-	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-		IViewPart part = super.getPartForAction();
-		if (part instanceof TaskListView) {
-			((TaskListView) part).getFilteredTree().getRefreshPolicy().removeListener(this);
-		}
-	}
-
-	@Override
-	public void run(IAction action) {
-		super.run(action);
-//		IViewPart part = super.getPartForAction();
-//		if (part instanceof TaskListView) {
-//			((TaskListView) part).getFilteredTree().setShowProgress(super.isChecked());
-//		}
-	}
-
-	@Override
-	public List<StructuredViewer> getViewers() {
-		List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-		IViewPart part = super.getPartForAction();
-		if (part instanceof TaskListView) {
-			viewers.add(((TaskListView) part).getViewer());
-		}
-		return viewers;
-	}
-
-	@Override
-	protected boolean installInterestFilter(StructuredViewer viewer) {
-		IViewPart part = super.getPartForAction();
-		if (part instanceof TaskListView) {
-			final TaskListView taskListView = (TaskListView) part;
-			TasksUiInternal.preservingSelection(taskListView.getViewer(), new Runnable() {
-				public void run() {
-					try {
-						taskListView.getViewer().getControl().setRedraw(false);
-						taskListView.setFocusedMode(true);
-						previousSorter = taskListView.getViewer().getSorter();
-						previousFilters = new HashSet<AbstractTaskListFilter>(taskListView.getFilters());
-						taskListView.clearFilters();
-						if (!taskListView.getFilters().contains(taskListInterestFilter)) {
-							taskListView.addFilter(taskListInterestFilter);
-						}
-						// Setting sorter causes root refresh
-						taskListView.getViewer().setSorter(taskListInterestSorter);
-						taskListView.getViewer().expandAll();
-//				taskListView.selectedAndFocusTask(TasksUiPlugin.getTaskList().getActiveTask());
-
-						showProgressBar(taskListView, true);
-					} finally {
-						taskListView.getViewer().getControl().setRedraw(true);
-					}
-				}
-
-			});
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	private void showProgressBar(TaskListView taskListView, boolean visible) {
-		taskListView.getFilteredTree().setShowProgress(visible);
-	}
-
-	@Override
-	protected void uninstallInterestFilter(StructuredViewer viewer) {
-		IViewPart part = super.getPartForAction();
-		if (part instanceof TaskListView) {
-			final TaskListView taskListView = (TaskListView) part;
-			if (taskListView.isFocusedMode()) {
-				TasksUiInternal.preservingSelection(taskListView.getViewer(), new Runnable() {
-					public void run() {
-						try {
-							taskListView.getViewer().getControl().setRedraw(false);
-							taskListView.setFocusedMode(false);
-							taskListView.removeFilter(taskListInterestFilter);
-							for (AbstractTaskListFilter filter : previousFilters) {
-								taskListView.addFilter(filter);
-							}
-							Text textControl = taskListView.getFilteredTree().getFilterControl();
-							if (textControl != null && textControl.getText().length() > 0) {
-								taskListView.getViewer().expandAll();
-							} else {
-								taskListView.getViewer().collapseAll();
-							}
-							taskListView.getViewer().setSorter(previousSorter);
-							showProgressBar(taskListView, false);
-						} finally {
-							taskListView.getViewer().getControl().setRedraw(true);
-						}
-					}
-				});
-			}
-		}
-	}
-
-	public void propertyChange(PropertyChangeEvent event) {
-		// ignore
-	}
-
-	public void filterTextChanged(final String text) {
-		if (isChecked() && (text == null || "".equals(text))) { //$NON-NLS-1$
-			IViewPart part = FocusTaskListAction.super.getPartForAction();
-			if (part instanceof TaskListView) {
-				((TaskListView) part).getViewer().expandAll();
-			}
-		}
-	}
-
-	@Override
-	protected String getEmptyViewMessage() {
-		return Messages.FocusTaskListAction_No_tasks_scheduled_for_this_week;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/InterestDecrementAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/InterestDecrementAction.java
deleted file mode 100644
index 17c6220..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/InterestDecrementAction.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.context.ui.actions;
-
-/**
- * @author Mik Kersten
- */
-// TODO 3.3 rename to RemoveFromContextAction?
-public class InterestDecrementAction extends AbstractInterestManipulationAction {
-
-	@Override
-	protected boolean isIncrement() {
-		return false;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/InterestIncrementAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/InterestIncrementAction.java
deleted file mode 100644
index 7f42d96..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/InterestIncrementAction.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.actions;
-
-/**
- * @author Mik Kersten
- */
-public class InterestIncrementAction extends AbstractInterestManipulationAction {
-
-	@Override
-	protected boolean isIncrement() {
-		return true;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/Messages.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/Messages.java
deleted file mode 100644
index 1f32fdc..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/Messages.java
+++ /dev/null
@@ -1,73 +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.context.ui.actions;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.context.ui.actions.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 AbstractInterestManipulationAction_Interest_Manipulation;
-
-	public static String AbstractInterestManipulationAction_No_task_context_is_active;
-
-	public static String ContextAttachAction_Attach_;
-
-	public static String ContextAttachAction_Attach_Task_Context;
-
-	public static String ContextAttachAction_Context_Attachment;
-
-	public static String ContextAttachAction_Task_must_be_synchronized_before_attaching_context;
-
-	public static String ContextClearAction_Clear;
-
-	public static String ContextClearAction_Clear_the_context_for_the_selected_task;
-
-	public static String ContextClearAction_Confirm_clear_context;
-
-	public static String ContextCopyAction_Copy_Context;
-
-	public static String ContextCopyAction_Copy_Task_Context_to_;
-
-	public static String ContextCopyAction_Copy_to_;
-
-	public static String ContextCopyAction_No_source_task_selected;
-
-	public static String ContextCopyAction_No_target_task_selected;
-
-	public static String ContextCopyAction_Select_Target_Task;
-
-	public static String ContextCopyAction_Select_the_target_task__;
-
-	public static String ContextCopyAction_Source_task_does_not_have_a_context;
-
-	public static String ContextCopyAction_Target_task_can_not_be_the_same_as_source_task;
-
-	public static String ContextRetrieveAction_Retrieve_;
-
-	public static String ContextRetrieveAction_Retrieve_Task_Context;
-
-	public static String FocusTaskListAction_No_tasks_scheduled_for_this_week;
-
-	public static String ToggleDecorateInterestLevelAction_Decorate_Interest;
-
-	public static String ToggleDecorateInterestLevelAction_Toggle_Interest_Level_Decorator;
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/OpenPrefsAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/OpenPrefsAction.java
deleted file mode 100644
index 7255376..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/OpenPrefsAction.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * @author Mik Kersten
- */
-public class OpenPrefsAction implements IWorkbenchWindowActionDelegate {
-
-	public void dispose() {
-		// don't care when we are disposed
-	}
-
-	public void init(IWorkbenchWindow window) {
-		// don't have anything to initialize
-	}
-
-	public void run(IAction action) {
-		// don't have anything to run
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// don't care about selection changes
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/OpenQuickContextPopupDialogAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/OpenQuickContextPopupDialogAction.java
deleted file mode 100644
index 8c0c87b..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/OpenQuickContextPopupDialogAction.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.internal.context.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.mylyn.internal.context.ui.views.QuickContextPopupDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Class to activate the inplace Cross Reference view, via the key binding defined in the plugin.xml.
- * 
- * @author Mik Kersten
- */
-public class OpenQuickContextPopupDialogAction implements IWorkbenchWindowActionDelegate {
-
-	private QuickContextPopupDialog inplaceDialog;
-
-	public void dispose() {
-		inplaceDialog = null;
-	}
-
-	public void init(IWorkbenchWindow window) {
-		// ignore
-	}
-
-	public void run(IAction action) {
-		Shell parent = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		inplaceDialog = new QuickContextPopupDialog(parent);
-		inplaceDialog.open();
-		inplaceDialog.setFocus();
-		// inplaceDialog.setLastSelection(XRefUIUtils.getCurrentSelection());
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// ignore
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/TaskContextAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/TaskContextAction.java
deleted file mode 100644
index 5855cdd..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/TaskContextAction.java
+++ /dev/null
@@ -1,53 +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.context.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.ui.IViewActionDelegate;
-
-/**
- * Controls enablement
- * 
- * @author Mik Kersten
- */
-public abstract class TaskContextAction extends Action implements IViewActionDelegate {
-
-	protected ISelection selection;
-
-	protected ITask getSelectedTask(ISelection newSelection) {
-		if (selection instanceof StructuredSelection) {
-			Object selectedObject = ((StructuredSelection) selection).getFirstElement();
-			if (selectedObject instanceof ITask) {
-				return (ITask) selectedObject;
-			}
-//			else if (selectedObject instanceof AbstractQueryHit) {
-//				return ((AbstractQueryHit) selectedObject).getCorrespondingTask();
-//			}
-		}
-		return null;
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-		ITask selectedTask = getSelectedTask(selection);
-		if (selectedTask != null) {
-			action.setEnabled(ContextCore.getContextManager().hasContext(selectedTask.getHandleIdentifier()));
-		} else {
-			action.setEnabled(false);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ToggleDecorateInterestLevelAction.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ToggleDecorateInterestLevelAction.java
deleted file mode 100644
index 5e06fc4..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/ToggleDecorateInterestLevelAction.java
+++ /dev/null
@@ -1,47 +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.context.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-
-/**
- * @author Mik Kersten
- */
-public class ToggleDecorateInterestLevelAction extends Action {
-
-	public static final String PREF_ID = "org.eclipse.mylyn.ui.decorators.interest"; //$NON-NLS-1$
-
-	public static final String PREF_INTERSECTION_MODE = "org.eclipse.mylyn.ui.interest.intersection"; //$NON-NLS-1$
-
-	public ToggleDecorateInterestLevelAction() {
-		super();
-		setText(Messages.ToggleDecorateInterestLevelAction_Decorate_Interest);
-		setToolTipText(Messages.ToggleDecorateInterestLevelAction_Toggle_Interest_Level_Decorator);
-
-		boolean checked = ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(PREF_ID);
-		valueChanged(checked, false);
-	}
-
-	@Override
-	public void run() {
-		valueChanged(isChecked(), true);
-	}
-
-	private void valueChanged(final boolean on, boolean store) {
-		setChecked(on);
-		if (store) {
-			ContextUiPlugin.getDefault().getPreferenceStore().setValue(PREF_ID, on);
-		}
-		ContextUiPlugin.getDefault().getPreferenceStore().setValue(PREF_INTERSECTION_MODE, true);
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/messages.properties b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/messages.properties
deleted file mode 100644
index c8d24eb..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/actions/messages.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-AbstractInterestManipulationAction_Interest_Manipulation=Interest Manipulation
-AbstractInterestManipulationAction_No_task_context_is_active=No task context is active, or element not found in context
-
-ContextAttachAction_Attach_=Attach...
-ContextAttachAction_Attach_Task_Context=Attach Task Context
-ContextAttachAction_Context_Attachment=Context Attachment
-ContextAttachAction_Task_must_be_synchronized_before_attaching_context=Task must be synchronized before attaching context
-
-ContextClearAction_Clear=Clear
-ContextClearAction_Clear_the_context_for_the_selected_task=Clear the context for the selected task?  This cannot be undone.
-ContextClearAction_Confirm_clear_context=Confirm clear context
-
-ContextCopyAction_Copy_Context=Copy Context
-ContextCopyAction_Copy_Task_Context_to_=Copy Task Context to...
-ContextCopyAction_Copy_to_=Copy to...
-ContextCopyAction_No_source_task_selected=No source task selected.
-ContextCopyAction_No_target_task_selected=No target task selected.
-ContextCopyAction_Select_Target_Task=Select Target Task
-ContextCopyAction_Select_the_target_task__=&Select the target task (? = any character, * = any String):
-ContextCopyAction_Source_task_does_not_have_a_context=Source task does not have a context.
-ContextCopyAction_Target_task_can_not_be_the_same_as_source_task=Target task can not be the same as source task.
-
-ContextRetrieveAction_Retrieve_=Retrieve...
-ContextRetrieveAction_Retrieve_Task_Context=Retrieve Task Context
-
-FocusTaskListAction_No_tasks_scheduled_for_this_week=No tasks scheduled for this week
-
-ToggleDecorateInterestLevelAction_Decorate_Interest=Decorate Interest
-ToggleDecorateInterestLevelAction_Toggle_Interest_Level_Decorator=Toggle Interest Level Decorator
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/AbstractTaskAttachmentCommandHandler.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/AbstractTaskAttachmentCommandHandler.java
deleted file mode 100644
index 177ca59..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/AbstractTaskAttachmentCommandHandler.java
+++ /dev/null
@@ -1,46 +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.context.ui.commands;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylyn.tasks.core.ITaskAttachment;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * @author Steffen Pingel
- */
-public abstract class AbstractTaskAttachmentCommandHandler extends AbstractHandler {
-
-	public AbstractTaskAttachmentCommandHandler() {
-	}
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection selection = HandlerUtil.getCurrentSelection(event);
-		if (selection instanceof IStructuredSelection) {
-			Object[] items = ((IStructuredSelection) selection).toArray();
-			for (Object item : items) {
-				if (item instanceof ITaskAttachment) {
-					execute(event, (ITaskAttachment) item);
-				}
-			}
-		}
-		return null;
-	}
-
-	protected void execute(ExecutionEvent event, ITaskAttachment attachment) {
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/AttachContextHandler.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/AttachContextHandler.java
deleted file mode 100644
index 5e159c7..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/AttachContextHandler.java
+++ /dev/null
@@ -1,40 +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.context.ui.commands;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.mylyn.internal.context.ui.wizards.ContextAttachWizard;
-import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil;
-import org.eclipse.mylyn.internal.tasks.ui.commands.AbstractTaskHandler;
-import org.eclipse.mylyn.tasks.core.ITask;
-
-/**
- * @author Steffen Pingel
- */
-public class AttachContextHandler extends AbstractTaskHandler {
-
-	@Override
-	protected void execute(ExecutionEvent event, ITask task) throws ExecutionException {
-		ContextAttachWizard wizard = new ContextAttachWizard(task);
-		WizardDialog dialog = new WizardDialog(WorkbenchUtil.getShell(), wizard);
-		dialog.create();
-		dialog.setBlockOnOpen(true);
-		if (dialog.open() == Window.CANCEL) {
-			dialog.close();
-			return;
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/ClearContextHandler.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/ClearContextHandler.java
deleted file mode 100644
index 6e730a9..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/ClearContextHandler.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.context.ui.commands;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.tasks.ui.commands.AbstractTaskHandler;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Steffen Pingel
- */
-public class ClearContextHandler extends AbstractTaskHandler {
-
-	@Override
-	protected void execute(ExecutionEvent event, ITask task) throws ExecutionException {
-		boolean deleteConfirmed = MessageDialog.openQuestion(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getShell(), Messages.ClearContextHandler_Confirm_clear_context,
-				Messages.ClearContextHandler_CLEAR_THE_CONTEXT_THE_FOR_SELECTED_TASK);
-		if (!deleteConfirmed) {
-			return;
-		}
-
-		ContextCore.getContextManager().deleteContext(task.getHandleIdentifier());
-		TasksUiInternal.getTaskList().notifyElementChanged(task);
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/CopyContextHandler.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/CopyContextHandler.java
deleted file mode 100644
index cc1a93c..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/CopyContextHandler.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.commands;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.internal.tasks.ui.actions.TaskSelectionDialog;
-import org.eclipse.mylyn.internal.tasks.ui.commands.AbstractTaskHandler;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Steffen Pingel
- */
-public class CopyContextHandler extends AbstractTaskHandler {
-
-	private static final String TITLE_DIALOG = Messages.CopyContextHandler_Copy_Context;
-
-	@Override
-	protected void execute(ExecutionEvent event, ITask sourceTask) throws ExecutionException {
-		if (sourceTask == null) {
-			MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-					TITLE_DIALOG, Messages.CopyContextHandler_No_source_task_selected);
-			return;
-		}
-
-		TaskSelectionDialog dialog = new TaskSelectionDialog(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getShell());
-		dialog.setNeedsCreateTask(false);
-		dialog.setTitle(Messages.CopyContextHandler_Select_Target_Task);
-		dialog.setMessage(Messages.CopyContextHandler_Select_the_target_task__);
-
-		if (dialog.open() != Window.OK) {
-			return;
-		}
-
-		Object result = dialog.getFirstResult();
-
-		if (result instanceof ITask) {
-			ITask targetTask = (ITask) result;
-			TasksUi.getTaskActivityManager().deactivateActiveTask();
-			if (targetTask.equals(sourceTask)) {
-				MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-						TITLE_DIALOG, Messages.CopyContextHandler_TARGET_TASK_CON_NOT_BE_THE_SAME_AS_SOURCE_TASK);
-			} else {
-				IInteractionContext context = ContextCore.getContextStore().cloneContext(
-						sourceTask.getHandleIdentifier(), targetTask.getHandleIdentifier());
-				if (context == null) {
-					MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-							TITLE_DIALOG, Messages.CopyContextHandler_SOURCE_TASK_DOES_HAVE_A_CONTEXT);
-				} else {
-					TasksUi.getTaskActivityManager().activateTask(targetTask);
-				}
-			}
-		} else {
-			MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-					TITLE_DIALOG, Messages.CopyContextHandler_No_target_task_selected);
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/FocusViewHandler.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/FocusViewHandler.java
deleted file mode 100644
index 2ea6115..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/FocusViewHandler.java
+++ /dev/null
@@ -1,55 +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:
- *     Izzet Safer - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.commands;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Izzet Safer
- */
-public class FocusViewHandler extends AbstractHandler {
-
-	private static final String PARAMETER_VIEW_ID = "viewId"; //$NON-NLS-1$
-
-	private AbstractFocusViewAction applyAction = null;
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		Object returnValue = Boolean.FALSE;
-		String viewId = event.getParameter(PARAMETER_VIEW_ID);
-
-		if (viewId == null) {
-			return returnValue;
-		}
-
-		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		IViewPart viewPart = activePage.findView(viewId);
-		if (viewPart == null) {
-			return returnValue;
-		}
-
-		applyAction = AbstractFocusViewAction.getActionForPart(viewPart);
-
-		if (applyAction != null) {
-			applyAction.update(true);
-			returnValue = Boolean.TRUE;
-		}
-
-		return returnValue;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/Messages.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/Messages.java
deleted file mode 100644
index 2657f7d..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/Messages.java
+++ /dev/null
@@ -1,46 +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.context.ui.commands;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.context.ui.commands.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 ClearContextHandler_CLEAR_THE_CONTEXT_THE_FOR_SELECTED_TASK;
-
-	public static String ClearContextHandler_Confirm_clear_context;
-
-	public static String CopyContextHandler_Copy_Context;
-
-	public static String CopyContextHandler_No_source_task_selected;
-
-	public static String CopyContextHandler_No_target_task_selected;
-
-	public static String CopyContextHandler_Select_Target_Task;
-
-	public static String CopyContextHandler_Select_the_target_task__;
-
-	public static String CopyContextHandler_SOURCE_TASK_DOES_HAVE_A_CONTEXT;
-
-	public static String CopyContextHandler_TARGET_TASK_CON_NOT_BE_THE_SAME_AS_SOURCE_TASK;
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/RetrieveContextAttachmentHandler.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/RetrieveContextAttachmentHandler.java
deleted file mode 100644
index f787af0..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/RetrieveContextAttachmentHandler.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.context.ui.commands;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.mylyn.internal.tasks.ui.util.AttachmentUtil;
-import org.eclipse.mylyn.tasks.core.ITaskAttachment;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Steffen Pingel
- */
-public class RetrieveContextAttachmentHandler extends AbstractTaskAttachmentCommandHandler {
-
-	@Override
-	protected void execute(ExecutionEvent event, ITaskAttachment attachment) {
-		AttachmentUtil.downloadContext(attachment.getTask(), attachment, PlatformUI.getWorkbench().getProgressService());
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/RetrieveContextHandler.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/RetrieveContextHandler.java
deleted file mode 100644
index 1879842..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/RetrieveContextHandler.java
+++ /dev/null
@@ -1,40 +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.context.ui.commands;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.mylyn.internal.context.ui.wizards.ContextRetrieveWizard;
-import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil;
-import org.eclipse.mylyn.internal.tasks.ui.commands.AbstractTaskHandler;
-import org.eclipse.mylyn.tasks.core.ITask;
-
-/**
- * @author Steffen Pingel
- */
-public class RetrieveContextHandler extends AbstractTaskHandler {
-
-	@Override
-	protected void execute(ExecutionEvent event, ITask task) throws ExecutionException {
-		ContextRetrieveWizard wizard = new ContextRetrieveWizard(task);
-		WizardDialog dialog = new WizardDialog(WorkbenchUtil.getShell(), wizard);
-		dialog.create();
-		dialog.setBlockOnOpen(true);
-		if (dialog.open() == Window.CANCEL) {
-			dialog.close();
-			return;
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/messages.properties b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/messages.properties
deleted file mode 100644
index 9325ce3..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/commands/messages.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-ClearContextHandler_CLEAR_THE_CONTEXT_THE_FOR_SELECTED_TASK=Clear the context for the selected task?  This cannot be undone.
-ClearContextHandler_Confirm_clear_context=Confirm clear context
-
-CopyContextHandler_Copy_Context=Copy Context
-CopyContextHandler_No_source_task_selected=No source task selected.
-CopyContextHandler_No_target_task_selected=No target task selected.
-CopyContextHandler_Select_Target_Task=Select Target Task
-CopyContextHandler_Select_the_target_task__=&Select the target task (? = any character, * = any String):
-CopyContextHandler_SOURCE_TASK_DOES_HAVE_A_CONTEXT=Source task does not have a context.
-CopyContextHandler_TARGET_TASK_CON_NOT_BE_THE_SAME_AS_SOURCE_TASK=Target task can not be the same as source task.
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ContextEditorFormPage.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ContextEditorFormPage.java
deleted file mode 100644
index ccbec02..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ContextEditorFormPage.java
+++ /dev/null
@@ -1,545 +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.context.ui.editors;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.context.ui.actions.ContextAttachAction;
-import org.eclipse.mylyn.internal.context.ui.actions.ContextClearAction;
-import org.eclipse.mylyn.internal.context.ui.actions.ContextCopyAction;
-import org.eclipse.mylyn.internal.context.ui.actions.ContextRetrieveAction;
-import org.eclipse.mylyn.internal.context.ui.views.ContextNodeOpenListener;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
-import org.eclipse.mylyn.internal.provisional.commons.ui.DelayedRefreshJob;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-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.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Scale;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.navigator.INavigatorContentExtension;
-
-/**
- * @author Mik Kersten
- */
-@SuppressWarnings("deprecation")
-public class ContextEditorFormPage extends FormPage {
-
-	private static final int SCALE_STEPS = 14;
-
-	public static final String ID_VIEWER = "org.eclipse.mylyn.context.ui.navigator.context"; //$NON-NLS-1$
-
-	private ScrolledForm form;
-
-	private Composite sectionClient;
-
-	private FormToolkit toolkit;
-
-	private CommonViewer commonViewer;
-
-	private Hyperlink activateTaskHyperlink;
-
-	private final ScalableInterestFilter interestFilter = new ScalableInterestFilter();
-
-	private Scale doiScale;
-
-	private ITask task;
-
-	private class ContextEditorDelayedRefreshJob extends DelayedRefreshJob {
-
-		public ContextEditorDelayedRefreshJob(StructuredViewer treeViewer, String name) {
-			super(treeViewer, name);
-		}
-
-		@Override
-		protected void doRefresh(Object[] items) {
-			if (commonViewer != null && !commonViewer.getTree().isDisposed()) {
-				commonViewer.refresh();
-				if (items != null) {
-					for (Object item : items) {
-						updateExpansionState(item);
-					}
-				} else {
-					updateExpansionState(null);
-				}
-			}
-			if (invisiblePart != null) {
-				invisiblePart.updateInvisibleElementsSection();
-			}
-		}
-
-		protected void updateExpansionState(Object item) {
-			if (commonViewer != null && !commonViewer.getTree().isDisposed()) {
-				try {
-					commonViewer.getTree().setRedraw(false);
-					if (/*!mouseDown && */item == null) {
-						commonViewer.expandAll();
-					} else if (item != null && item instanceof IInteractionElement) {
-						IInteractionElement node = (IInteractionElement) item;
-						AbstractContextStructureBridge structureBridge = ContextCorePlugin.getDefault()
-								.getStructureBridge(node.getContentType());
-						Object objectToRefresh = structureBridge.getObjectForHandle(node.getHandleIdentifier());
-						if (objectToRefresh != null) {
-							commonViewer.expandToLevel(objectToRefresh, AbstractTreeViewer.ALL_LEVELS);
-						}
-					}
-				} finally {
-					commonViewer.getTree().setRedraw(true);
-				}
-			}
-		}
-
-	}
-
-	private final AbstractContextListener CONTEXT_LISTENER = new AbstractContextListener() {
-
-		@Override
-		public void contextChanged(ContextChangeEvent event) {
-			Control partControl = getPartControl();
-			switch (event.getEventKind()) {
-			case ACTIVATED:
-				if (partControl != null && !partControl.isDisposed()) {
-					updateContentArea();
-					refresh();
-				}
-				break;
-			case DEACTIVATED:
-				if (partControl != null && !partControl.isDisposed()) {
-					updateContentArea();
-					refresh();
-				}
-				break;
-			case CLEARED:
-				if (event.isActiveContext()) {
-					refresh();
-				}
-				break;
-			case ELEMENTS_DELETED:
-			case INTEREST_CHANGED:
-			case LANDMARKS_ADDED:
-			case LANDMARKS_REMOVED:
-				refresh(event.getElements());
-				break;
-			}
-		}
-
-	};
-
-	public ContextEditorFormPage(FormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	@Override
-	protected void createFormContent(IManagedForm managedForm) {
-		ContextCore.getContextManager().addListener(CONTEXT_LISTENER);
-		task = ((TaskEditorInput) getEditorInput()).getTask();
-
-		form = managedForm.getForm();
-
-		toolkit = managedForm.getToolkit();
-
-		//form.setImage(TaskListImages.getImage(TaskListImages.TASK_ACTIVE_CENTERED));
-		//form.setText(LABEL);
-		//toolkit.decorateFormHeading(form.getForm());
-
-		form.getBody().setLayout(new FillLayout());
-		Composite composite = new Composite(form.getBody(), SWT.NONE) {
-			@Override
-			public Point computeSize(int widhtHint, int heigtHint, boolean changed) {
-				Rectangle clientArea = getClientArea();
-				return super.computeSize(widhtHint, clientArea.height, changed);
-			}
-		};
-		toolkit.adapt(composite);
-		composite.setLayout(new GridLayout(2, false));
-
-		createActionsSection(composite);
-		createContentSection(composite);
-
-		form.reflow(true);
-	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-		// ContextUiPlugin.getViewerManager().removeManagedViewer(commonViewer,
-		// this);
-		ContextCore.getContextManager().removeListener(CONTEXT_LISTENER);
-	}
-
-	private void createActionsSection(Composite composite) {
-		Section section = toolkit.createSection(composite, ExpandableComposite.TITLE_BAR | ExpandableComposite.EXPANDED);
-		section.setText(Messages.ContextEditorFormPage_Actions);
-
-		section.setLayout(new GridLayout());
-		GridData sectionGridData = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-		sectionGridData.widthHint = 80;
-		section.setLayoutData(sectionGridData);
-
-		Composite sectionClient = toolkit.createComposite(section);
-		section.setClient(sectionClient);
-		sectionClient.setLayout(new GridLayout(2, false));
-		sectionClient.setLayoutData(new GridData());
-
-		ImageHyperlink filterImage = toolkit.createImageHyperlink(sectionClient, SWT.NONE);
-		filterImage.setImage(CommonImages.getImage(CommonImages.FILTER));
-		filterImage.setToolTipText(Messages.ContextEditorFormPage_Show_All_Elements);
-		filterImage.addHyperlinkListener(new IHyperlinkListener() {
-
-			public void linkActivated(HyperlinkEvent e) {
-				doiScale.setSelection(0);
-				interestFilter.setThreshold(Integer.MIN_VALUE);
-				refresh();
-			}
-
-			public void linkEntered(HyperlinkEvent e) {
-				// ignore	
-			}
-
-			public void linkExited(HyperlinkEvent e) {
-				// ignore
-			}
-		});
-
-		doiScale = new Scale(sectionClient, SWT.FLAT);
-		GridData scaleGridData = new GridData(GridData.FILL_HORIZONTAL);
-		scaleGridData.heightHint = 36;
-		scaleGridData.widthHint = 80;
-		doiScale.setLayoutData(scaleGridData);
-		doiScale.setPageIncrement(1);
-		doiScale.setMinimum(0);
-		doiScale.setSelection(SCALE_STEPS / 2);
-		doiScale.setMaximum(SCALE_STEPS);
-		doiScale.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				updateFilterThreshold();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// don't care about default selection
-			}
-		});
-
-		if (!isActiveTask()) {
-			doiScale.setEnabled(false);
-		}
-
-		Label attachImage = toolkit.createLabel(sectionClient, ""); //$NON-NLS-1$
-		attachImage.setImage(CommonImages.getImage(TasksUiImages.CONTEXT_ATTACH));
-		attachImage.setEnabled(task != null);
-		Hyperlink attachHyperlink = toolkit.createHyperlink(sectionClient,
-				Messages.ContextEditorFormPage_Attach_context_, SWT.NONE);
-		attachHyperlink.setEnabled(task != null);
-		attachHyperlink.addMouseListener(new MouseListener() {
-
-			public void mouseUp(MouseEvent e) {
-				new ContextAttachAction().run(task);
-			}
-
-			public void mouseDoubleClick(MouseEvent e) {
-				// ignore
-			}
-
-			public void mouseDown(MouseEvent e) {
-				// ignore
-			}
-		});
-
-		Label retrieveImage = toolkit.createLabel(sectionClient, ""); //$NON-NLS-1$
-		retrieveImage.setImage(CommonImages.getImage(TasksUiImages.CONTEXT_RETRIEVE));
-		retrieveImage.setEnabled(task != null);
-		Hyperlink retrieveHyperlink = toolkit.createHyperlink(sectionClient,
-				Messages.ContextEditorFormPage_Retrieve_Context_, SWT.NONE);
-		retrieveHyperlink.setEnabled(task != null);
-		retrieveHyperlink.addMouseListener(new MouseListener() {
-
-			public void mouseUp(MouseEvent e) {
-				new ContextRetrieveAction().run(task);
-			}
-
-			public void mouseDoubleClick(MouseEvent e) {
-				// ignore
-			}
-
-			public void mouseDown(MouseEvent e) {
-				// ignore
-			}
-		});
-
-		Label copyImage = toolkit.createLabel(sectionClient, ""); //$NON-NLS-1$
-		copyImage.setImage(CommonImages.getImage(TasksUiImages.CONTEXT_COPY));
-		Hyperlink copyHyperlink = toolkit.createHyperlink(sectionClient,
-				Messages.ContextEditorFormPage_Copy_Context_to_, SWT.NONE);
-		copyHyperlink.addMouseListener(new MouseListener() {
-
-			public void mouseUp(MouseEvent e) {
-				new ContextCopyAction().run(task);
-			}
-
-			public void mouseDoubleClick(MouseEvent e) {
-				// ignore
-			}
-
-			public void mouseDown(MouseEvent e) {
-				// ignore
-			}
-		});
-
-		Label clearImage = toolkit.createLabel(sectionClient, ""); //$NON-NLS-1$
-		clearImage.setImage(CommonImages.getImage(TasksUiImages.CONTEXT_CLEAR));
-		Hyperlink clearHyperlink = toolkit.createHyperlink(sectionClient, Messages.ContextEditorFormPage_RemoveAll,
-				SWT.NONE);
-		clearHyperlink.addMouseListener(new MouseListener() {
-
-			public void mouseUp(MouseEvent e) {
-				new ContextClearAction().run(task);
-			}
-
-			public void mouseDoubleClick(MouseEvent e) {
-				// ignore
-			}
-
-			public void mouseDown(MouseEvent e) {
-				// ignore
-			}
-		});
-		section.setExpanded(true);
-	}
-
-	private ContextEditorDelayedRefreshJob refreshJob;
-
-	private InvisibleContextElementsPart invisiblePart;
-
-	/**
-	 * Scales logarithmically to a reasonable interest threshold range (e.g. -10000..10000).
-	 */
-	protected void updateFilterThreshold() {
-		if (doiScale.getSelection() == 0) {
-			interestFilter.setThreshold(Integer.MIN_VALUE);
-		} else if (doiScale.getSelection() == SCALE_STEPS) {
-			interestFilter.setThreshold(Integer.MAX_VALUE);
-		} else {
-			double setting = doiScale.getSelection() - (SCALE_STEPS / 2);
-			double threshold = Math.signum(setting) * Math.pow(Math.exp(Math.abs(setting)), 1.5);
-			interestFilter.setThreshold(threshold);
-		}
-		refresh();
-	}
-
-	private void refresh() {
-		createRefreshJob();
-		if (refreshJob != null) {
-			refreshJob.refresh();
-		}
-	}
-
-	private synchronized void createRefreshJob() {
-		if (commonViewer == null) {
-			return;
-		}
-		if (refreshJob == null) {
-			refreshJob = new ContextEditorDelayedRefreshJob(commonViewer, "refresh viewer"); //$NON-NLS-1$
-		}
-	}
-
-	private void refresh(List<IInteractionElement> elements) {
-		createRefreshJob();
-		if (refreshJob != null) {
-			refreshJob.doRefresh(elements.toArray());
-		}
-	}
-
-	private void createContentSection(Composite composite) {
-		Section section = toolkit.createSection(composite, ExpandableComposite.TITLE_BAR | ExpandableComposite.EXPANDED);
-		section.setText(Messages.ContextEditorFormPage_Elements);
-		section.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		sectionClient = toolkit.createComposite(section);
-		sectionClient.setLayout(new FillLayout());
-		section.setClient(sectionClient);
-
-		updateContentArea();
-
-		toolkit.createLabel(composite, "  "); //$NON-NLS-1$
-
-		invisiblePart = new InvisibleContextElementsPart(commonViewer);
-		Control invisibleControl = invisiblePart.createControl(toolkit, composite);
-		GridDataFactory.fillDefaults().applyTo(invisibleControl);
-	}
-
-	private void createActivateTaskHyperlink(Composite parent) {
-		activateTaskHyperlink = toolkit.createHyperlink(parent,
-				Messages.ContextEditorFormPage_Activate_task_to_edit_context, SWT.NONE);
-		activateTaskHyperlink.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseUp(MouseEvent e) {
-				TasksUi.getTaskActivityManager().activateTask(task);
-			}
-		});
-	}
-
-	/**
-	 * Disposes the viewer when the current task is not active or creates it if task is activated.
-	 */
-	private void updateContentArea() {
-		if (isActiveTask()) {
-			doiScale.setEnabled(true);
-			doiScale.setSelection(SCALE_STEPS / 2);
-			if (activateTaskHyperlink != null) {
-				activateTaskHyperlink.dispose();
-				activateTaskHyperlink = null;
-			}
-			if (commonViewer == null) {
-				createViewer(sectionClient);
-			}
-			updateFilterThreshold();
-		} else {
-			doiScale.setEnabled(false);
-			doiScale.setSelection(SCALE_STEPS / 2);
-			if (commonViewer != null) {
-				commonViewer.getControl().dispose();
-				commonViewer = null;
-				disposeRefreshJob();
-			}
-			if (activateTaskHyperlink == null) {
-				createActivateTaskHyperlink(sectionClient);
-			}
-		}
-		sectionClient.layout();
-	}
-
-	private synchronized void disposeRefreshJob() {
-		if (refreshJob != null) {
-			refreshJob.cancel();
-			refreshJob = null;
-		}
-	}
-
-	private boolean isActiveTask() {
-		return task.equals(TasksUi.getTaskActivityManager().getActiveTask());
-	}
-
-	private void createViewer(Composite parent) {
-		commonViewer = new CommonViewer(ID_VIEWER, parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		commonViewer.setUseHashlookup(true);
-		commonViewer.addFilter(interestFilter);
-		commonViewer.addOpenListener(new ContextNodeOpenListener(commonViewer));
-		try {
-			commonViewer.getControl().setRedraw(false);
-
-			forceFlatLayoutOfJavaContent(commonViewer);
-
-			commonViewer.setInput(getSite().getPage().getInput());
-			getSite().setSelectionProvider(commonViewer);
-			hookContextMenu();
-			commonViewer.expandAll();
-		} finally {
-			commonViewer.getControl().setRedraw(true);
-		}
-	}
-
-	public static void forceFlatLayoutOfJavaContent(CommonViewer commonViewer) {
-		INavigatorContentExtension javaContent = commonViewer.getNavigatorContentService().getContentExtensionById(
-				"org.eclipse.jdt.java.ui.javaContent"); //$NON-NLS-1$
-		if (javaContent != null) {
-			ITreeContentProvider treeContentProvider = javaContent.getContentProvider();
-			// TODO: find a sane way of doing this, perhaps via AbstractContextUiBridge, should be:
-			// if (javaContent.getContentProvider() != null) {
-			// JavaNavigatorContentProvider java =
-			// (JavaNavigatorContentProvider)javaContent.getContentProvider();
-			// java.setIsFlatLayout(true);
-			// }
-			try {
-				Class<?> clazz = treeContentProvider.getClass().getSuperclass();
-				Method method = clazz.getDeclaredMethod("setIsFlatLayout", new Class[] { boolean.class }); //$NON-NLS-1$
-				method.invoke(treeContentProvider, new Object[] { true });
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN,
-						"Could not set flat layout on Java content provider", e)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuManager.setRemoveAllWhenShown(true);
-		menuManager.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuManager.createContextMenu(commonViewer.getControl());
-		commonViewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuManager, commonViewer);
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		//manager.add(removeFromContextAction);
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-
-	public ISelection getSelection() {
-		if (getSite() != null && getSite().getSelectionProvider() != null) {
-			return getSite().getSelectionProvider().getSelection();
-		} else {
-			return StructuredSelection.EMPTY;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ContextPageFactory.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ContextPageFactory.java
deleted file mode 100644
index c7ad101..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ContextPageFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.editors;
-
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory;
-import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
-import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.forms.editor.IFormPage;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class ContextPageFactory extends AbstractTaskEditorPageFactory {
-
-	@Override
-	public boolean canCreatePageFor(TaskEditorInput input) {
-		return true;
-	}
-
-	@Override
-	public IFormPage createPage(TaskEditor parentEditor) {
-		return new ContextEditorFormPage(parentEditor, ContextUi.ID_CONTEXT_PAGE_FACTORY, Messages.ContextPageFactory_Context);
-	}
-
-	@Override
-	public int getPriority() {
-		return PRIORITY_CONTEXT;
-	}
-
-	@Override
-	public Image getPageImage() {
-		return CommonImages.getImage(TasksUiImages.CONTEXT_ACTIVE_CENTERED);
-	}
-
-	@Override
-	public String getPageText() {
-		return Messages.ContextPageFactory_Context;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/InvisibleContextElementsPart.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/InvisibleContextElementsPart.java
deleted file mode 100644
index fbe44f8..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/InvisibleContextElementsPart.java
+++ /dev/null
@@ -1,410 +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.context.ui.editors;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-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.jface.action.Action;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.TableColumnLayout;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ColumnPixelData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-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.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.commons.ui.SwtUtil;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.navigator.CommonViewer;
-
-/**
- * @author Shawn Minto
- */
-public class InvisibleContextElementsPart {
-
-	private final class InteractionElementTableSorter extends ViewerSorter {
-
-		private int criteria = 0;
-
-		private boolean isDecending = true;
-
-		private final ITableLabelProvider labelProvider;
-
-		public InteractionElementTableSorter(ITableLabelProvider labelProvider) {
-			this.labelProvider = labelProvider;
-		}
-
-		@Override
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			int result = 0;
-
-			String value1 = labelProvider.getColumnText(e1, criteria);
-			String value2 = labelProvider.getColumnText(e2, criteria);
-
-			if (value1 == null && value2 != null) {
-				result = -1;
-			} else if (value1 != null && value2 == null) {
-				result = 1;
-			} else if (value1 != null && value2 != null) {
-				result = value1.compareTo(value2);
-			}
-
-			return isDecending() ? (result * -1) : result;
-		}
-
-		public boolean isDecending() {
-			return isDecending;
-		}
-
-		public void setCriteria(int index) {
-			if (criteria == index) {
-				isDecending = !isDecending;
-			} else {
-				isDecending = false;
-			}
-			criteria = index;
-		}
-
-	}
-
-	private final class InteractionElementTableLabelProvider extends LabelProvider implements ITableLabelProvider {
-		@Override
-		public String getText(Object element) {
-			if (element instanceof IInteractionElement) {
-				return ((IInteractionElement) element).getHandleIdentifier();
-			}
-			return super.getText(element);
-		}
-
-		public Image getColumnImage(Object element, int columnIndex) {
-			return null;
-		}
-
-		public String getColumnText(Object element, int columnIndex) {
-			if (element instanceof IInteractionElement) {
-				if (columnIndex == 0) {
-					return ((IInteractionElement) element).getHandleIdentifier();
-				} else if (columnIndex == 1) {
-					return ((IInteractionElement) element).getContentType();
-				}
-			}
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	private final class RemoveInvisibleAction extends Action {
-		public RemoveInvisibleAction() {
-			setText(Messages.ContextEditorFormPage_Remove_Invisible_);
-			setToolTipText(Messages.ContextEditorFormPage_Remove_Invisible_);
-			setImageDescriptor(TasksUiImages.CONTEXT_CLEAR);
-		}
-
-		@Override
-		public void run() {
-			if (commonViewer == null) {
-				MessageDialog.openWarning(WorkbenchUtil.getShell(), Messages.ContextEditorFormPage_Remove_Invisible,
-						Messages.ContextEditorFormPage_Activate_task_to_remove_invisible);
-				return;
-			}
-
-			boolean confirmed = MessageDialog.openConfirm(Display.getCurrent().getActiveShell(),
-					Messages.ContextEditorFormPage_Remove_Invisible,
-					Messages.ContextEditorFormPage_Remove_every_element_not_visible);
-			if (confirmed) {
-
-				if (ContextCore.getContextManager().isContextActive()) {
-					try {
-						final Collection<Object> allVisible = getAllVisibleElementsInContextPage();
-						PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-
-							public void run(IProgressMonitor monitor) throws InvocationTargetException,
-									InterruptedException {
-								monitor.beginTask(Messages.InvisibleContextElementsPart_Collecting_all_invisible,
-										IProgressMonitor.UNKNOWN);
-								if (allVisible != null) {
-									IInteractionContext context = ContextCore.getContextManager().getActiveContext();
-									final List<IInteractionElement> allToRemove = getAllInvisibleElements(context,
-											allVisible);
-									Display.getDefault().asyncExec(new Runnable() {
-										public void run() {
-											ContextCore.getContextManager().deleteElements(allToRemove);
-										}
-									});
-
-								} else {
-									MessageDialog.openInformation(Display.getCurrent().getActiveShell(),
-											Messages.ContextEditorFormPage_Remove_Invisible,
-											Messages.ContextEditorFormPage_No_context_active);
-								}
-							}
-						});
-					} catch (InvocationTargetException e) {
-						StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, e.getMessage(), e));
-					} catch (InterruptedException e) {
-						StatusHandler.log(new Status(IStatus.ERROR, ContextUiPlugin.ID_PLUGIN, e.getMessage(), e));
-					}
-
-				} else {
-					MessageDialog.openInformation(Display.getCurrent().getActiveShell(),
-							Messages.ContextEditorFormPage_Remove_Invisible,
-							Messages.ContextEditorFormPage_No_context_active);
-				}
-			}
-		}
-	}
-
-	private TableViewer invisibleTable;
-
-	private Section invisibleSection;
-
-	private final CommonViewer commonViewer;
-
-	public InvisibleContextElementsPart(CommonViewer commonViewer) {
-		this.commonViewer = commonViewer;
-	}
-
-	public Control createControl(FormToolkit toolkit, Composite composite) {
-		invisibleSection = toolkit.createSection(composite, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
-		invisibleSection.setText(NLS.bind(Messages.InvisibleContextElementsPart_Invisible_elements, "0")); //$NON-NLS-1$
-		invisibleSection.setEnabled(false);
-
-		Composite toolbarComposite = toolkit.createComposite(invisibleSection);
-		toolbarComposite.setBackground(null);
-		invisibleSection.setTextClient(toolbarComposite);
-		RowLayout rowLayout = new RowLayout();
-		rowLayout.marginTop = 0;
-		rowLayout.marginBottom = 0;
-		toolbarComposite.setLayout(rowLayout);
-
-		ToolBarManager toolbarManager = new ToolBarManager(SWT.FLAT);
-		toolbarManager.add(new RemoveInvisibleAction());
-		toolbarManager.createControl(toolbarComposite);
-		toolbarManager.markDirty();
-		toolbarManager.update(true);
-
-		Composite invisibleSectionClient = toolkit.createComposite(invisibleSection);
-		invisibleSectionClient.setLayout(new GridLayout());
-		invisibleSection.setClient(invisibleSectionClient);
-
-		Composite tableComposite = toolkit.createComposite(invisibleSectionClient);
-		GridDataFactory.fillDefaults().hint(450, 200).grab(true, false).applyTo(tableComposite);
-		TableColumnLayout layout = new TableColumnLayout();
-		tableComposite.setLayout(layout);
-
-		invisibleTable = new TableViewer(tableComposite, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
-				| SWT.FULL_SELECTION | SWT.HIDE_SELECTION);
-		invisibleTable.setColumnProperties(new String[] { Messages.InvisibleContextElementsPart_Structure_handle,
-				Messages.InvisibleContextElementsPart_Structure_kind });
-		invisibleTable.getTable().setHeaderVisible(true);
-
-		Table table = invisibleTable.getTable();
-		toolkit.adapt(table);
-		table.setMenu(null);
-
-		InteractionElementTableLabelProvider labelProvider = new InteractionElementTableLabelProvider();
-		invisibleTable.setLabelProvider(labelProvider);
-		invisibleTable.setContentProvider(new IStructuredContentProvider() {
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-				// ignore
-			}
-
-			public void dispose() {
-				// ignore
-			}
-
-			public Object[] getElements(Object inputElement) {
-				if (inputElement instanceof Collection<?>) {
-					return ((Collection<?>) inputElement).toArray();
-				}
-				return new Object[0];
-			}
-		});
-
-		InteractionElementTableSorter invisibleTableSorter = new InteractionElementTableSorter(labelProvider);
-		invisibleTableSorter.setCriteria(0);
-		invisibleTable.setSorter(invisibleTableSorter);
-		createColumn(layout, 0, Messages.InvisibleContextElementsPart_Structure_handle, 340, table,
-				invisibleTableSorter);
-		createColumn(layout, 1, Messages.InvisibleContextElementsPart_Structure_kind, 100, table, invisibleTableSorter);
-		table.setSortColumn(table.getColumn(0));
-		table.setSortDirection(SWT.DOWN);
-		if (ContextCore.getContextManager().isContextActive()) {
-			Collection<Object> allVisible = getAllVisibleElementsInContextPage();
-			if (allVisible != null) {
-				IInteractionContext context = ContextCore.getContextManager().getActiveContext();
-				updateInvisibleSectionInBackground(context, allVisible);
-			}
-		}
-
-		return invisibleSection;
-	}
-
-	private void createColumn(TableColumnLayout layout, final int index, String label, int weight, final Table table,
-			final InteractionElementTableSorter invisibleTableSorter) {
-		final TableColumn column = new TableColumn(table, SWT.LEFT, index);
-		column.setText(label);
-		column.setToolTipText(label);
-		column.setResizable(true);
-
-		layout.setColumnData(column, new ColumnPixelData(weight, true));
-
-		column.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				invisibleTableSorter.setCriteria(index);
-				table.setSortColumn(column);
-				if (invisibleTableSorter.isDecending()) {
-					table.setSortDirection(SWT.UP);
-				} else {
-					table.setSortDirection(SWT.DOWN);
-				}
-				invisibleTable.refresh();
-			}
-
-		});
-	}
-
-	public void updateInvisibleElementsSection() {
-		if (ContextCore.getContextManager().isContextActive()) {
-			Collection<Object> allVisible = getAllVisibleElementsInContextPage();
-			if (allVisible != null) {
-				IInteractionContext context = ContextCore.getContextManager().getActiveContext();
-				updateInvisibleSectionInBackground(context, allVisible);
-			}
-		}
-	}
-
-	private void updateInvisibleSectionInBackground(final IInteractionContext context,
-			final Collection<Object> allVisible) {
-
-		Job j = new Job(Messages.InvisibleContextElementsPart_Updating_invisible_element_list) {
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				monitor.beginTask(Messages.InvisibleContextElementsPart_Computing_invisible_elements,
-						IProgressMonitor.UNKNOWN);
-				final List<IInteractionElement> allInvisibleElements = getAllInvisibleElements(context, allVisible);
-				Display.getDefault().asyncExec(new Runnable() {
-
-					public void run() {
-						if (invisibleSection != null && !invisibleSection.isDisposed()) {
-							invisibleSection.setText(NLS.bind(Messages.InvisibleContextElementsPart_Invisible_elements,
-									allInvisibleElements.size()));
-							invisibleSection.layout();
-							if (allInvisibleElements.size() == 0) {
-								invisibleSection.setExpanded(false);
-								invisibleSection.setEnabled(false);
-							} else {
-								invisibleSection.setEnabled(true);
-							}
-						}
-
-						if (invisibleTable != null && !invisibleTable.getTable().isDisposed()) {
-							invisibleTable.setInput(allInvisibleElements);
-						}
-					}
-				});
-
-				return Status.OK_STATUS;
-			};
-		};
-		j.schedule();
-
-	}
-
-	private List<IInteractionElement> getAllInvisibleElements(IInteractionContext context, Collection<Object> allVisible) {
-		List<IInteractionElement> allToRemove = context.getAllElements();
-
-		List<IInteractionElement> allVisibleElements = new ArrayList<IInteractionElement>();
-		for (Object visibleObject : allVisible) {
-			for (AbstractContextStructureBridge bridge : ContextCorePlugin.getDefault().getStructureBridges().values()) {
-//			AbstractContextStructureBridge bridge = ContextCorePlugin.getDefault().getStructureBridge(visibleObject);
-				if (bridge != null) {
-					String handle = bridge.getHandleIdentifier(visibleObject);
-					if (handle != null) {
-						IInteractionElement element = context.get(handle);
-						if (element != null) {
-							allVisibleElements.add(element);
-						}
-					}
-				}
-			}
-			AbstractContextStructureBridge bridge = ContextCorePlugin.getDefault().getStructureBridge(
-					ContextCore.CONTENT_TYPE_RESOURCE);
-			if (bridge != null) {
-				String handle = bridge.getHandleIdentifier(visibleObject);
-				if (handle != null) {
-					IInteractionElement element = context.get(handle);
-					if (element != null) {
-						allVisibleElements.add(element);
-					}
-				}
-			}
-		}
-		IInteractionElement emptyElement = context.get(""); //$NON-NLS-1$
-		if (emptyElement != null) {
-			allVisibleElements.add(emptyElement);
-		}
-
-		allToRemove.removeAll(allVisibleElements);
-
-		return allToRemove;
-	}
-
-	private Collection<Object> getAllVisibleElementsInContextPage() {
-		if (commonViewer == null || commonViewer.getTree() == null || commonViewer.getTree().isDisposed()) {
-			return null;
-		}
-		Set<Object> allVisible = new HashSet<Object>();
-		SwtUtil.collectItemData(commonViewer.getTree().getItems(), allVisible);
-		return allVisible;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/Messages.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/Messages.java
deleted file mode 100644
index be32ee0..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/Messages.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.editors;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.context.ui.editors.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 ContextEditorFormPage_No_context_active;
-
-	public static String ContextEditorFormPage_Actions;
-
-	public static String ContextEditorFormPage_Activate_task_to_edit_context;
-
-	public static String ContextEditorFormPage_Activate_task_to_remove_invisible;
-
-	public static String ContextEditorFormPage_Attach_context_;
-
-	public static String ContextEditorFormPage_Copy_Context_to_;
-
-	public static String ContextEditorFormPage_Elements;
-
-	public static String ContextEditorFormPage_Remove_every_element_not_visible;
-
-	public static String ContextEditorFormPage_Remove_Invisible;
-
-	public static String ContextEditorFormPage_Remove_Invisible_;
-
-	public static String ContextEditorFormPage_RemoveAll;
-
-	public static String ContextEditorFormPage_Retrieve_Context_;
-
-	public static String ContextEditorFormPage_Show_All_Elements;
-
-	public static String ContextPageFactory_Context;
-
-	public static String InvisibleContextElementsPart_Collecting_all_invisible;
-
-	public static String InvisibleContextElementsPart_Computing_invisible_elements;
-
-	public static String InvisibleContextElementsPart_Invisible_elements;
-
-	public static String InvisibleContextElementsPart_Structure_handle;
-
-	public static String InvisibleContextElementsPart_Structure_kind;
-
-	public static String InvisibleContextElementsPart_Updating_invisible_element_list;
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ScalableInterestFilter.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ScalableInterestFilter.java
deleted file mode 100644
index 2cd69e8..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/ScalableInterestFilter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.editors;
-
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-
-/**
- * @author Mik Kersten
- */
-public class ScalableInterestFilter extends InterestFilter {
-
-	private double threshold = 0;
-
-	@Override
-	protected boolean isInteresting(IInteractionElement element) {
-		if (element.getInterest().getEvents().isEmpty()) {
-			return false;
-		} else {
-			return element.getInterest().getValue() >= threshold;
-		}
-	}
-
-	public void setThreshold(double threshold) {
-		this.threshold = threshold;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/messages.properties b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/messages.properties
deleted file mode 100644
index aa46ef8..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/editors/messages.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-ContextEditorFormPage_No_context_active=No context active.
-ContextEditorFormPage_Actions=Actions
-ContextEditorFormPage_Activate_task_to_edit_context=Activate task to edit context
-ContextEditorFormPage_Activate_task_to_remove_invisible=Activate task to remove invisible elements.
-ContextEditorFormPage_Attach_context_=Attach context...
-ContextEditorFormPage_Copy_Context_to_=Copy Context to...
-ContextEditorFormPage_Elements=Elements
-ContextEditorFormPage_Remove_every_element_not_visible=Remove every element not visible from the task context? This cannot be undone.
-ContextEditorFormPage_Remove_Invisible=Remove Invisible
-ContextEditorFormPage_Remove_Invisible_=Remove Invisible...
-ContextEditorFormPage_RemoveAll=Remove All...
-ContextEditorFormPage_Retrieve_Context_=Retrieve Context...
-ContextEditorFormPage_Show_All_Elements=Show All Elements
-
-ContextPageFactory_Context=Context
-InvisibleContextElementsPart_Collecting_all_invisible=Collecting all invisible elements
-InvisibleContextElementsPart_Computing_invisible_elements=Getting Invisible Elements
-InvisibleContextElementsPart_Invisible_elements={0} Invisible Elements
-InvisibleContextElementsPart_Structure_handle=Structure Handle
-InvisibleContextElementsPart_Structure_kind=Kind
-InvisibleContextElementsPart_Updating_invisible_element_list=Updating Invisible Elements in Context Page
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/messages.properties b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/messages.properties
deleted file mode 100644
index 7058167..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/messages.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-ContextUiPlugin_No_local_task_context_exists=No local task context exists.  Retrieve from repository?
-ContextUiPlugin_Task_Activation=Task Activation
-
-TaskContextWorkingSetPage_Cannot_create_another_Active_Taskscape_Working_Set=Cannot create another Active Taskscape Working Set
-TaskContextWorkingSetPage_CREATE_THE_MYLYN_CONTEXT_WORKING_SET=Create the Mylyn Task Context working set.  It will be updated automatically to contain\n\
-all of the resources related to the active task.
-TaskContextWorkingSetPage_Mylyn_Task_Context_Working_Set=Mylyn Task Context Working Set
-TaskContextWorkingSetPage_Name=Name
-TaskContextWorkingSetPage_NOTE_THIS_WORKING_SET_SHOULD_ONLY_BE_USED_FOR_SEARCHS=NOTE: this working set should only be used for searches.  Do not select it in the Package Explorer.
-TaskContextWorkingSetPage_TASK_CONTEXT_FOR_SEARCH=Task Context (for search)
-
-UiUtil_Mylyn_Interest_Manipulation=Mylyn Interest Manipulation
-UiUtil_Not_a_valid_landmark=Not a valid landmark, select an element within this resource instead.
-
-AbstractFocusViewAction_Apply_Mylyn=Apply Mylyn
-AbstractFocusViewAction_Empty_task_context=Empty task context, unfocus or Alt+click
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/ContextUiPreferencePage.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/ContextUiPreferencePage.java
deleted file mode 100644
index 2960823..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/ContextUiPreferencePage.java
+++ /dev/null
@@ -1,186 +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.context.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.context.ui.IContextUiPreferenceContstants;
-import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-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.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.dialogs.PreferenceLinkArea;
-import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
-
-/**
- * @author Mik Kersten
- */
-public class ContextUiPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener {
-
-	private Button autoFocusNavigatorsButton = null;
-
-	private Button manageEditorsButton = null;
-
-	private Button mapCloseToRemoveButton = null;
-
-	private Button managePerspectivesButton = null;
-
-	private Button manageExpansionButton = null;
-
-	/**
-	 * Constructor - set preference store to ContextUiPlugin store since the tasklist plugin needs access to the values
-	 * stored from the preference page because it needs access to the highlighters on start up.
-	 * 
-	 */
-	public ContextUiPreferencePage() {
-		super();
-		setPreferenceStore(ContextUiPlugin.getDefault().getPreferenceStore());
-		setTitle(Messages.ContextUiPreferencePage_Context);
-		setDescription(Messages.ContextUiPreferencePage_CONFIGURE_TASK_FOCUSED_UI_MANAGEMENT_AND_AUTOMATION);
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		Composite entryTable = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout(1, false);
-		layout.verticalSpacing = 4;
-		entryTable.setLayout(layout);
-
-		createUiManagementSection(entryTable);
-//		createExclusionFilterControl(entryTable);
-
-		applyDialogFont(entryTable);
-		return entryTable;
-	}
-
-	public void init(IWorkbench workbench) {
-		// don't have anything to initialize
-	}
-
-	public void widgetDefaultSelected(SelectionEvent se) {
-		widgetSelected(se);
-	}
-
-	/**
-	 * Handle selection of an item in the menu.
-	 */
-	public void widgetSelected(SelectionEvent se) {
-		// don't care when the widget is selected
-	}
-
-	@Override
-	public boolean performOk() {
-		getPreferenceStore().setValue(IContextUiPreferenceContstants.AUTO_FOCUS_NAVIGATORS,
-				autoFocusNavigatorsButton.getSelection());
-
-		getPreferenceStore().setValue(IContextUiPreferenceContstants.AUTO_MANAGE_EDITORS,
-				manageEditorsButton.getSelection());
-		getPreferenceStore().setValue(IContextUiPreferenceContstants.AUTO_MANAGE_PERSPECTIVES,
-				managePerspectivesButton.getSelection());
-		getPreferenceStore().setValue(IContextUiPreferenceContstants.AUTO_MANAGE_EXPANSION,
-				manageExpansionButton.getSelection());
-		getPreferenceStore().setValue(IContextUiPreferenceContstants.AUTO_MANAGE_EDITOR_CLOSE,
-				mapCloseToRemoveButton.getSelection());
-
-		TasksUiPlugin.getDefault().getPreferenceStore().setValue(ITasksUiPreferenceConstants.AUTO_EXPAND_TASK_LIST,
-				manageExpansionButton.getSelection());
-
-		return true;
-	}
-
-	/**
-	 * Handle Cancel Undo all changes back to what is stored in preference store
-	 */
-	@Override
-	public boolean performCancel() {
-		autoFocusNavigatorsButton.setSelection(getPreferenceStore().getBoolean(
-				IContextUiPreferenceContstants.AUTO_FOCUS_NAVIGATORS));
-		return true;
-	}
-
-	/**
-	 * Handle RestoreDefaults Note: changes to default are not stored in the preference store until OK or Apply is
-	 * pressed
-	 */
-	@Override
-	public void performDefaults() {
-		super.performDefaults();
-
-		// NOTE: duplicated policy from ContextUiPlugin.initializeDefaultPreferences
-		autoFocusNavigatorsButton.setSelection(true);
-		manageEditorsButton.setSelection(true);
-		manageExpansionButton.setSelection(true);
-
-		managePerspectivesButton.setSelection(false);
-		mapCloseToRemoveButton.setSelection(false);
-		return;
-	}
-
-	private void createUiManagementSection(Composite parent) {
-		Group groupViews = new Group(parent, SWT.SHADOW_ETCHED_IN);
-		groupViews.setLayout(new GridLayout(1, false));
-		groupViews.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		groupViews.setText(Messages.ContextUiPreferencePage_Views);
-
-		autoFocusNavigatorsButton = new Button(groupViews, SWT.CHECK);
-		autoFocusNavigatorsButton.setText(Messages.ContextUiPreferencePage_Auto_focus_navigator_views_on_task_activation);
-		autoFocusNavigatorsButton.setSelection(getPreferenceStore().getBoolean(
-				IContextUiPreferenceContstants.AUTO_FOCUS_NAVIGATORS));
-
-		manageExpansionButton = new Button(groupViews, SWT.CHECK);
-		manageExpansionButton.setText(Messages.ContextUiPreferencePage_Auto_expand_tree_views_when_focused);
-		manageExpansionButton.setSelection(getPreferenceStore().getBoolean(
-				IContextUiPreferenceContstants.AUTO_MANAGE_EXPANSION));
-
-		Group groupEditors = new Group(parent, SWT.SHADOW_ETCHED_IN);
-		groupEditors.setLayout(new GridLayout(1, false));
-		groupEditors.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		groupEditors.setText(Messages.ContextUiPreferencePage_Editors);
-
-		manageEditorsButton = new Button(groupEditors, SWT.CHECK);
-		manageEditorsButton.setText(Messages.ContextUiPreferencePage_Manage_open_editors_to_match_task_context);
-		manageEditorsButton.setSelection(getPreferenceStore().getBoolean(
-				IContextUiPreferenceContstants.AUTO_MANAGE_EDITORS));
-
-		if (getContainer() instanceof IWorkbenchPreferenceContainer) {
-			String message = "<a>''{0}''</a> " + Messages.ContextUiPreferencePage_will_be_toggled_with_activation; //$NON-NLS-1$
-			new PreferenceLinkArea(groupEditors, SWT.NONE, "org.eclipse.ui.preferencePages.Editors", message, //$NON-NLS-1$
-					(IWorkbenchPreferenceContainer) getContainer(), null);
-		}
-
-		mapCloseToRemoveButton = new Button(groupEditors, SWT.CHECK);
-		mapCloseToRemoveButton.setText(Messages.ContextUiPreferencePage_Remove_file_from_context_when_editor_is_closed);
-		mapCloseToRemoveButton.setSelection(getPreferenceStore().getBoolean(
-				IContextUiPreferenceContstants.AUTO_MANAGE_EDITOR_CLOSE));
-
-		Group groupPerspectives = new Group(parent, SWT.SHADOW_ETCHED_IN);
-		groupPerspectives.setLayout(new GridLayout(1, false));
-		groupPerspectives.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		groupPerspectives.setText(Messages.ContextUiPreferencePage_Perspectives);
-
-		managePerspectivesButton = new Button(groupPerspectives, SWT.CHECK);
-		managePerspectivesButton.setText(Messages.ContextUiPreferencePage_Open_last_used_perspective_on_task_activation);
-		managePerspectivesButton.setSelection(getPreferenceStore().getBoolean(
-				IContextUiPreferenceContstants.AUTO_MANAGE_PERSPECTIVES));
-
-		return;
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/Messages.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/Messages.java
deleted file mode 100644
index a8fecca..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/Messages.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.preferences;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.context.ui.preferences.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 ContextUiPreferencePage_Auto_expand_tree_views_when_focused;
-
-	public static String ContextUiPreferencePage_Auto_focus_navigator_views_on_task_activation;
-
-	public static String ContextUiPreferencePage_CONFIGURE_TASK_FOCUSED_UI_MANAGEMENT_AND_AUTOMATION;
-
-	public static String ContextUiPreferencePage_Context;
-
-	public static String ContextUiPreferencePage_Editors;
-
-	public static String ContextUiPreferencePage_Manage_open_editors_to_match_task_context;
-
-	public static String ContextUiPreferencePage_Open_last_used_perspective_on_task_activation;
-
-	public static String ContextUiPreferencePage_Perspectives;
-
-	public static String ContextUiPreferencePage_Remove_file_from_context_when_editor_is_closed;
-
-	public static String ContextUiPreferencePage_Views;
-
-	public static String ContextUiPreferencePage_will_be_toggled_with_activation;
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/messages.properties b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/messages.properties
deleted file mode 100644
index 64ee89d..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/preferences/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-ContextUiPreferencePage_Auto_expand_tree_views_when_focused=Auto expand tree views when focused
-ContextUiPreferencePage_Auto_focus_navigator_views_on_task_activation=Auto focus navigator views on task activation
-ContextUiPreferencePage_CONFIGURE_TASK_FOCUSED_UI_MANAGEMENT_AND_AUTOMATION=Configure the Task-Focused UI management and automation.
-ContextUiPreferencePage_Context=Context
-ContextUiPreferencePage_Editors=Editors
-ContextUiPreferencePage_Manage_open_editors_to_match_task_context=Manage open editors to match task context
-ContextUiPreferencePage_Open_last_used_perspective_on_task_activation=Open last used perspective on task activation
-ContextUiPreferencePage_Perspectives=Perspectives
-ContextUiPreferencePage_Remove_file_from_context_when_editor_is_closed=Remove file from context when editor is closed
-ContextUiPreferencePage_Views=Views
-ContextUiPreferencePage_will_be_toggled_with_activation="Close editors automatically" will be disabled while a task is active
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/ContextNodeOpenListener.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/ContextNodeOpenListener.java
deleted file mode 100644
index ac795d4..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/ContextNodeOpenListener.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.views;
-
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IOpenListener;
-import org.eclipse.jface.viewers.OpenEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.widgets.Tree;
-
-/**
- * @author Mik Kersten
- */
-public class ContextNodeOpenListener implements IOpenListener, IDoubleClickListener, MouseListener {
-
-	private final Viewer viewer;
-
-	public ContextNodeOpenListener(Viewer viewer) {
-		this.viewer = viewer;
-	}
-
-	public void open(OpenEvent event) {
-		StructuredSelection selection = (StructuredSelection) viewer.getSelection();
-		Object object = selection.getFirstElement();
-		IInteractionElement node = null;
-		if (object instanceof IInteractionElement) {
-			node = (IInteractionElement) object;
-		} else if (!(object instanceof IInteractionRelation)) {
-			AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(object);
-			String handle = bridge.getHandleIdentifier(object);
-			node = ContextCore.getContextManager().getElement(handle);
-		}
-		if (node != null) {
-			ContextUi.getUiBridge(node.getContentType()).open(node);
-		}
-	}
-
-	public void doubleClick(DoubleClickEvent event) {
-		open(null);
-	}
-
-	public void mouseDoubleClick(MouseEvent event) {
-		setSelection(event);
-	}
-
-	public void mouseDown(MouseEvent event) {
-		setSelection(event);
-	}
-
-	private void setSelection(MouseEvent event) {
-		try {
-			Object selection = ((Tree) event.getSource()).getSelection()[0].getData();
-			viewer.setSelection(new StructuredSelection(selection));
-			open(null);
-		} catch (Exception e) {
-			// ignore
-		}
-	}
-
-	public void mouseUp(MouseEvent e) {
-		// ignore
-	}
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/Messages.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/Messages.java
deleted file mode 100644
index 80c2e1a..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/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.context.ui.views;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.context.ui.views.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 QuickContextPopupDialog_Task_Context;
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/QuickContextPopupDialog.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/QuickContextPopupDialog.java
deleted file mode 100644
index baca2f9..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/QuickContextPopupDialog.java
+++ /dev/null
@@ -1,473 +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.context.ui.views;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.PopupDialog;
-import org.eclipse.jface.text.IInformationControl;
-import org.eclipse.jface.text.IInformationControlExtension;
-import org.eclipse.jface.text.IInformationControlExtension2;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.context.ui.editors.ContextEditorFormPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-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.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-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.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.misc.StringMatcher;
-import org.eclipse.ui.navigator.CommonViewer;
-
-/**
- * Derived from {@link QuickOutlinePopupDialog}
- * 
- * @author Mik Kersten
- */
-public class QuickContextPopupDialog extends PopupDialog implements IInformationControl, IInformationControlExtension,
-		IInformationControlExtension2, DisposeListener {
-
-	public static final String ID_VIEWER = "org.eclipse.mylyn.context.ui.navigator.context.quick"; //$NON-NLS-1$
-
-	private CommonViewer commonViewer;
-
-	private final InterestFilter interestFilter = new InterestFilter();
-
-	private Text fFilterText;
-
-	private StringMatcher fStringMatcher;
-
-	private QuickOutlinePatternAndInterestFilter namePatternFilter;
-
-	private ContextNodeOpenListener openListener;
-
-	// TODO e3.4 move to new api
-	@SuppressWarnings("deprecation")
-	public QuickContextPopupDialog(Shell parent) {
-		super(parent, SWT.RESIZE, true, true, true, true, null, Messages.QuickContextPopupDialog_Task_Context);
-		create();
-	}
-
-	@Override
-	public boolean close() {
-		// nothing additional to dispose
-		return super.close();
-	}
-
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		createViewer(parent);
-		createUIListenersTreeViewer();
-		addDisposeListener(this);
-
-		return commonViewer.getControl();
-	}
-
-	private void createViewer(Composite parent) {
-		Control composite = super.createDialogArea(parent);
-		commonViewer = createCommonViewer((Composite) composite);
-
-		openListener = new ContextNodeOpenListener(commonViewer);
-
-		commonViewer.addOpenListener(openListener);
-		commonViewer.getTree().addMouseListener(openListener);
-
-		commonViewer.addFilter(interestFilter);
-
-		namePatternFilter = new QuickOutlinePatternAndInterestFilter();
-		commonViewer.addFilter(namePatternFilter);
-
-		try {
-			commonViewer.getControl().setRedraw(false);
-
-			ContextEditorFormPage.forceFlatLayoutOfJavaContent(commonViewer);
-
-			commonViewer.setInput(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getInput());
-			commonViewer.expandAll();
-		} finally {
-			commonViewer.getControl().setRedraw(true);
-		}
-	}
-
-	protected CommonViewer createCommonViewer(Composite parent) {
-		CommonViewer viewer = new CommonViewer(ID_VIEWER, parent, SWT.H_SCROLL | SWT.V_SCROLL);
-		viewer.setUseHashlookup(true);
-		viewer.getControl().setLayoutData(new GridData(500, 400));
-		return viewer;
-	}
-
-	@Override
-	protected void fillDialogMenu(IMenuManager dialogMenu) {
-		dialogMenu.add(new Separator());
-		super.fillDialogMenu(dialogMenu);
-	}
-
-	private void createUIListenersTreeViewer() {
-		final Tree tree = commonViewer.getTree();
-		tree.addKeyListener(new KeyListener() {
-			public void keyPressed(KeyEvent e) {
-				if (e.character == 0x1B) {
-					// Dispose on ESC key press
-					dispose();
-				}
-			}
-
-			public void keyReleased(KeyEvent e) {
-				// ignore
-			}
-		});
-
-		tree.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseUp(MouseEvent e) {
-				handleTreeViewerMouseUp(tree, e);
-			}
-		});
-
-		tree.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				// ignore
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				gotoSelectedElement();
-			}
-		});
-	}
-
-	private void handleTreeViewerMouseUp(final Tree tree, MouseEvent e) {
-		if ((tree.getSelectionCount() < 1) || (e.button != 1) || (tree.equals(e.getSource()) == false)) {
-			return;
-		}
-		// Selection is made in the selection changed listener
-		Object object = tree.getItem(new Point(e.x, e.y));
-		TreeItem selection = tree.getSelection()[0];
-		if (selection.equals(object)) {
-			gotoSelectedElement();
-		}
-	}
-
-	private Object getSelectedElement() {
-		if (commonViewer == null) {
-			return null;
-		}
-		return ((IStructuredSelection) commonViewer.getSelection()).getFirstElement();
-	}
-
-	public void addDisposeListener(DisposeListener listener) {
-		getShell().addDisposeListener(listener);
-	}
-
-	public void addFocusListener(FocusListener listener) {
-		getShell().addFocusListener(listener);
-	}
-
-	public Point computeSizeHint() {
-		// Note that it already has the persisted size if persisting is enabled.
-		return getShell().getSize();
-	}
-
-	public void dispose() {
-		close();
-	}
-
-	public boolean isFocusControl() {
-		if (commonViewer.getControl().isFocusControl() || fFilterText.isFocusControl()) {
-			return true;
-		}
-		return false;
-	}
-
-	public void removeDisposeListener(DisposeListener listener) {
-		getShell().removeDisposeListener(listener);
-	}
-
-	public void removeFocusListener(FocusListener listener) {
-		getShell().removeFocusListener(listener);
-	}
-
-	public void setBackgroundColor(Color background) {
-		applyBackgroundColor(background, getContents());
-	}
-
-	public void setFocus() {
-		getShell().forceFocus();
-		fFilterText.setFocus();
-	}
-
-	public void setForegroundColor(Color foreground) {
-		applyForegroundColor(foreground, getContents());
-	}
-
-	public void setInformation(String information) {
-		// See IInformationControlExtension2
-	}
-
-	// TODO e3.4 move to new api
-	@SuppressWarnings("deprecation")
-	public void setLocation(Point location) {
-		/*
-		 * If the location is persisted, it gets managed by PopupDialog - fine. Otherwise, the location is
-		 * computed in Window#getInitialLocation, which will center it in the parent shell / main
-		 * monitor, which is wrong for two reasons:
-		 * - we want to center over the editor / subject control, not the parent shell
-		 * - the center is computed via the initalSize, which may be also wrong since the size may 
-		 *   have been updated since via min/max sizing of AbstractInformationControlManager.
-		 * In that case, override the location with the one computed by the manager. Note that
-		 * the call to constrainShellSize in PopupDialog.open will still ensure that the shell is
-		 * entirely visible.
-		 */
-		if ((getPersistBounds() == false) || (getDialogSettings() == null)) {
-			getShell().setLocation(location);
-		}
-	}
-
-	public void setSize(int width, int height) {
-		getShell().setSize(width, height);
-	}
-
-	public void setSizeConstraints(int maxWidth, int maxHeight) {
-		// Ignore
-	}
-
-	public void setVisible(boolean visible) {
-		if (visible) {
-			open();
-		} else {
-			saveDialogBounds(getShell());
-			getShell().setVisible(false);
-		}
-	}
-
-	public boolean hasContents() {
-		if ((commonViewer == null) || (commonViewer.getInput() == null)) {
-			return false;
-		}
-		return true;
-	}
-
-	public void setInput(Object input) {
-		// Input comes from PDESourceInfoProvider.getInformation2()
-		// The input should be a model object of some sort
-		// Turn it into a structured selection and set the selection in the tree
-		if (input != null) {
-			commonViewer.setSelection(new StructuredSelection(input));
-		}
-	}
-
-	public void widgetDisposed(DisposeEvent e) {
-		// Note: We do not reuse the dialog
-		commonViewer = null;
-		fFilterText = null;
-	}
-
-	@Override
-	protected Control createTitleControl(Composite parent) {
-		// Applies only to dialog title - not body.  See createDialogArea
-		// Create the text widget
-		createUIWidgetFilterText(parent);
-		// Add listeners to the text widget
-		createUIListenersFilterText();
-		// Return the text widget
-		return fFilterText;
-	}
-
-	@Override
-	protected IDialogSettings getDialogSettings() {
-		IDialogSettings dialogSettings = ContextUiPlugin.getDefault().getDialogSettings();
-		IDialogSettings result = dialogSettings.getSection(ID_VIEWER);
-		if (result == null) {
-			result = dialogSettings.addNewSection(ID_VIEWER);
-		}
-		return result;
-	}
-
-	private void createUIWidgetFilterText(Composite parent) {
-		// Create the widget
-		fFilterText = new Text(parent, SWT.NONE);
-		// Set the font 
-		GC gc = new GC(parent);
-		gc.setFont(parent.getFont());
-		FontMetrics fontMetrics = gc.getFontMetrics();
-		gc.dispose();
-		// Create the layout
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.heightHint = Dialog.convertHeightInCharsToPixels(fontMetrics, 1);
-		data.horizontalAlignment = GridData.FILL;
-		data.verticalAlignment = GridData.CENTER;
-		fFilterText.setLayoutData(data);
-	}
-
-	/**
-	 * 
-	 */
-	private void gotoSelectedElement() {
-		Object selectedElement = getSelectedElement();
-		if (selectedElement == null) {
-			return;
-		}
-		dispose();
-	}
-
-	private void createUIListenersFilterText() {
-		fFilterText.addKeyListener(new KeyListener() {
-			public void keyPressed(KeyEvent e) {
-				if (e.keyCode == 0x0D) {
-					// Return key was pressed
-					gotoSelectedElement();
-				} else if (e.keyCode == SWT.ARROW_DOWN) {
-					// Down key was pressed
-					commonViewer.getTree().setFocus();
-				} else if (e.keyCode == SWT.ARROW_UP) {
-					// Up key was pressed
-					commonViewer.getTree().setFocus();
-				} else if (e.character == 0x1B) {
-					// Escape key was pressed
-					dispose();
-				}
-			}
-
-			public void keyReleased(KeyEvent e) {
-				// NO-OP
-			}
-		});
-		// Handle text modify events
-		fFilterText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				String text = ((Text) e.widget).getText();
-				int length = text.length();
-				if (length > 0) {
-					// Append a '*' pattern to the end of the text value if it
-					// does not have one already
-					if (text.charAt(length - 1) != '*') {
-						text = text + '*';
-					}
-					// Prepend a '*' pattern to the beginning of the text value
-					// if it does not have one already
-					if (text.charAt(0) != '*') {
-						text = '*' + text;
-					}
-				}
-				// Set and update the pattern
-				setMatcherString(text, true);
-			}
-		});
-	}
-
-	/**
-	 * Sets the patterns to filter out for the receiver.
-	 * <p>
-	 * The following characters have special meaning: ? => any character * => any string
-	 * </p>
-	 * 
-	 * @param pattern
-	 *            the pattern
-	 * @param update
-	 *            <code>true</code> if the viewer should be updated
-	 */
-	private void setMatcherString(String pattern, boolean update) {
-		if (pattern.length() == 0) {
-			fStringMatcher = null;
-		} else {
-			fStringMatcher = new StringMatcher(pattern, true, false);
-		}
-		// Update the name pattern filter on the tree viewer
-		namePatternFilter.setStringMatcher(fStringMatcher);
-		// Update the tree viewer according to the pattern
-		if (update) {
-			stringMatcherUpdated();
-		}
-	}
-
-	/**
-	 * The string matcher has been modified. The default implementation refreshes the view and selects the first matched
-	 * element
-	 */
-	private void stringMatcherUpdated() {
-		// Refresh the tree viewer to re-filter
-		commonViewer.getControl().setRedraw(false);
-		commonViewer.refresh();
-		commonViewer.expandAll();
-		selectFirstMatch();
-		commonViewer.getControl().setRedraw(true);
-	}
-
-	/**
-	 * Selects the first element in the tree which matches the current filter pattern.
-	 */
-	private void selectFirstMatch() {
-		Tree tree = commonViewer.getTree();
-		Object element = findFirstMatchToPattern(tree.getItems());
-		if (element != null) {
-			commonViewer.setSelection(new StructuredSelection(element), true);
-		} else {
-			commonViewer.setSelection(StructuredSelection.EMPTY);
-		}
-	}
-
-	/**
-	 * @param items
-	 * @return
-	 */
-	private Object findFirstMatchToPattern(TreeItem[] items) {
-		// Match the string pattern against labels
-		ILabelProvider labelProvider = (ILabelProvider) commonViewer.getLabelProvider();
-		// Process each item in the tree
-		for (TreeItem item : items) {
-			Object element = item.getData();
-			// Return the first element if no pattern is set
-			if (fStringMatcher == null) {
-				return element;
-			}
-			// Return the element if it matches the pattern
-			if (element != null) {
-				String label = labelProvider.getText(element);
-				if (fStringMatcher.match(label)) {
-					return element;
-				}
-			}
-			// Recursively check the elements children for a match
-			element = findFirstMatchToPattern(item.getItems());
-			// Return the child element match if found
-			if (element != null) {
-				return element;
-			}
-		}
-		// No match found
-		return null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/QuickOutlinePatternAndInterestFilter.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/QuickOutlinePatternAndInterestFilter.java
deleted file mode 100644
index b047911..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/QuickOutlinePatternAndInterestFilter.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.context.ui.views;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.ui.internal.misc.StringMatcher;
-
-/**
- * Derived from {@link QuickOutlinePatternAndInterestFilter}
- * 
- * @author Mik Kersten
- */
-public class QuickOutlinePatternAndInterestFilter extends ViewerFilter {
-
-	private final InterestFilter interestFilter = new InterestFilter();
-
-	private StringMatcher stringMatcher;
-
-	public QuickOutlinePatternAndInterestFilter() {
-		stringMatcher = null;
-	}
-
-	@Override
-	public boolean select(Viewer viewer, Object parentElement, Object element) {
-		boolean isInteresting = interestFilter.select(viewer, parentElement, element);
-		if (!isInteresting) {
-			return false;
-		} else {
-			// Element passes the filter if the string matcher is undefined or
-			// the
-			// viewer is not a tree viewer
-			if ((stringMatcher == null) || ((viewer instanceof TreeViewer) == false)) {
-				return true;
-			}
-			TreeViewer treeViewer = (TreeViewer) viewer;
-			// Match the pattern against the label of the given element
-			String matchName = ((ILabelProvider) treeViewer.getLabelProvider()).getText(element);
-			// Element passes the filter if it matches the pattern
-			if ((matchName != null) && stringMatcher.match(matchName)) {
-				return true;
-			}
-			// Determine whether the element has children that pass the filter
-			return hasUnfilteredChild(treeViewer, element);
-		}
-	}
-
-	/**
-	 * @param viewer
-	 * @param element
-	 * @return
-	 */
-	private boolean hasUnfilteredChild(TreeViewer viewer, Object element) {
-		// No point calling hasChildren() because the operation is the same cost
-		// as getting the children
-		// If the element has a child that passes the filter, then we want to
-		// keep the parent around - even if it does not pass the filter itself
-		Object[] children = ((ITreeContentProvider) viewer.getContentProvider()).getChildren(element);
-		for (Object element2 : children) {
-			if (select(viewer, element, element2)) {
-				return true;
-			}
-		}
-		// Element does not pass the filter
-		return false;
-	}
-
-	public void setStringMatcher(StringMatcher stringMatcher) {
-		this.stringMatcher = stringMatcher;
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/messages.properties b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/messages.properties
deleted file mode 100644
index 48ee89c..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/views/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-QuickContextPopupDialog_Task_Context=Task Context
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextAttachWizard.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextAttachWizard.java
deleted file mode 100644
index 4927859..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextAttachWizard.java
+++ /dev/null
@@ -1,55 +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.context.ui.wizards;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.mylyn.internal.tasks.ui.util.AttachmentUtil;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-
-/**
- * @author Rob Elves
- * @author Steffen Pingel
- */
-@SuppressWarnings( { "restriction" })
-public class ContextAttachWizard extends Wizard {
-
-	private final TaskRepository repository;
-
-	private final ITask task;
-
-	private ContextAttachWizardPage wizardPage;
-
-	public ContextAttachWizard(ITask task) {
-		this.repository = TasksUi.getRepositoryManager()
-				.getRepository(task.getConnectorKind(), task.getRepositoryUrl());
-		this.task = task;
-		setWindowTitle(Messages.ContextAttachWizard_Attach_Context);
-		setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY_CONTEXT);
-		setNeedsProgressMonitor(true);
-	}
-
-	@Override
-	public void addPages() {
-		wizardPage = new ContextAttachWizardPage(repository, task);
-		addPage(wizardPage);
-		super.addPages();
-	}
-
-	@Override
-	public final boolean performFinish() {
-		return AttachmentUtil.uploadContext(repository, task, wizardPage.getComment(), getContainer());
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextAttachWizardPage.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextAttachWizardPage.java
deleted file mode 100644
index 4a67f52..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextAttachWizardPage.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.wizards;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Rob Elves
- */
-public class ContextAttachWizardPage extends WizardPage {
-
-	private final TaskRepository repository;
-
-	private final ITask task;
-
-	private Text commentText;
-
-	protected ContextAttachWizardPage(TaskRepository repository, ITask task) {
-		super(Messages.ContextAttachWizardPage_Enter_comment);
-		this.repository = repository;
-		this.task = task;
-		setTitle(Messages.ContextAttachWizardPage_Enter_comment);
-		setDescription(Messages.ContextAttachWizardPage_Attaches_local_context_to_repository_task);
-	}
-
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-
-		Text summary = new Text(composite, SWT.NONE);
-		summary.setText(NLS.bind(Messages.ContextAttachWizardPage_Task, task.getSummary()));
-		summary.setEditable(false);
-		Text repositoryText = new Text(composite, SWT.NONE);
-		repositoryText.setText(Messages.ContextAttachWizardPage_Repository_ + repository.getRepositoryUrl());
-		repositoryText.setEditable(false);
-
-		new Label(composite, SWT.NONE).setText(Messages.ContextAttachWizardPage_Comment_);
-		commentText = new Text(composite, SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.WRAP);
-		commentText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		commentText.addKeyListener(new KeyListener() {
-			public void keyPressed(KeyEvent e) {
-				getWizard().getContainer().updateButtons();
-			}
-
-			public void keyReleased(KeyEvent e) {
-				getWizard().getContainer().updateButtons();
-			}
-		});
-
-		setControl(composite);
-		commentText.setFocus();
-		Dialog.applyDialogFont(composite);
-	}
-
-	public String getComment() {
-		return commentText.getText();
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextRetrieveWizard.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextRetrieveWizard.java
deleted file mode 100644
index 95f1906..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextRetrieveWizard.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.context.ui.wizards;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.mylyn.internal.tasks.ui.util.AttachmentUtil;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskAttachment;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-
-/**
- * @author Rob Elves
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-@SuppressWarnings( { "restriction" })
-public class ContextRetrieveWizard extends Wizard {
-
-	private final TaskRepository repository;
-
-	private final ITask task;
-
-	private ContextRetrieveWizardPage wizardPage;
-
-	public ContextRetrieveWizard(ITask task) {
-		this.task = task;
-		this.repository = TasksUi.getRepositoryManager()
-				.getRepository(task.getConnectorKind(), task.getRepositoryUrl());
-		setWindowTitle(Messages.ContextRetrieveWizard_Retrieve_Context);
-		setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY_CONTEXT);
-		setNeedsProgressMonitor(true);
-	}
-
-	@Override
-	public void addPages() {
-		wizardPage = new ContextRetrieveWizardPage(repository, task);
-		addPage(wizardPage);
-		super.addPages();
-	}
-
-	@Override
-	public final boolean performFinish() {
-		ITaskAttachment attachment = wizardPage.getSelectedContext();
-		return AttachmentUtil.downloadContext(task, attachment, getContainer());
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextRetrieveWizardPage.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextRetrieveWizardPage.java
deleted file mode 100644
index 4ae506c..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/ContextRetrieveWizardPage.java
+++ /dev/null
@@ -1,178 +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.context.ui.wizards;
-
-import com.ibm.icu.text.DateFormat;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.mylyn.internal.tasks.ui.util.AttachmentUtil;
-import org.eclipse.mylyn.tasks.core.IRepositoryPerson;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskAttachment;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.TaskElementLabelProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Rob Elves
- * @author Mik Kersten
- */
-@SuppressWarnings( { "restriction" })
-public class ContextRetrieveWizardPage extends WizardPage {
-
-	private final TaskRepository repository;
-
-	private final ITask task;
-
-	private final TaskElementLabelProvider labelProvider = new TaskElementLabelProvider(false);
-
-	private ITaskAttachment selectedContextAttachment;
-
-	protected ContextRetrieveWizardPage(TaskRepository repository, ITask task) {
-		super(Messages.ContextRetrieveWizardPage_Select_context);
-		this.repository = repository;
-		this.task = task;
-		setDescription(Messages.ContextRetrieveWizardPage_SELECT_A_CONTEXT_TO_RETTRIEVE_FROM_TABLE_BELOW);
-		setTitle(Messages.ContextRetrieveWizardPage_Select_context);
-	}
-
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(1, false));
-
-		Text summary = new Text(composite, SWT.NONE);
-		summary.setText(NLS.bind(Messages.ContextRetrieveWizardPage_Task, labelProvider.getText(task)));
-		summary.setEditable(false);
-		// new Label(composite, SWT.NONE).setText("Repository: " +
-		// repository.getUrl());
-		// new Label(composite, SWT.NONE).setText("Select context below:");
-
-		final Table contextTable = new Table(composite, SWT.FULL_SELECTION | SWT.BORDER);
-		contextTable.setHeaderVisible(true);
-		contextTable.setLinesVisible(true);
-
-		contextTable.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent event) {
-				if (contextTable.getSelectionIndex() > -1) {
-					selectedContextAttachment = (ITaskAttachment) contextTable.getItem(contextTable.getSelectionIndex())
-							.getData();
-					getWizard().getContainer().updateButtons();
-				}
-			}
-		});
-		contextTable.addMouseListener(new MouseListener() {
-
-			public void mouseDoubleClick(MouseEvent e) {
-				selectedContextAttachment = (ITaskAttachment) contextTable.getItem(contextTable.getSelectionIndex())
-						.getData();
-				getWizard().getContainer().updateButtons();
-				getWizard().performFinish();
-				// TODO: is there a better way of closing?
-				getWizard().getContainer().getShell().close();
-			}
-
-			public void mouseDown(MouseEvent e) {
-			}
-
-			public void mouseUp(MouseEvent e) {
-			}
-
-		});
-
-		List<ITaskAttachment> contextAttachments = AttachmentUtil.getContextAttachments(repository, task);
-
-		Collections.sort(contextAttachments, new Comparator<ITaskAttachment>() {
-
-			public int compare(ITaskAttachment attachment1, ITaskAttachment attachment2) {
-
-				Date created1 = null;
-				Date created2 = null;
-				created1 = attachment1.getCreationDate();
-				created2 = attachment2.getCreationDate();
-				if (created1 != null && created2 != null) {
-					return (-1) * created1.compareTo(created2);
-				} else if (created1 == null && created2 != null) {
-					return 1;
-				} else if (created1 != null && created2 == null) {
-					return -1;
-				} else {
-					return 0;
-				}
-			}
-
-		});
-
-		TableColumn[] columns = new TableColumn[3];
-		columns[0] = new TableColumn(contextTable, SWT.LEFT);
-		columns[0].setText(Messages.ContextRetrieveWizardPage_Date);
-		columns[1] = new TableColumn(contextTable, SWT.LEFT);
-		columns[1].setText(Messages.ContextRetrieveWizardPage_Author);
-		columns[2] = new TableColumn(contextTable, SWT.CENTER);
-		columns[2].setText(Messages.ContextRetrieveWizardPage_Description);
-
-		for (ITaskAttachment attachment : contextAttachments) {
-			TableItem item = new TableItem(contextTable, SWT.NONE);
-			item.setText(0, DateFormat.getInstance().format(attachment.getCreationDate()));
-			IRepositoryPerson author = attachment.getAuthor();
-			if (author != null) {
-				item.setText(1, author.toString());
-			}
-			item.setText(2, attachment.getDescription());
-			item.setData(attachment);
-		}
-
-		for (TableColumn column : columns) {
-			column.pack();
-		}
-
-		contextTable.setLayoutData(new GridData(GridData.FILL_BOTH));
-		setControl(composite);
-		if (contextAttachments.size() > 0) {
-			contextTable.setSelection(0);
-			selectedContextAttachment = contextAttachments.get(0);
-			getWizard().getContainer().updateButtons();
-		}
-		contextTable.setFocus();
-		Dialog.applyDialogFont(composite);
-	}
-
-	public ITaskAttachment getSelectedContext() {
-		return selectedContextAttachment;
-	}
-
-	@Override
-	public boolean isPageComplete() {
-		if (selectedContextAttachment == null) {
-			return false;
-		}
-		return super.isPageComplete();
-	}
-
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/Messages.java b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/Messages.java
deleted file mode 100644
index b0eb38e..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/Messages.java
+++ /dev/null
@@ -1,53 +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.context.ui.wizards;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.context.ui.wizards.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 ContextAttachWizard_Attach_Context;
-
-	public static String ContextAttachWizardPage_Enter_comment;
-
-	public static String ContextAttachWizardPage_Attaches_local_context_to_repository_task;
-
-	public static String ContextAttachWizardPage_Comment_;
-
-	public static String ContextAttachWizardPage_Repository_;
-
-	public static String ContextAttachWizardPage_Task;
-
-	public static String ContextRetrieveWizard_Retrieve_Context;
-
-	public static String ContextRetrieveWizardPage_Author;
-
-	public static String ContextRetrieveWizardPage_Date;
-
-	public static String ContextRetrieveWizardPage_Description;
-
-	public static String ContextRetrieveWizardPage_Select_context;
-
-	public static String ContextRetrieveWizardPage_SELECT_A_CONTEXT_TO_RETTRIEVE_FROM_TABLE_BELOW;
-
-	public static String ContextRetrieveWizardPage_Task;
-}
diff --git a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/messages.properties b/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/messages.properties
deleted file mode 100644
index 03a70b4..0000000
--- a/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/wizards/messages.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-ContextAttachWizard_Attach_Context=Attach Context
-
-ContextAttachWizardPage_Enter_comment=Enter comment
-ContextAttachWizardPage_Attaches_local_context_to_repository_task=Attaches local context to repository task
-ContextAttachWizardPage_Comment_=Comment: 
-ContextAttachWizardPage_Repository_=Repository: 
-
-ContextAttachWizardPage_Task=Task: {0} 
-
-ContextRetrieveWizard_Retrieve_Context=Retrieve Context
-
-ContextRetrieveWizardPage_Author=Author
-ContextRetrieveWizardPage_Date=Date
-ContextRetrieveWizardPage_Description=Description
-ContextRetrieveWizardPage_Select_context=Select context
-ContextRetrieveWizardPage_SELECT_A_CONTEXT_TO_RETTRIEVE_FROM_TABLE_BELOW=Select a context to retrieve from table below.
-ContextRetrieveWizardPage_Task=Task: {0} 
diff --git a/org.eclipse.mylyn.ide-feature/.project b/org.eclipse.mylyn.ide-feature/.project
deleted file mode 100644
index 4495674..0000000
--- a/org.eclipse.mylyn.ide-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.ide-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.ide-feature/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.ide-feature/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1314ffa..0000000
--- a/org.eclipse.mylyn.ide-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.ide-feature/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.ide-feature/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.ide-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) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.ide-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.ide-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 4c9ebcf..0000000
--- a/org.eclipse.mylyn.ide-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:51 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.ide-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.ide-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 867c6c1..0000000
--- a/org.eclipse.mylyn.ide-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Dec 20 14:08:35 PST 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.ide-feature/about.html b/org.eclipse.mylyn.ide-feature/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.ide-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.ide-feature/build.properties b/org.eclipse.mylyn.ide-feature/build.properties
deleted file mode 100644
index dcaa2fa..0000000
--- a/org.eclipse.mylyn.ide-feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.properties,\
-               feature.xml,\
-               epl-v10.html,\
-               license.html,\
-               about.html
-src.includes = about.html
diff --git a/org.eclipse.mylyn.ide-feature/epl-v10.html b/org.eclipse.mylyn.ide-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.mylyn.ide-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.ide-feature/feature.properties b/org.eclipse.mylyn.ide-feature/feature.properties
deleted file mode 100644
index 3d9a9ef..0000000
--- a/org.eclipse.mylyn.ide-feature/feature.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-featureName=Mylyn Bridge: Eclipse IDE
-description=Mylyn Task-Focused UI extensions for the Eclipse IDE.  Provides focusing of common IDE views and editors.
-providerName=Eclipse Mylyn
-copyright=Copyright (c) 2004, 2008 Tasktop Technologies and others. All rights reserved.
-updateSiteName=Mylyn for Eclipse 3.4
-license=\
-Eclipse Foundation Software User Agreement\n\
-\n\
-March 17, 2005\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). 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.\n\
-Applicable Licenses\n\
-\n\
-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 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS modules ("Modules") and made available as downloadable archives ("Downloads").\n\
-\n\
-    * Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
-    * Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java\u2122 ARchive) in a directory named "plugins".\n\
-    * 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 "features". Within a Feature, files named "feature.xml" may contain a list of the names and version 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 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 contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module 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 Eclipse Update Manager, you must agree to a license ("Feature Update License") 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 "license" property of files named "feature.properties" 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.\n\
-\n\
-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):\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\
-    * IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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 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.\n\
-Cryptography\n\
-\n\
-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&apos;s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
diff --git a/org.eclipse.mylyn.ide-feature/feature.xml b/org.eclipse.mylyn.ide-feature/feature.xml
deleted file mode 100644
index f00d093..0000000
--- a/org.eclipse.mylyn.ide-feature/feature.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.mylyn.ide_feature"
-      label="%featureName"
-      version="3.2.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>
-
-   <requires>
-      <import plugin="org.eclipse.team.core"/>
-      <import plugin="org.eclipse.team.cvs.ui"/>
-      <import plugin="org.eclipse.team.cvs.core"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-      <import plugin="org.eclipse.mylyn.tasks.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.tasks.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.team.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.resources.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.context.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.navigator"/>
-      <import plugin="org.eclipse.ui.ide" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylyn.context.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.ui" version="3.0.0" match="compatible"/>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.2.0.qualifier" match="perfect"/>
-      <import feature="org.eclipse.mylyn.team_feature" version="3.2.0.qualifier" match="perfect"/>
-      <import plugin="org.eclipse.team.ui"/>
-      <import plugin="org.eclipse.mylyn.monitor.core" version="3.0.0" match="compatible"/>
-      <import feature="org.eclipse.cvs" version="1.1.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.mylyn.team.cvs"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.bugzilla.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.ide.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.tasks.bugs"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.help.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.mylyn.ide-feature/license.html b/org.eclipse.mylyn.ide-feature/license.html
deleted file mode 100644
index 15a10cf..0000000
--- a/org.eclipse.mylyn.ide-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">

-<title>Eclipse.org Software User Agreement</title>

-</head>

-

-<body lang="EN-US" link=blue vlink=purple>

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>March 17, 2005</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.org CVS repository (&quot;Repository&quot;) in CVS

-   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 Eclipse Update Manager, 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>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</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>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>

-   

-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   

-</body>

-</html>

diff --git a/org.eclipse.mylyn.ide.ant/.classpath b/org.eclipse.mylyn.ide.ant/.classpath
deleted file mode 100644
index 206998b..0000000
--- a/org.eclipse.mylyn.ide.ant/.classpath
+++ /dev/null
@@ -1,13 +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">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/ant/internal/ui/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/core/internal/resources/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/views/markers/internal/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.ide.ant/.cvsignore b/org.eclipse.mylyn.ide.ant/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.ide.ant/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.ide.ant/.project b/org.eclipse.mylyn.ide.ant/.project
deleted file mode 100644
index f42a717..0000000
--- a/org.eclipse.mylyn.ide.ant/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.ide.ant</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.ide.ant/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.ide.ant/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1314ffa..0000000
--- a/org.eclipse.mylyn.ide.ant/.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.ide.ant/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.ide.ant/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.ide.ant/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.ide.ant/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.ide.ant/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.ide.ant/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.ide.ant/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.ide.ant/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.ide.ant/.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.ide.ant/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.ide.ant/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.ide.ant/.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.ide.ant/META-INF/MANIFEST.MF b/org.eclipse.mylyn.ide.ant/META-INF/MANIFEST.MF
deleted file mode 100644
index 7f15f4e..0000000
--- a/org.eclipse.mylyn.ide.ant/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.ide.ant;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ant.ui,
- org.eclipse.core.runtime,
- org.eclipse.debug.ui,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.ide.ui;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-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Activator: org.eclipse.mylyn.internal.ide.ant.AntUiBridgePlugin
-Bundle-ClassPath: .
-Export-Package: org.eclipse.mylyn.internal.ide.ant;x-internal:=true
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.ide.ant/about.html b/org.eclipse.mylyn.ide.ant/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.ide.ant/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.ide.ant/build.properties b/org.eclipse.mylyn.ide.ant/build.properties
deleted file mode 100644
index 69f9f86..0000000
--- a/org.eclipse.mylyn.ide.ant/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
-###############################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/,\
-               plugin.properties
-src.includes = about.html
diff --git a/org.eclipse.mylyn.ide.ant/icons/elcl16/edge-ref-xml.gif b/org.eclipse.mylyn.ide.ant/icons/elcl16/edge-ref-xml.gif
deleted file mode 100644
index 38bf351..0000000
--- a/org.eclipse.mylyn.ide.ant/icons/elcl16/edge-ref-xml.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ant/icons/elcl16/file-xml.gif b/org.eclipse.mylyn.ide.ant/icons/elcl16/file-xml.gif
deleted file mode 100644
index 8af38f9..0000000
--- a/org.eclipse.mylyn.ide.ant/icons/elcl16/file-xml.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ant/icons/elcl16/focus-disabled.gif b/org.eclipse.mylyn.ide.ant/icons/elcl16/focus-disabled.gif
deleted file mode 100644
index 24bbeae..0000000
--- a/org.eclipse.mylyn.ide.ant/icons/elcl16/focus-disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ant/icons/elcl16/focus.gif b/org.eclipse.mylyn.ide.ant/icons/elcl16/focus.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.ide.ant/icons/elcl16/focus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ant/icons/elcl16/interest-decrease.gif b/org.eclipse.mylyn.ide.ant/icons/elcl16/interest-decrease.gif
deleted file mode 100644
index 645a58f..0000000
--- a/org.eclipse.mylyn.ide.ant/icons/elcl16/interest-decrease.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ant/icons/elcl16/interest-increase.gif b/org.eclipse.mylyn.ide.ant/icons/elcl16/interest-increase.gif
deleted file mode 100644
index 98a2586..0000000
--- a/org.eclipse.mylyn.ide.ant/icons/elcl16/interest-increase.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ant/plugin.properties b/org.eclipse.mylyn.ide.ant/plugin.properties
deleted file mode 100644
index 6543e89..0000000
--- a/org.eclipse.mylyn.ide.ant/plugin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Properties file for org.eclipse.mylyn.ide.ant
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn Ant Bridge
-
-AntStructureBridge.name = Ant Structure Bridge
-bridges.activeSearchLabel=XML Search
diff --git a/org.eclipse.mylyn.ide.ant/plugin.xml b/org.eclipse.mylyn.ide.ant/plugin.xml
deleted file mode 100644
index e3a4c46..0000000
--- a/org.eclipse.mylyn.ide.ant/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin> 
-
-   	<extension point="org.eclipse.mylyn.context.core.bridges">
-		<structureBridge
-	        class="org.eclipse.mylyn.internal.ide.ant.AntStructureBridge"
-	        name="%AntStructureBridge.name"
-	        parentContentType="resource"/>
-	</extension>
-	
-	<extension point="org.eclipse.mylyn.context.ui.bridges">
-    	<uiBridge
-          class="org.eclipse.mylyn.internal.ide.ant.AntUiBridge"
-          contentType="build.xml"
-          activeSearchIcon="icons/elcl16/edge-ref-xml.gif"
-	      activeSearchLabel="%bridges.activeSearchLabel"/>
-  	</extension>
-
-</plugin>
diff --git a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntContextLabelProvider.java b/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntContextLabelProvider.java
deleted file mode 100644
index c5465e9..0000000
--- a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntContextLabelProvider.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.ide.ant;
-
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-import org.eclipse.mylyn.internal.context.ui.AbstractContextLabelProvider;
-import org.eclipse.mylyn.internal.context.ui.ContextUiImages;
-import org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public class AntContextLabelProvider extends AbstractContextLabelProvider {
-
-	public static final String LABEL_RELATION = Messages.AntContextLabelProvider_referenced_by;
-
-	@Override
-	protected Image getImage(IInteractionElement node) {
-		return ContextUiImages.getImage(ContextUiImages.FILE_XML);
-	}
-
-	@Override
-	protected Image getImage(IInteractionRelation edge) {
-		return ContextUiImages.getImage(IdeUiBridgePlugin.EDGE_REF_XML);
-	}
-
-	@Override
-	protected String getText(IInteractionElement node) {
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(AntStructureBridge.CONTENT_TYPE);
-		return bridge.getLabel(bridge.getObjectForHandle(node.getHandleIdentifier()));
-	}
-
-	@Override
-	protected String getText(IInteractionRelation edge) {
-		return LABEL_RELATION;
-	}
-
-	@Override
-	protected Image getImageForObject(Object object) {
-		return ContextUiImages.getImage(ContextUiImages.FILE_XML);
-	}
-
-	@Override
-	protected String getTextForObject(Object object) {
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(AntStructureBridge.CONTENT_TYPE);
-		return bridge.getLabel(object);
-	}
-
-}
diff --git a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntEditingMonitor.java b/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntEditingMonitor.java
deleted file mode 100644
index 3f43352..0000000
--- a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntEditingMonitor.java
+++ /dev/null
@@ -1,133 +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.ide.ant;
-
-import org.eclipse.ant.internal.ui.editor.AntEditor;
-import org.eclipse.ant.internal.ui.model.AntElementNode;
-import org.eclipse.ant.internal.ui.model.AntModel;
-import org.eclipse.ant.internal.ui.model.AntProjectNode;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.ide.ui.XmlNodeHelper;
-import org.eclipse.mylyn.monitor.ui.AbstractUserInteractionMonitor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public class AntEditingMonitor extends AbstractUserInteractionMonitor {
-
-	public AntEditingMonitor() {
-		super();
-	}
-
-	@Override
-	protected void handleWorkbenchPartSelection(IWorkbenchPart part, ISelection selection, boolean contributeToContext) {
-		if (part instanceof AntEditor) {
-
-			TextSelection textSelection = null;
-			IEditorInput in = null;
-
-			// assume that we are editing an xml file due to the editor used
-			// this is the build.xml and other ant file editor
-			AntEditor editor = (AntEditor) part;
-
-			if (!(editor.getSelectionProvider().getSelection() instanceof TextSelection)) {
-				return;
-			}
-
-			textSelection = (TextSelection) editor.getSelectionProvider().getSelection();
-			in = editor.getEditorInput();
-
-			// check if we have a text selection
-			if (textSelection != null && editor.getAntModel() != null) {
-				try {
-					AntElementNode node = editor.getAntModel().getNode(textSelection.getOffset(), false);
-					if (node == null) {
-						return;
-					}
-
-					FileEditorInput fei = (FileEditorInput) in;
-//					Method method = AntElementNode.class.getDeclaredMethod("getElementPath", new Class[] {});
-//					method.setAccessible(true);
-//					String path = (String) method.invoke(node, new Object[] {});
-					String path = node.getElementPath();
-					if (path == null) {
-						return;
-					}
-					XmlNodeHelper xnode = new XmlNodeHelper(fei.getFile().getFullPath().toString(), path);
-					super.handleElementSelection(part, xnode, contributeToContext);
-				} catch (Exception e) {
-					StatusHandler.log(new Status(IStatus.ERROR, AntUiBridgePlugin.ID_PLUGIN,
-							"Resolving selection failed", e)); //$NON-NLS-1$
-				}
-			}
-		}
-		return;
-	}
-
-	public static AntElementNode getNode(AntModel antModel, String elementPath) throws SecurityException,
-			NoSuchMethodException {
-		AntProjectNode topNode;
-		try {
-			topNode = antModel.getProjectNode();
-			return getNode(topNode, elementPath);
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	/**
-	 * HACK: using reflection to gain accessibility
-	 */
-	private static AntElementNode getNode(AntElementNode topNode, String elementPath) throws NoSuchMethodException,
-			IllegalAccessException {
-		if (topNode == null) {
-			return null;
-		}
-
-//		Method method = AntElementNode.class.getDeclaredMethod("getElementPath", new Class[] {});
-//		method.setAccessible(true);
-//		String path = (String) method.invoke(topNode, new Object[] {});
-		String path = topNode.getElementPath();
-		if (path.compareTo(elementPath) == 0) {
-			return topNode;
-		}
-
-		if (topNode.getChildNodes() == null) {
-			return null;
-		}
-
-		for (Object obj : topNode.getChildNodes()) {
-			if (obj instanceof AntElementNode) {
-				AntElementNode node = (AntElementNode) obj;
-//				path = (String) method.invoke(node, new Object[] {});
-				path = node.getElementPath();
-				if (path.compareTo(elementPath) == 0) {
-					return node;
-				} else {
-					AntElementNode node2 = getNode(node, elementPath);
-					if (node2 != null) {
-						return node2;
-					}
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntStructureBridge.java b/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntStructureBridge.java
deleted file mode 100644
index 1897946..0000000
--- a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntStructureBridge.java
+++ /dev/null
@@ -1,352 +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.ide.ant;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.editor.AntEditor;
-import org.eclipse.ant.internal.ui.editor.text.AntAnnotationModel;
-import org.eclipse.ant.internal.ui.model.AntElementNode;
-import org.eclipse.ant.internal.ui.model.AntModel;
-import org.eclipse.ant.internal.ui.model.IProblemRequestor;
-import org.eclipse.ant.internal.ui.model.LocationProvider;
-import org.eclipse.core.internal.resources.File;
-import org.eclipse.core.internal.resources.Marker;
-import org.eclipse.core.internal.resources.Workspace;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-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.ide.ui.XmlNodeHelper;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.views.markers.internal.ConcreteMarker;
-
-/**
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public class AntStructureBridge extends AbstractContextStructureBridge {
-
-	public final static String CONTENT_TYPE = "build.xml"; //$NON-NLS-1$
-
-	private static final char HANDLE_PATH_SEPARATOR = ';';
-
-	/**
-	 * @see org.eclipse.mylyn.context.core.AbstractContextStructureBridge#getContentType()
-	 */
-	@Override
-	public String getContentType() {
-		return CONTENT_TYPE;
-	}
-
-	@Override
-	public String getContentType(String elementHandle) {
-		if (elementHandle.endsWith(".xml")) { //$NON-NLS-1$
-			return parentContentType;
-		} else {
-			return CONTENT_TYPE;
-		}
-	}
-
-	@Override
-	public List<String> getChildHandles(String handle) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.context.core.AbstractContextStructureBridge#getParentHandle(java.lang.String)
-	 */
-	@Override
-	public String getParentHandle(String handle) {
-		Object o = getObjectForHandle(handle);
-
-		// we can only get the parent if the element is an AntElementNode
-		if (o instanceof AntElementNode) {
-
-			// try to get the parent node
-			AntElementNode parent = ((AntElementNode) o).getParentNode();
-
-			if (parent != null) {
-				// get the handle for the parent node
-				return getHandleIdentifier(parent);
-			} else {
-				// if the parent is null, we just need to return the handle for
-				// the file
-				int delimeterIndex = handle.indexOf(";"); //$NON-NLS-1$
-				if (delimeterIndex != -1) {
-					String parentHandle = handle.substring(0, delimeterIndex);
-					return parentHandle;
-				} else {
-					return null;
-				}
-			}
-		} else if (o instanceof IFile) {
-			AbstractContextStructureBridge parentBridge = ContextCore.getStructureBridge(parentContentType);
-			return parentBridge.getParentHandle(handle);
-		} else {
-			// return null if we can't get a parents
-			return null;
-		}
-	}
-
-	/**
-	 * TODO: performance issue?
-	 */
-	@Override
-	public Object getObjectForHandle(String handle) {
-		try {
-			if (handle == null) {
-				return null;
-			}
-			int first = handle.indexOf(HANDLE_PATH_SEPARATOR);
-			String filename = ""; //$NON-NLS-1$
-			if (first == -1) {
-				// we have just the filename, so return the IFile for this
-				// filename
-				filename = handle;
-				IPath path = new Path(filename);
-				IFile f = (IFile) ((Workspace) ResourcesPlugin.getWorkspace()).newResource(path, IResource.FILE);
-				return f;
-			} else {
-				// we have an element since there is a line number
-				// get the filename from the handle
-				filename = handle.substring(0, first);
-			}
-
-			// get the file and create a new FileEditorInput
-			IPath path = new Path(filename);
-			IFile file = (IFile) ((Workspace) ResourcesPlugin.getWorkspace()).newResource(path, IResource.FILE);
-			FileEditorInput fei = new FileEditorInput(file);
-
-			// get the line number that the element is on
-			String elementPath = handle.substring(first + 1);
-			if (elementPath.equals("")) { //$NON-NLS-1$
-				return file;
-			} else {
-				// XXX needed if the editor is the only way to get the model
-				// get the active editor, which should be the ant editor so we
-				// can get the AntModel
-				IEditorPart editorPart = PlatformUI.getWorkbench()
-						.getActiveWorkbenchWindow()
-						.getActivePage()
-						.getActiveEditor();
-				if (editorPart instanceof AntEditor) {
-					AntModel antModel = ((AntEditor) editorPart).getAntModel();
-					if (antModel != null) {
-						return AntEditingMonitor.getNode(antModel, elementPath);
-					}
-				} else {
-					String content = XmlNodeHelper.getContents(file.getContents());
-					IDocument d = new Document(content);
-					// create the ant model and get the element from it
-					IProblemRequestor p = new AntAnnotationModel(file);
-					AntModel am = new AntModel(d, p, new LocationProvider(fei));
-					am.reconcile();
-					return AntEditingMonitor.getNode(am, elementPath);
-				}
-			}
-		} catch (Throwable t) {
-			// ignore this, means that the file or node doesn't exist
-		}
-		return null;
-	}
-
-	/**
-	 * Handle is filename;XPath
-	 * 
-	 * @see org.eclipse.mylyn.context.core.AbstractContextStructureBridge#getHandleIdentifier(java.lang.Object)
-	 */
-	@Override
-	public String getHandleIdentifier(Object object) {
-		// we can only create handles for AntElementNodes and build.xml Files
-		if (object instanceof XmlNodeHelper) {
-			return ((XmlNodeHelper) object).getHandle();
-		} else if (object instanceof AntElementNode) {
-			AntElementNode node = (AntElementNode) object;
-			String path = node.getElementPath();
-			if (path == null || node.getIFile() == null) {
-				return null;
-			}
-			XmlNodeHelper helper = new XmlNodeHelper(node.getIFile().getFullPath().toString(), path);
-			return helper.getHandle();
-		} else if (object instanceof File) {
-			File file = (File) object;
-			// get the handle for the build.xml file
-			if (file.getFullPath().toString().endsWith("build.xml")) { //$NON-NLS-1$
-				return file.getFullPath().toString();
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.context.core.AbstractContextStructureBridge#getLabel(java.lang.Object)
-	 */
-	@Override
-	public String getLabel(Object object) {
-		if (object instanceof AntElementNode) {
-			AntElementNode n = (AntElementNode) object;
-			String name = n.getIFile().getName() + ": " + n.getName(); //$NON-NLS-1$
-			return name;
-		} else if (object instanceof File) {
-			File file = (File) object;
-			if (file.getFullPath().toString().endsWith("build.xml")) { //$NON-NLS-1$
-				return "build.xml"; //$NON-NLS-1$
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.context.core.AbstractContextStructureBridge#canBeLandmark(Object) TODO: make a non-handle
-	 *      based test
-	 */
-	@Override
-	public boolean canBeLandmark(String handle) {
-		if (handle != null) {
-			return handle.indexOf(';') == -1;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.context.core.AbstractContextStructureBridge#acceptsObject(java.lang.Object)
-	 */
-	@Override
-	public boolean acceptsObject(Object object) {
-		// we accept AntElementNode and build.xml File objects
-		if (object instanceof AntElementNode) {
-			return true;
-		} else if (object instanceof XmlNodeHelper) {
-			if (((XmlNodeHelper) object).getFilename().endsWith("build.xml")) { //$NON-NLS-1$
-				return true;
-			}
-		} else if (object instanceof File) {
-			File file = (File) object;
-			if (file.getFullPath().toString().endsWith("build.xml")) { //$NON-NLS-1$
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.context.core.AbstractContextStructureBridge#canFilter(java.lang.Object)
-	 */
-	@Override
-	public boolean canFilter(Object element) {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.context.core.AbstractContextStructureBridge#isDocument(java.lang.String)
-	 */
-	@Override
-	public boolean isDocument(String handle) {
-		return handle.indexOf(';') == -1;
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.context.core.AbstractContextStructureBridge#getHandleForOffsetInObject(Object, int)
-	 */
-	@Override
-	public String getHandleForOffsetInObject(Object object, int offset) {
-		if (object == null) {
-			return null;
-		}
-
-		IResource markerResource = null;
-		try {
-			if (object instanceof ConcreteMarker) {
-				markerResource = ((ConcreteMarker) object).getMarker().getResource();
-			} else if (object instanceof Marker) {
-				markerResource = ((Marker) object).getResource();
-			} else {
-				return null;
-			}
-		} catch (Exception e) {
-			return null;
-		}
-
-		if (markerResource != null) {
-			// we can only return a handle if the resource is build.xml
-			try {
-				if (markerResource instanceof IFile) {
-					IFile file = (IFile) markerResource;
-					if (file.getFullPath().toString().endsWith("build.xml")) { //$NON-NLS-1$
-						return file.getFullPath().toString();
-					} else {
-						return null;
-					}
-				}
-				return null;
-			} catch (Throwable t) {
-				StatusHandler.log(new Status(IStatus.ERROR, AntUiBridgePlugin.ID_PLUGIN, "Could not find element for: " //$NON-NLS-1$
-						+ object, t));
-				return null;
-			}
-		} else if (object instanceof IFile) {
-			try {
-				IFile file = (IFile) object;
-				if (file.getFullPath().toString().endsWith("build.xml")) { //$NON-NLS-1$
-					FileEditorInput fei = new FileEditorInput(file);
-					String content = XmlNodeHelper.getContents(file.getContents());
-					IDocument d = new Document(content);
-					// create the ant model and get the element from it
-					IProblemRequestor p = new AntAnnotationModel(file);
-					AntModel am = new AntModel(d, p, new LocationProvider(fei));
-					am.reconcile();
-
-					AntElementNode node = am.getNode(offset, false);
-//					Method method = AntElementNode.class.getDeclaredMethod("getElementPath", new Class[] {});
-//					method.setAccessible(true);
-//					String path = (String) method.invoke(node, new Object[] {});
-					String path = node.getElementPath();
-					if (path == null) {
-						return null;
-					}
-					String handle = new XmlNodeHelper(file.getFullPath().toString(), path).getHandle();
-					return handle;
-				}
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.WARNING, AntUiBridgePlugin.ID_PLUGIN,
-						"Unable to get handle for offset in object", e)); //$NON-NLS-1$
-			}
-		}
-		return null;
-	}
-
-//	public IProject getProjectForObject(Object object) {
-//		while (!(object instanceof IFile)) {
-//			String handle = getParentHandle(getHandleIdentifier(object));
-//			if (handle == null)
-//				break;
-//			object = getObjectForHandle(handle);
-//		}
-//		if (object instanceof IFile && acceptsObject(object)) {
-//			return ((IFile) object).getProject();
-//		}
-//		return null;
-//	}
-}
diff --git a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntUiBridge.java b/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntUiBridge.java
deleted file mode 100644
index ddf7e37..0000000
--- a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntUiBridge.java
+++ /dev/null
@@ -1,194 +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.ide.ant;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.editor.AntEditor;
-import org.eclipse.ant.internal.ui.editor.outline.AntEditorContentOutlinePage;
-import org.eclipse.core.internal.resources.Workspace;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * @author Mik Kersten
- */
-public class AntUiBridge extends AbstractContextUiBridge {
-
-	/**
-	 * @see org.eclipse.mylyn.context.ui.AbstractContextUiBridge#open(org.eclipse.mylyn.context.core.IInteractionElement)
-	 */
-	@Override
-	public void open(IInteractionElement node) {
-		// get the handle of the node
-		String handle = node.getHandleIdentifier();
-
-		int first = handle.indexOf(";"); //$NON-NLS-1$
-		String filename = ""; //$NON-NLS-1$
-		if (first == -1) {
-			filename = handle;
-		} else {
-			filename = handle.substring(0, first);
-		}
-
-		try {
-			// get the file
-			IPath path = new Path(filename);
-			IFile f = (IFile) ((Workspace) ResourcesPlugin.getWorkspace()).newResource(path, IResource.FILE);
-
-			// open the xml file looking at the proper line
-			IEditorPart editor = openInEditor(f, true);
-
-			// if the editor is null, we had a problem and should return
-			if (editor == null) {
-				StatusHandler.log(new Status(IStatus.ERROR, AntUiBridgePlugin.ID_PLUGIN,
-						"Unable to open editor for file: " + filename)); //$NON-NLS-1$
-				return;
-			}
-
-			// get the contents and create a new document so that we can get
-			// the offsets to highlight
-			// String content = XmlNodeHelper.getContents(f.getContents());
-
-			// IDocument d = new Document(content);
-
-			// if(first != -1){
-			// int start = Integer.parseInt(handle.substring(first + 1));
-			//
-			// // get the offsets for the element
-			// int startOffset = d.getLineOffset(start);
-			// int length = 0;
-			//                
-			// // set the selection if the selection provider is not null
-			// ISelectionProvider selectionProvider =
-			// editor.getEditorSite().getSelectionProvider();
-			// if(selectionProvider != null)
-			// selectionProvider.setSelection(new TextSelection(startOffset,
-			// length));
-			// }
-
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, AntUiBridgePlugin.ID_PLUGIN, "Could not open XML editor", e)); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Open a file in the appropriate editor
-	 * 
-	 * @param file
-	 *            The IFile to open
-	 * @param activate
-	 *            Whether to activate the editor or not
-	 * @return The IEditorPart that the file opened in
-	 * @throws PartInitException
-	 */
-	private IEditorPart openInEditor(IFile file, boolean activate) throws PartInitException {
-		if (file != null) {
-			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			if (page != null && file.exists()) {
-				try {
-					IEditorPart editorPart = IDE.openEditor(page, file, activate);
-					return editorPart;
-				} catch (Exception e) {
-					// ignore this
-				}
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public void close(IInteractionElement node) {
-		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		if (page != null) {
-			List<IEditorReference> toClose = new ArrayList<IEditorReference>();
-			for (IEditorReference reference : page.getEditorReferences()) {
-				try {
-					if (reference.getEditorInput() instanceof IFileEditorInput) {
-						IFileEditorInput input = (IFileEditorInput) reference.getEditorInput();
-						if (input.getFile().getFullPath().toString().equals(node.getHandleIdentifier())) {
-							toClose.add(reference);
-						}
-					}
-				} catch (PartInitException e) {
-					// ignore
-				}
-			}
-			if (toClose.size() > 0) {
-				page.closeEditors(toClose.toArray(new IEditorReference[toClose.size()]), true);
-			}
-		}
-	}
-
-	@Override
-	public boolean acceptsEditor(IEditorPart editorPart) {
-		return editorPart instanceof AntEditor;
-	}
-
-	/**
-	 * HACK: use reflection to get the TreeViewer
-	 */
-	@Override
-	public List<TreeViewer> getContentOutlineViewers(IEditorPart editor) {
-		List<TreeViewer> viewers = new ArrayList<TreeViewer>();
-		if (editor instanceof AntEditor) {
-			try {
-				AntEditor ae = (AntEditor) editor;
-				AntEditorContentOutlinePage outline = (AntEditorContentOutlinePage) ae.getAdapter(IContentOutlinePage.class);
-				Class<?> clazz = ContentOutlinePage.class;
-				Method method = clazz.getDeclaredMethod("getTreeViewer", new Class[] {}); //$NON-NLS-1$
-				method.setAccessible(true);
-				viewers.add((TreeViewer) method.invoke(outline, new Object[] {}));
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.WARNING, AntUiBridgePlugin.ID_PLUGIN, "Unable to get outline", e)); //$NON-NLS-1$
-			}
-		}
-		return viewers;
-	}
-
-	@Override
-	public Object getObjectForTextSelection(TextSelection selection, IEditorPart editor) {
-		return null;
-	}
-
-	@Override
-	public IInteractionElement getElement(IEditorInput input) {
-		return null;
-	}
-
-	@Override
-	public String getContentType() {
-		return AntStructureBridge.CONTENT_TYPE;
-	}
-}
diff --git a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntUiBridgePlugin.java b/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntUiBridgePlugin.java
deleted file mode 100644
index 8229312..0000000
--- a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/AntUiBridgePlugin.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.ide.ant;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.mylyn.context.ui.IContextUiStartup;
-import org.eclipse.mylyn.monitor.ui.MonitorUi;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class AntUiBridgePlugin extends Plugin {
-
-	public static class AntUiBridgePluginStartup implements IContextUiStartup {
-
-		public void lazyStartup() {
-			AntUiBridgePlugin.getDefault().lazyStart();
-		}
-
-	}
-
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.ide.ant"; //$NON-NLS-1$
-
-	private static AntUiBridgePlugin INSTANCE;
-
-	public static AntUiBridgePlugin getDefault() {
-		return INSTANCE;
-	}
-
-	private AntEditingMonitor antEditingMonitor;
-
-	public AntUiBridgePlugin() {
-		INSTANCE = this;
-	}
-
-	private void lazyStart() {
-		antEditingMonitor = new AntEditingMonitor();
-		MonitorUi.getSelectionMonitors().add(antEditingMonitor);
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		if (antEditingMonitor != null) {
-			MonitorUi.getSelectionMonitors().remove(antEditingMonitor);
-		}
-
-		super.stop(context);
-	}
-
-}
diff --git a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/Messages.java b/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/Messages.java
deleted file mode 100644
index 80e59ee..0000000
--- a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/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.ide.ant;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.ide.ant.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 AntContextLabelProvider_referenced_by;
-}
diff --git a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/messages.properties b/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/messages.properties
deleted file mode 100644
index fa835be..0000000
--- a/org.eclipse.mylyn.ide.ant/src/org/eclipse/mylyn/internal/ide/ant/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-AntContextLabelProvider_referenced_by=referenced by
diff --git a/org.eclipse.mylyn.ide.tests/.classpath b/org.eclipse.mylyn.ide.tests/.classpath
deleted file mode 100644
index 77f8017..0000000
--- a/org.eclipse.mylyn.ide.tests/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry 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.ide.tests/.cvsignore b/org.eclipse.mylyn.ide.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.ide.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.ide.tests/.project b/org.eclipse.mylyn.ide.tests/.project
deleted file mode 100644
index d0c5ed3..0000000
--- a/org.eclipse.mylyn.ide.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.ide.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.ide.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.ide.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 01d52ea..0000000
--- a/org.eclipse.mylyn.ide.tests/.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=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.ide.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.ide.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.ide.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.ide.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.ide.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.ide.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.ide.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.ide.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.ide.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.ide.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.ide.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.ide.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.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.ide.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 59cd799..0000000
--- a/org.eclipse.mylyn.ide.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn IDE Tests
-Bundle-SymbolicName: org.eclipse.mylyn.ide.tests
-Bundle-Version: 0.0.0
-Bundle-Vendor: Eclipse Mylyn
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jface,
- org.eclipse.ui.workbench,
- org.junit,
- org.eclipse.mylyn.context.core,
- org.eclipse.mylyn.context.tests,
- org.eclipse.mylyn.team.ui,
- org.eclipse.mylyn.resources.ui
-Export-Package: org.eclipse.mylyn.ide.tests;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.ide.tests/about.html b/org.eclipse.mylyn.ide.tests/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.ide.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.ide.tests/build.properties b/org.eclipse.mylyn.ide.tests/build.properties
deleted file mode 100644
index a64e887..0000000
--- a/org.eclipse.mylyn.ide.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html
-jre.compilation.profile = J2SE-1.5
-src.includes = about.html
diff --git a/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/AllIdeTests.java b/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/AllIdeTests.java
deleted file mode 100644
index f9e03cc..0000000
--- a/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/AllIdeTests.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.ide.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Mik Kersten
- */
-public class AllIdeTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.mylyn.ide.tests");
-
-		// $JUnit-BEGIN$
-		suite.addTestSuite(OpenCorrespondingTaskActionTest.class);
-		suite.addTestSuite(IdeStartupTest.class);
-		suite.addTestSuite(IdePreferencesTest.class);
-		// $JUnit-END$
-
-		return suite;
-	}
-}
diff --git a/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/IdePreferencesTest.java b/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/IdePreferencesTest.java
deleted file mode 100644
index 0fc0705..0000000
--- a/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/IdePreferencesTest.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.ide.tests;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-
-/**
- * @author Mik Kersten
- */
-public class IdePreferencesTest extends TestCase {
-
-	public void testExclusionPatterns() {
-		ResourcesUiBridgePlugin.getDefault().setExcludedResourcePatterns(new HashSet<String>());
-		assertEquals(0, ResourcesUiBridgePlugin.getDefault().getExcludedResourcePatterns().size());
-
-		Set<String> ignored = new HashSet<String>();
-		ignored.add("one*");
-		ignored.add(".two");
-
-		ResourcesUiBridgePlugin.getDefault().setExcludedResourcePatterns(ignored);
-		Set<String> read = ResourcesUiBridgePlugin.getDefault().getExcludedResourcePatterns();
-		assertEquals(2, read.size());
-		assertTrue(read.contains("one*"));
-		assertTrue(read.contains(".two"));
-	}
-
-}
diff --git a/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/IdeStartupTest.java b/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/IdeStartupTest.java
deleted file mode 100644
index 7c6a042..0000000
--- a/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/IdeStartupTest.java
+++ /dev/null
@@ -1,44 +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.ide.tests;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.tests.support.TestUtil;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.team.ui.ContextActiveChangeSetManager;
-
-/**
- * @author Mik Kersten
- */
-public class IdeStartupTest extends TestCase {
-
-	@Override
-	protected void setUp() throws Exception {
-		TestUtil.triggerContextUiLazyStart();
-	}
-
-	public void testChangeSetsStartup() {
-		List<AbstractContextListener> listeners = ContextCorePlugin.getContextManager().getListeners();
-		boolean containsManager = false;
-		for (AbstractContextListener listener : listeners) {
-			if (listener instanceof ContextActiveChangeSetManager) {
-				containsManager = true;
-			}
-		}
-		assertTrue(containsManager);
-	}
-
-}
diff --git a/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/OpenCorrespondingTaskActionTest.java b/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/OpenCorrespondingTaskActionTest.java
deleted file mode 100644
index 49721a0..0000000
--- a/org.eclipse.mylyn.ide.tests/src/org/eclipse/mylyn/ide/tests/OpenCorrespondingTaskActionTest.java
+++ /dev/null
@@ -1,47 +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.ide.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.team.ui.actions.OpenCorrespondingTaskAction;
-
-/**
- * @author Mik Kersten
- */
-public class OpenCorrespondingTaskActionTest extends TestCase {
-
-	@Override
-	protected void setUp() throws Exception {
-		// ignore
-		super.setUp();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		// ignore
-		super.tearDown();
-	}
-
-	public void test07LegacyMatching() {
-		String label = "Progress on: 123: foo \nhttps://bugs.eclipse.org";
-		String id = OpenCorrespondingTaskAction.getTaskIdFromLegacy07Label(label);
-		assertEquals("123", id);
-	}
-
-	public void testUrlMatching() {
-		String label = "bla bla\nhttp://foo.bar-123 bla bla";
-		String id = OpenCorrespondingTaskAction.getUrlFromComment(label);
-		assertEquals("http://foo.bar-123", id);
-	}
-
-}
diff --git a/org.eclipse.mylyn.ide.ui/.classpath b/org.eclipse.mylyn.ide.ui/.classpath
deleted file mode 100644
index e1ecf4b..0000000
--- a/org.eclipse.mylyn.ide.ui/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/internal/views/markers/*"/>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/views/markers/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.ide.ui/.cvsignore b/org.eclipse.mylyn.ide.ui/.cvsignore
deleted file mode 100644
index 4a98758..0000000
--- a/org.eclipse.mylyn.ide.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-.fbwarnings
diff --git a/org.eclipse.mylyn.ide.ui/.project b/org.eclipse.mylyn.ide.ui/.project
deleted file mode 100644
index 52080aa..0000000
--- a/org.eclipse.mylyn.ide.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.ide.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.ide.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.ide.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.ide.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.ide.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.ide.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.ide.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.ide.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.ide.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.ide.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.ide.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.ide.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.ide.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.ide.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.ide.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 5937a85..0000000
--- a/org.eclipse.mylyn.ide.ui/.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.ide.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 63bbbb7..0000000
--- a/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.ide.ui;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Activator: org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.ui.navigator,
- org.eclipse.ui.ide;bundle-version="3.4.0",
- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.resources.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.mylyn.ide.ui,
- org.eclipse.mylyn.internal.ide.ui;x-internal:=true,
- org.eclipse.mylyn.internal.ide.ui.actions;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.ide.ui/about.html b/org.eclipse.mylyn.ide.ui/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.ide.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.ide.ui/build-user.xml b/org.eclipse.mylyn.ide.ui/build-user.xml
deleted file mode 100644
index 6097713..0000000
--- a/org.eclipse.mylyn.ide.ui/build-user.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<target name="help">
-    <echo message="Please run: $ ant -v -projecthelp"/>
-</target>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.ide.ui/build.properties b/org.eclipse.mylyn.ide.ui/build.properties
deleted file mode 100644
index e4d6cf5..0000000
--- a/org.eclipse.mylyn.ide.ui/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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/,\
-               plugin.xml,\
-               icons/,\
-               doc/,\
-               about.html,\
-               .,\
-               plugin.properties
-src.includes = about.html
-jre.compilation.profile = J2SE-1.5
-source.. = src/
diff --git a/org.eclipse.mylyn.ide.ui/doc/book.css b/org.eclipse.mylyn.ide.ui/doc/book.css
deleted file mode 100644
index faa4199..0000000
--- a/org.eclipse.mylyn.ide.ui/doc/book.css
+++ /dev/null
@@ -1 +0,0 @@
-@import "../../PRODUCT_PLUGIN/book.css";
diff --git a/org.eclipse.mylyn.ide.ui/doc/concepts.html b/org.eclipse.mylyn.ide.ui/doc/concepts.html
deleted file mode 100644
index 2ce56b3..0000000
--- a/org.eclipse.mylyn.ide.ui/doc/concepts.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="STYLESHEET" href="book.css" charset="ISO-8859-1"
-	type="text/css">
-<title>Mylar New & Noteworthy</title>
-</head>
-<body>
-<h2>Degree of Interest</h2>
-<p>After you have activated a task, Mylar builds up a <i>degree of interest</i> model 
-and uses this model to filter Eclipse views.&nbsp; Press the Mylar glasses on 
-the view to toggle the filtering. To temporarily un filter a node Alt+click it.</p><p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/filtering-navigator.gif" width="353" height="195"></p>
-			You can also directly manually manipulate the 
-			interest level of one or more elements by right clicking them and using the two 
-			Mylar actions in the popup menu.&nbsp; Keyboard shortcuts for these 
-			are Ctrl+Alt+Shift+Up Arrow for Make Landmark, and&nbsp; 
-			Ctrl+Alt+Shift+Down Arrow for Make Less Interesting. <p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/interest-manipulate.gif" width="262" height="65"></p>Resources that are always 
-			considered interesting can be configured to always show when the 
-			interest filter is on, via the root Mylar preference page.&nbsp; 
-			Note that the parent of the resource, e.g. the project or folder, 
-			needs to be interesting for it's children to show.&nbsp;
-			<p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/filtering-exclusion.gif" width="420" height="240">
-
-</body>
-</html>
diff --git a/org.eclipse.mylyn.ide.ui/doc/navigation.html b/org.eclipse.mylyn.ide.ui/doc/navigation.html
deleted file mode 100644
index 34b1f7d..0000000
--- a/org.eclipse.mylyn.ide.ui/doc/navigation.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="STYLESHEET" href="book.css" charset="ISO-8859-1"
-	type="text/css">
-<title>Mylar New & Noteworthy</title>
-</head>
-<body>
-<h2>Workbench Navigation and Search</h2>
-The automatically updated Mylar Task 
-			Context working set can be searched as any other working set, either 
-			via the popup menus or using the search dialog.&nbsp; For example, 
-			to find all System.out/err calls before checking in, search for 
-			&quot;System.&quot; within the task context. To quickly search all references 
-			click Alt+Shift+G.<p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/search-context.gif" width="470" height="133"></p>
-
-			</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.ide.ui/doc/toc.xml b/org.eclipse.mylyn.ide.ui/doc/toc.xml
deleted file mode 100644
index f8f85bd..0000000
--- a/org.eclipse.mylyn.ide.ui/doc/toc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc link_to="../org.eclipse.mylyn.doc/doc/toc.xml#concepts" label="Concepts">
-	<!-- <topic label="Concepts" href="doc/concepts.html"> 
-	</topic>
-	-->
-</toc>
-
-
-
diff --git a/org.eclipse.mylyn.ide.ui/icons/elcl16/edge-ref-xml.gif b/org.eclipse.mylyn.ide.ui/icons/elcl16/edge-ref-xml.gif
deleted file mode 100644
index 38bf351..0000000
--- a/org.eclipse.mylyn.ide.ui/icons/elcl16/edge-ref-xml.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ui/icons/elcl16/file-xml.gif b/org.eclipse.mylyn.ide.ui/icons/elcl16/file-xml.gif
deleted file mode 100644
index 8af38f9..0000000
--- a/org.eclipse.mylyn.ide.ui/icons/elcl16/file-xml.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ui/icons/elcl16/focus-disabled.gif b/org.eclipse.mylyn.ide.ui/icons/elcl16/focus-disabled.gif
deleted file mode 100644
index 24bbeae..0000000
--- a/org.eclipse.mylyn.ide.ui/icons/elcl16/focus-disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ui/icons/elcl16/focus.gif b/org.eclipse.mylyn.ide.ui/icons/elcl16/focus.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.ide.ui/icons/elcl16/focus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ui/icons/elcl16/interest-decrease.gif b/org.eclipse.mylyn.ide.ui/icons/elcl16/interest-decrease.gif
deleted file mode 100644
index 645a58f..0000000
--- a/org.eclipse.mylyn.ide.ui/icons/elcl16/interest-decrease.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ui/icons/elcl16/interest-increase.gif b/org.eclipse.mylyn.ide.ui/icons/elcl16/interest-increase.gif
deleted file mode 100644
index 98a2586..0000000
--- a/org.eclipse.mylyn.ide.ui/icons/elcl16/interest-increase.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ui/icons/elcl16/task-repository.gif b/org.eclipse.mylyn.ide.ui/icons/elcl16/task-repository.gif
deleted file mode 100644
index 78470a3..0000000
--- a/org.eclipse.mylyn.ide.ui/icons/elcl16/task-repository.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ui/icons/etool16/task-repository-new.gif b/org.eclipse.mylyn.ide.ui/icons/etool16/task-repository-new.gif
deleted file mode 100644
index 5f33961..0000000
--- a/org.eclipse.mylyn.ide.ui/icons/etool16/task-repository-new.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.ide.ui/plugin.properties b/org.eclipse.mylyn.ide.ui/plugin.properties
deleted file mode 100644
index 0ba91a4..0000000
--- a/org.eclipse.mylyn.ide.ui/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-#Properties file for org.eclipse.mylyn.ide.ui
-
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn IDE UI
-
-FocusProjectExplorerAction.label = Focus on Active Task
-FocusProjectExplorerAction.tooltip = Focus on Active Task (Alt+click to reveal filtered elements)
-FocusResourceNavigatorAction.label = Focus on Active Task
-FocusResourceNavigatorAction.tooltip = Focus on Active Task (Alt+click to reveal filtered elements)
-FocusProblemsListAction.label = Focus on Active Task
-FocusProblemsListAction.tooltip = Focus on Active Task
-FocusAllMarkersViewAction.label = Focus on Active Task
-FocusAllMarkersViewAction.tooltip = Focus on Active Task
-FocusTaskMarkersViewAction.label = Focus on Active Task
-FocusTaskMarkersViewAction.tooltip = Focus on Active Task
-FocusBookmarkMarkersViewAction.label = Focus on Active Task
-FocusBookmarkMarkersViewAction.tooltip = Focus on Active Task
diff --git a/org.eclipse.mylyn.ide.ui/plugin.xml b/org.eclipse.mylyn.ide.ui/plugin.xml
deleted file mode 100644
index 576e019..0000000
--- a/org.eclipse.mylyn.ide.ui/plugin.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin> 
-
-    <extension point="org.eclipse.ui.viewActions"> 
-	  <viewContribution 
-		id="org.eclipse.mylyn.ui.projectexplorer.filter" 
-   		targetID="org.eclipse.ui.navigator.ProjectExplorer">
-    	<action
-           class="org.eclipse.mylyn.internal.ide.ui.actions.FocusProjectExplorerAction"
-           disabledIcon="icons/elcl16/focus-disabled.gif"
-           enablesFor="*"
-           icon="icons/elcl16/focus.gif"
-           id="org.eclipse.mylyn.ide.ui.actions.focus.projectExplorer"
-           label="%FocusProjectExplorerAction.label"
-           menubarPath="mylyn"
-           style="toggle"
-           toolbarPath="mylyn"
-           tooltip="%FocusProjectExplorerAction.tooltip">
-        <enablement>
-           <systemProperty
-                 name="org.eclipse.mylyn.context.core.context.active"
-                 value="true">
-           </systemProperty>
-        </enablement> 
-  		</action> 
-      </viewContribution> 
-      
-	  <viewContribution 
-		id="org.eclipse.mylyn.ui.resource.navigator.filter" 
-   		targetID="org.eclipse.ui.views.ResourceNavigator">
-    	<action
-           class="org.eclipse.mylyn.internal.ide.ui.actions.FocusResourceNavigatorAction"
-           disabledIcon="icons/elcl16/focus-disabled.gif"
-           enablesFor="*"
-           icon="icons/elcl16/focus.gif"
-           id="org.eclipse.mylyn.ide.ui.actions.focus.resourceNavigator"
-           label="%FocusResourceNavigatorAction.label"
-           menubarPath="mylyn"
-           style="toggle"
-           toolbarPath="mylyn"
-           tooltip="%FocusResourceNavigatorAction.tooltip">
-        <enablement>
-           <systemProperty
-                 name="org.eclipse.mylyn.context.core.context.active"
-                 value="true">
-           </systemProperty>
-        </enablement> 
-  		</action> 
-      </viewContribution> 
-      <viewContribution 
-		id="org.eclipse.mylyn.problems.contribution" 
-   		targetID="org.eclipse.ui.views.ProblemView">
-    	<action
-           class="org.eclipse.mylyn.internal.ide.ui.actions.FocusProblemsListAction"
-           disabledIcon="icons/elcl16/focus-disabled.gif"
-           enablesFor="*"
-           icon="icons/elcl16/focus.gif"
-           id="org.eclipse.mylyn.ide.ui.actions.focus.markers.problems"
-           label="%FocusProblemsListAction.label"
-           menubarPath="mylyn"
-           style="toggle"
-           toolbarPath="mylyn"
-           tooltip="%FocusProblemsListAction.tooltip">
-             <enablement>
-                <systemProperty
-                      name="org.eclipse.mylyn.context.core.context.active"
-                      value="true">
-                </systemProperty>
-             </enablement>
-  		</action>  
-      </viewContribution> 
-
-      <viewContribution 
-		id="org.eclipse.mylyn.markers.all.contribution" 
-   		targetID="org.eclipse.ui.views.AllMarkersView">
-    	<action
-           class="org.eclipse.mylyn.internal.ide.ui.actions.FocusAllMarkersViewAction"
-           disabledIcon="icons/elcl16/focus-disabled.gif"
-           enablesFor="*"
-           icon="icons/elcl16/focus.gif"
-           id="org.eclipse.mylyn.ide.ui.actions.focus.markers.all"
-           label="%FocusAllMarkersViewAction.label"
-           menubarPath="mylyn"
-           style="toggle"
-           toolbarPath="mylyn"
-           tooltip="%FocusAllMarkersViewAction.tooltip">
-        <enablement>
-           <systemProperty
-                 name="org.eclipse.mylyn.context.core.context.active"
-                 value="true">
-           </systemProperty>
-        </enablement>
-  		</action>  
-      </viewContribution>
-      
-	  <viewContribution 
-		id="org.eclipse.mylyn.markers.tasks.contribution" 
-   		targetID="org.eclipse.ui.views.TaskList">
-    	<action
-           class="org.eclipse.mylyn.internal.ide.ui.actions.FocusTaskMarkersViewAction"
-           disabledIcon="icons/elcl16/focus-disabled.gif"
-           enablesFor="*"
-           icon="icons/elcl16/focus.gif"
-           id="org.eclipse.mylyn.ide.ui.actions.focus.markers.tasks"
-           label="%FocusTaskMarkersViewAction.label"
-           menubarPath="mylyn"
-           style="toggle"
-           toolbarPath="mylyn"
-           tooltip="%FocusTaskMarkersViewAction.tooltip">
-        <enablement>
-           <systemProperty
-                 name="org.eclipse.mylyn.context.core.context.active"
-                 value="true">
-           </systemProperty>
-        </enablement>
-  		</action>  
-      </viewContribution>
-   <viewContribution
-         id="org.eclipse.mylyn.markers.bookmarks.contribution"
-         targetID="org.eclipse.ui.views.BookmarkView">
-      <action
-            class="org.eclipse.mylyn.internal.ide.ui.actions.FocusBookmarkMarkersViewAction"
-            disabledIcon="icons/elcl16/focus-disabled.gif"
-            enablesFor="*"
-            icon="icons/elcl16/focus.gif"
-            id="org.eclipse.mylyn.ide.ui.actions.focus.markers.bookmarks"
-            label="%FocusBookmarkMarkersViewAction.label"
-            menubarPath="mylyn"
-            style="toggle"
-            toolbarPath="mylyn"
-            tooltip="%FocusBookmarkMarkersViewAction.tooltip">
-         <enablement>
-            <systemProperty
-                  name="org.eclipse.mylyn.context.core.context.active"
-                  value="true">
-            </systemProperty>
-         </enablement>
-      </action>
-   </viewContribution> 
-    </extension>
-    <extension
-          point="org.eclipse.mylyn.context.ui.startup">
-       <startup
-             class="org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin$IdeUiBridgeStartup">
-       </startup>
-    </extension>
-
-</plugin>
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java
deleted file mode 100644
index db4e98f..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java
+++ /dev/null
@@ -1,110 +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.ide.ui;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IBaseLabelProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin;
-import org.eclipse.mylyn.internal.ide.ui.MarkerInterestFilter;
-import org.eclipse.mylyn.internal.ide.ui.MarkerViewLabelProvider;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.internal.views.markers.ExtendedMarkersView;
-import org.eclipse.ui.internal.views.markers.MarkersTreeViewer;
-import org.eclipse.ui.views.markers.internal.TableViewLabelProvider;
-
-/**
- * @author Mik Kersten
- * @since 3.0
- */
-public abstract class AbstractFocusMarkerViewAction extends AbstractFocusViewAction {
-
-	private StructuredViewer cachedViewer = null;
-
-	public AbstractFocusMarkerViewAction() {
-		super(new MarkerInterestFilter(), true, true, false);
-	}
-
-	public AbstractFocusMarkerViewAction(InterestFilter interestFilter, boolean manageViewer, boolean manageFilters,
-			boolean manageLinking) {
-		super(interestFilter, manageFilters, manageFilters, manageLinking);
-	}
-
-	/**
-	 * HACK: should use platform decorating label provider
-	 * 
-	 * @param viewer
-	 */
-	protected void updateMarkerViewLabelProvider(StructuredViewer viewer) {
-		if (viewer != null) {
-			IBaseLabelProvider currentProvider = viewer.getLabelProvider();
-			if (currentProvider instanceof TableViewLabelProvider
-					&& !(currentProvider instanceof MarkerViewLabelProvider)) {
-				viewer.setLabelProvider(new MarkerViewLabelProvider((TableViewLabelProvider) currentProvider));
-			}
-		}
-	}
-
-	/**
-	 * HACK: changing accessibility
-	 */
-	@Override
-	public List<StructuredViewer> getViewers() {
-		List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-		if (cachedViewer == null) {
-			try {
-				IViewPart viewPart = super.getPartForAction();
-				if (viewPart != null) {
-					// NOTE: following code is Eclipse 3.4 specific
-					Class<?> clazz = ExtendedMarkersView.class;
-					Field field = clazz.getDeclaredField("viewer"); //$NON-NLS-1$
-					field.setAccessible(true);
-					cachedViewer = (MarkersTreeViewer) field.get(viewPart);
-					if (cachedViewer != null && !cachedViewer.getControl().isDisposed()) {
-						updateMarkerViewLabelProvider(cachedViewer);
-					}
-				}
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, IdeUiBridgePlugin.ID_PLUGIN,
-						"Could not get problems view viewer", e)); //$NON-NLS-1$
-			}
-		}
-		if (cachedViewer != null) {
-			viewers.add(cachedViewer);
-		}
-		return viewers;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		cachedViewer = null;
-		for (StructuredViewer viewer : getViewers()) {
-			if (viewer instanceof TableViewer) {
-				TableViewer tableViewer = (TableViewer) viewer;
-				if (!(tableViewer.getLabelProvider() instanceof MarkerViewLabelProvider)) {
-					tableViewer.setLabelProvider(new MarkerViewLabelProvider(
-							(TableViewLabelProvider) tableViewer.getLabelProvider()));
-				}
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractMarkerInterestFilter.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractMarkerInterestFilter.java
deleted file mode 100644
index be1a7d6..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractMarkerInterestFilter.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.ide.ui;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-
-/**
- * @author Mik Kersten
- * @since 3.0
- */
-public abstract class AbstractMarkerInterestFilter extends InterestFilter {
-
-	protected boolean isInteresting(IMarker marker, Viewer viewer, Object parent) {
-		if (isImplicitlyInteresting(marker)) {
-			return true;
-		} else {
-			String handle = ContextCore.getStructureBridge(marker.getResource().getFileExtension())
-					.getHandleForOffsetInObject(marker, 0);
-			if (handle == null) {
-				return false;
-			} else {
-				return super.select(viewer, parent, ContextCore.getContextManager().getElement(handle));
-			}
-		}
-	}
-
-	protected abstract boolean isImplicitlyInteresting(IMarker marker);
-
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/IdeUiBridgePlugin.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/IdeUiBridgePlugin.java
deleted file mode 100644
index a28c943..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/IdeUiBridgePlugin.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.ide.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.context.ui.IContextUiStartup;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Mik Kersten
- */
-public class IdeUiBridgePlugin extends AbstractUIPlugin {
-
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.ide"; //$NON-NLS-1$
-
-	private static IdeUiBridgePlugin INSTANCE;
-
-	public static final ImageDescriptor EDGE_REF_XML = getImageDescriptor("icons/elcl16/edge-ref-xml.gif"); //$NON-NLS-1$
-
-	public static class IdeUiBridgeStartup implements IContextUiStartup {
-
-		public void lazyStartup() {
-			// ignore, it is sufficient that the bundle is activated on context ui startup
-		}
-
-	}
-
-	public IdeUiBridgePlugin() {
-		INSTANCE = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-	public static IdeUiBridgePlugin getDefault() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 * 
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.mylyn.ide", path); //$NON-NLS-1$
-	}
-
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/IdeUiUtil.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/IdeUiUtil.java
deleted file mode 100644
index 1b80581..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/IdeUiUtil.java
+++ /dev/null
@@ -1,71 +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.ide.ui;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.navigator.ResourceNavigator;
-
-/**
- * @author Mik Kersten
- */
-public class IdeUiUtil {
-
-	public static final String ID_VIEW_SYNCHRONIZE = "org.eclipse.team.sync.views.SynchronizeView"; //$NON-NLS-1$
-
-	public static final String ID_NAVIGATOR = "org.eclipse.ui.views.ResourceNavigator"; //$NON-NLS-1$
-
-	public static IViewPart getView(String id) {
-		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		if (activePage == null) {
-			return null;
-		}
-		IViewPart view = activePage.findView(id);
-		return view;
-	}
-
-//	public static void forceSynchronizeViewUpdate() {
-//		IViewPart view = getView(ID_VIEW_SYNCHRONIZE);
-//		if (view instanceof SynchronizeView) {
-//			SynchronizeView syncView = (SynchronizeView)view;
-//			IPage currentPage = syncView.getCurrentPage();
-//			if (currentPage instanceof ModelSynchronizePage) {
-//				ModelSynchronizePage modelPage = (ModelSynchronizePage)currentPage;
-////				String currentProvider = (String)modelPage.getConfiguration().getProperty(ModelSynchronizeParticipant.P_VISIBLE_MODEL_PROVIDER);
-////				modelPage.getConfiguration().setProperty(
-////						ModelSynchronizeParticipant.P_VISIBLE_MODEL_PROVIDER, 
-////						ResourceModelProvider.RESOURCE_MODEL_PROVIDER_ID);
-//				
-//				modelPage.getConfiguration().setProperty(
-//						ModelSynchronizeParticipant.P_VISIBLE_MODEL_PROVIDER, 
-//						ChangeSetModelProvider.ID);
-//				
-//			}
-//		}
-//	}
-
-	public static ResourceNavigator getNavigatorFromActivePage() {
-		if (PlatformUI.getWorkbench() == null || PlatformUI.getWorkbench().getActiveWorkbenchWindow() == null) {
-			return null;
-		}
-		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		if (activePage == null) {
-			return null;
-		}
-		IViewPart view = activePage.findView(ID_NAVIGATOR);
-		if (view instanceof ResourceNavigator) {
-			return (ResourceNavigator) view;
-		}
-		return null;
-	}
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerInterestFilter.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerInterestFilter.java
deleted file mode 100644
index 61b4af7..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerInterestFilter.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.ide.ui;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.ide.ui.AbstractMarkerInterestFilter;
-import org.eclipse.ui.views.markers.MarkerItem;
-
-/**
- * @author Mik Kersten
- */
-public class MarkerInterestFilter extends AbstractMarkerInterestFilter {
-
-	private Method markerCategoryMethod = null;
-
-	@Override
-	public boolean select(Viewer viewer, Object parent, Object element) {
-
-		if (element instanceof MarkerItem) {
-			if (element.getClass().getSimpleName().equals("MarkerCategory")) { //$NON-NLS-1$
-				try {
-					if (markerCategoryMethod == null) {
-						Class<?> markerCategoryClass = Class.forName("org.eclipse.ui.internal.views.markers.MarkerCategory"); //$NON-NLS-1$ 
-						markerCategoryMethod = markerCategoryClass.getDeclaredMethod("getChildren", new Class[] {}); //$NON-NLS-1$ 
-						markerCategoryMethod.setAccessible(true);
-					}
-
-					Object[] entries = (Object[]) markerCategoryMethod.invoke(element, new Object[] {});
-					if (entries != null && entries.length == 0) {
-						return false;
-					} else if (entries != null && entries.length != 0) {
-						// PERFORMANCE: need to look down children, so O(n^2) complexity
-						for (Object markerEntry : entries) {
-							if (markerEntry.getClass().getSimpleName().equals("MarkerEntry") //$NON-NLS-1$ 
-									&& isInteresting(((MarkerItem) markerEntry).getMarker(), viewer, parent)) {
-								return true;
-							}
-						}
-						return false;
-					}
-				} catch (Exception e) {
-					StatusHandler.log(new Status(IStatus.ERROR, IdeUiBridgePlugin.ID_PLUGIN,
-							"Could not access marker view elements.")); //$NON-NLS-1$
-				}
-
-				return true;
-			} else if (element.getClass().getSimpleName().equals("MarkerEntry")) { //$NON-NLS-1$
-				return isInteresting(((MarkerItem) element).getMarker(), viewer, parent);
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	protected boolean isImplicitlyInteresting(IMarker marker) {
-		try {
-			Object severity = marker.getAttribute(IMarker.SEVERITY);
-			return severity != null && severity.equals(IMarker.SEVERITY_ERROR);
-		} catch (CoreException e) {
-			// ignore
-		}
-		return false;
-	}
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewLabelProvider.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewLabelProvider.java
deleted file mode 100644
index 613d05b..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewLabelProvider.java
+++ /dev/null
@@ -1,101 +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.ide.ui;
-
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFonts;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.views.markers.internal.ConcreteMarker;
-import org.eclipse.ui.views.markers.internal.TableViewLabelProvider;
-
-/**
- * @author Mik Kersten
- */
-public class MarkerViewLabelProvider implements ITableLabelProvider, IColorProvider, IFontProvider {
-
-	private final TableViewLabelProvider provider;
-
-	public MarkerViewLabelProvider(TableViewLabelProvider provider) {
-		this.provider = provider;
-	}
-
-	public Font getFont(Object element) {
-		if (element instanceof ConcreteMarker) {
-			String handle = ContextCore.getStructureBridge(((ConcreteMarker) element).getResource().getFileExtension())
-					.getHandleForOffsetInObject((element), 0);
-			IInteractionElement node = ContextCore.getContextManager().getElement(handle);
-			if (node != null) {
-				if (node.getInterest().isLandmark() && !node.getInterest().isPropagated()) {
-					return CommonFonts.BOLD;
-				}
-			}
-		}
-		return null;
-	}
-
-	public Image getColumnImage(Object element, int columnIndex) {
-		return provider.getColumnImage(element, columnIndex);
-	}
-
-	public String getColumnText(Object element, int columnIndex) {
-		return provider.getColumnText(element, columnIndex);
-	}
-
-	public Color getForeground(Object element) {
-		if (element instanceof ConcreteMarker) {
-			String handle = ContextCore.getStructureBridge(((ConcreteMarker) element).getResource().getFileExtension())
-					.getHandleForOffsetInObject((element), 0);
-			return ContextUi.getForeground(ContextCore.getContextManager().getElement(handle));
-		} else {
-			return null;
-		}
-	}
-
-	public Color getBackground(Object element) {
-		return null;
-//		if (element instanceof ConcreteMarker) {
-//			String handle = ContextCore.getStructureBridge(
-//					((ConcreteMarker) element).getResource().getFileExtension()).getHandleForOffsetInObject((element),
-//					0);
-//			return UiUtil.getBackgroundForElement(ContextCorePlugin.getContextManager().getElement(handle));
-//		} else {
-//			return null;
-//		}
-	}
-
-	/**
-	 * TODO: handle listeners?
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		// provider.addListener(listener);
-	}
-
-	public void dispose() {
-		provider.dispose();
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return provider.isLabelProperty(element, property);
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-		// removeListener(listener);
-	}
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewerInterestSorter.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewerInterestSorter.java
deleted file mode 100644
index 1803670..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewerInterestSorter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.ide.ui;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.InterestComparator;
-import org.eclipse.ui.views.markers.internal.ProblemMarker;
-
-/**
- * @author Mik Kersten
- */
-public class MarkerViewerInterestSorter extends ViewerSorter {
-
-	protected InterestComparator<IInteractionElement> interestComparator = new InterestComparator<IInteractionElement>();
-
-	@Override
-	public int compare(Viewer viewer, Object obj1, Object obj2) {
-		if (obj1 instanceof ProblemMarker && obj1 instanceof ProblemMarker) {
-			ProblemMarker marker1 = (ProblemMarker) obj1;
-			ProblemMarker marker2 = (ProblemMarker) obj2;
-			if (marker1.getSeverity() == IMarker.SEVERITY_ERROR && marker2.getSeverity() < IMarker.SEVERITY_ERROR) {
-				return -1;
-			} else if (marker2.getSeverity() == IMarker.SEVERITY_ERROR
-					&& marker1.getSeverity() < IMarker.SEVERITY_ERROR) {
-				return 1;
-			} else {
-				if (ContextCore.getContextManager().isContextActive()) {
-					AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(marker1.getResource()
-							.getFileExtension());
-					IInteractionElement node1 = ContextCore.getContextManager().getElement(
-							bridge.getHandleForOffsetInObject(marker1, 0));
-					IInteractionElement node2 = ContextCore.getContextManager().getElement(
-							bridge.getHandleForOffsetInObject(marker2, 0));
-					return interestComparator.compare(node1, node2);
-				}
-			}
-		}
-		return super.compare(viewer, obj1, obj2);
-	}
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/XmlNodeHelper.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/XmlNodeHelper.java
deleted file mode 100644
index 25ad42b..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/XmlNodeHelper.java
+++ /dev/null
@@ -1,238 +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.ide.ui;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-
-/**
- * Class to help get the handle for an xml file
- * 
- * @author Shawn Minto
- */
-public class XmlNodeHelper {
-
-	/** The filename of the xml file */
-	private String filename;
-
-	/** The start line of the node */
-	private String end;
-
-	public XmlNodeHelper(String handle) {
-		int first = handle.indexOf(";"); //$NON-NLS-1$
-		if (first == -1) {
-			filename = handle;
-			end = ""; //$NON-NLS-1$
-		} else {
-			filename = handle.substring(0, first);
-			end = handle.substring(first + 1);
-		}
-	}
-
-	/**
-	 * Constructor - used for pde
-	 * 
-	 * @param filename
-	 *            The filename
-	 * @param startOffset
-	 *            The start line for the node
-	 */
-	public XmlNodeHelper(String filename, int s) {
-		this.filename = filename;
-		this.end = "" + s; //$NON-NLS-1$
-	}
-
-	/**
-	 * Constructor - used for ant
-	 * 
-	 * @param filename
-	 *            The filename
-	 * @param startOffset
-	 *            The start line for the node
-	 */
-	public XmlNodeHelper(String filename, String s) {
-		this.filename = filename;
-		this.end = s;
-	}
-
-	/**
-	 * Get the handle for the node Format: filename;startOffset
-	 * 
-	 * @return The to the node handle in String form
-	 */
-	public String getHandle() {
-		return filename + ";" + getValue(); //$NON-NLS-1$
-	}
-
-	public String getFilename() {
-		if (filename != null) {
-			filename = filename.trim();
-		}
-		return filename;
-	}
-
-	public String getValue() {
-		return end;
-	}
-
-	@Override
-	public boolean equals(Object e) {
-		if (e instanceof XmlNodeHelper) {
-			XmlNodeHelper xnode = ((XmlNodeHelper) e);
-			return xnode.getHandle().equals(getHandle());
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return getHandle().hashCode();
-	}
-
-	/**
-	 * Get the contents of an InputStream
-	 * 
-	 * @param is
-	 *            The InputStream to get the contents for
-	 * @return The <code>String</code> representing the contents
-	 */
-	public static String getContents(InputStream is) {
-		String contents = ""; //$NON-NLS-1$
-
-		// create a new reader for the stream
-		BufferedReader br = new BufferedReader(new InputStreamReader(is));
-		try {
-
-			// get the contents
-			String s = ""; //$NON-NLS-1$
-			char[] cbuf = new char[512];
-			while (br.read(cbuf) != -1) {
-				s = new String(cbuf);
-				contents += s;
-			}
-		} catch (IOException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, IdeUiBridgePlugin.ID_PLUGIN, "Could not get contents", e)); //$NON-NLS-1$
-		}
-		return contents;
-	}
-
-	// XXX needed if we are parsing the data again to get info instead of using
-	// the xml models
-	//
-	// private void parseContents(IDocument d, String contents){
-	// String [] lines = contents.split("\n");
-	// boolean inQuote = false;
-	// boolean attr = false;
-	// String attrName = "";
-	// String attrVal = "";
-	// String oldAttrVal = "";
-	// char prevChar = ' ';
-	// for(int i = endLine - 1; i >= 0; i--){
-	// // parse backwards
-	//            
-	// String line = lines[i];
-	// for(int cpos = line.length()-1; cpos >=0; cpos--){
-	//                
-	// if(attr){
-	// if(attrName.length() != 0 && (isWhitespace(line.charAt(cpos))))
-	// {
-	// attr = false;
-	// if(attrName.toLowerCase(Locale.ENGLISH).equals("name"))
-	// {
-	// name = oldAttrVal;
-	// }
-	// }
-	// attrName = line.charAt(cpos) + attrName;
-	// }
-	//                               
-	// if(line.charAt(cpos) == '"' && inQuote){
-	// inQuote = false;
-	// }else if(line.charAt(cpos) == '"' && !inQuote){
-	// inQuote = true;
-	// }else if(!inQuote && line.charAt(cpos) == '<' && prevChar != '/'){
-	// int space = line.indexOf(" ", cpos);
-	// if(space == -1)
-	// tagName = line.substring(cpos + 1);
-	// else
-	// tagName = line.substring(cpos + 1, space);
-	// return;
-	// }else if(!inQuote && line.charAt(cpos) =='='){
-	// attr = true;
-	// attrName = "";
-	// oldAttrVal = attrVal;
-	// attrVal = "";
-	// }else if(inQuote){
-	// attrVal = line.charAt(cpos) + attrVal;
-	// }
-	// prevChar = line.charAt(cpos);
-	// }
-	// }
-	// }
-	//    
-	// private boolean isWhitespace(char c){
-	// return c == ' ' || c == '\t' || c == '\n' || c == '\r';
-	// }
-	//    
-	// public String getCanName()
-	// {
-	// int slash = filename.lastIndexOf("/");
-	// String file = slash==-1?filename:filename.substring(slash+1);
-	// String s = file + ": " + getTagName();
-	// if(getName() != null)
-	// s += " \"" + getName() + "\"";
-	// s += " : " + startOffset;
-	// return s;
-	// }
-	//
-	// public String getTagName() {
-	// if(tagName != null)
-	// tagName = tagName.trim();
-	// return tagName;
-	// }
-
-	// public void setTagName(String tagName) {
-	// this.tagName = tagName;
-	// }
-
-	// public String getName() {
-	// if(name != null)
-	// name = name.trim();
-	// return name;
-	// }
-
-	// public void setName(String name) {
-	// this.name = name;
-	// }
-
-	//
-	// public int getEndLine() {
-	// return endLine;
-	// }
-	//    
-	//
-	// public void setEndLine(int endLine) {
-	// this.endLine = endLine;
-	// }
-
-	//    
-	//
-	// public void setStartLine(int startOffset) {
-	// this.startLine = startOffset;
-	// }
-
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusAllMarkersViewAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusAllMarkersViewAction.java
deleted file mode 100644
index ecb09d2..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusAllMarkersViewAction.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.ide.ui.actions;
-
-import org.eclipse.mylyn.ide.ui.AbstractFocusMarkerViewAction;
-
-/**
- * @author Mik Kersten
- */
-public class FocusAllMarkersViewAction extends AbstractFocusMarkerViewAction {
-
-	public FocusAllMarkersViewAction() {
-		super();
-	}
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusBookmarkMarkersViewAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusBookmarkMarkersViewAction.java
deleted file mode 100644
index b9f17bb..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusBookmarkMarkersViewAction.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.ide.ui.actions;
-
-import org.eclipse.mylyn.ide.ui.AbstractFocusMarkerViewAction;
-
-/**
- * @author Mik Kersten
- */
-public class FocusBookmarkMarkersViewAction extends AbstractFocusMarkerViewAction {
-
-	public FocusBookmarkMarkersViewAction() {
-		super();
-	}
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProblemsListAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProblemsListAction.java
deleted file mode 100644
index db7a203..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProblemsListAction.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.ide.ui.actions;
-
-import org.eclipse.mylyn.ide.ui.AbstractFocusMarkerViewAction;
-
-/**
- * @author Mik Kersten
- */
-public class FocusProblemsListAction extends AbstractFocusMarkerViewAction {
-
-	public FocusProblemsListAction() {
-		super();
-	}
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProjectExplorerAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProjectExplorerAction.java
deleted file mode 100644
index e46e063..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusProjectExplorerAction.java
+++ /dev/null
@@ -1,48 +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.ide.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.mylyn.resources.ui.FocusCommonNavigatorAction;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.navigator.CommonNavigator;
-
-/**
- * @author Mik Kersten
- */
-public class FocusProjectExplorerAction extends FocusCommonNavigatorAction {
-
-	public FocusProjectExplorerAction() {
-		super(new InterestFilter(), true, true, true);
-	}
-
-	protected FocusProjectExplorerAction(InterestFilter filter) {
-		super(filter, true, true, true);
-	}
-
-	@Override
-	public List<StructuredViewer> getViewers() {
-		List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-
-		IViewPart view = super.getPartForAction();
-		if (view instanceof CommonNavigator) {
-			CommonNavigator navigator = (CommonNavigator) view;
-			viewers.add(navigator.getCommonViewer());
-		}
-		return viewers;
-	}
-
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusResourceNavigatorAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusResourceNavigatorAction.java
deleted file mode 100644
index c79f3ab..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusResourceNavigatorAction.java
+++ /dev/null
@@ -1,151 +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.ide.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.mylyn.context.ui.AbstractAutoFocusViewAction;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.views.navigator.FilterSelectionAction;
-import org.eclipse.ui.views.navigator.IResourceNavigator;
-import org.eclipse.ui.views.navigator.ResourceNavigator;
-import org.eclipse.ui.views.navigator.ToggleLinkingAction;
-
-/**
- * @author Mik Kersten
- */
-public class FocusResourceNavigatorAction extends AbstractAutoFocusViewAction {
-
-	public FocusResourceNavigatorAction() {
-		super(new InterestFilter(), true, true, true);
-	}
-
-	@Override
-	public List<StructuredViewer> getViewers() {
-		List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-		IViewPart part = super.getPartForAction();
-		if (part instanceof ResourceNavigator) {
-			viewers.add(((ResourceNavigator) part).getTreeViewer());
-		}
-		return viewers;
-	}
-
-	@Override
-	protected ISelection resolveSelection(IEditorPart part, ITextSelection changedSelection, StructuredViewer viewer)
-			throws CoreException {
-		IEditorInput input = part.getEditorInput();
-		Object adapted = input.getAdapter(IResource.class);
-		if (adapted instanceof IResource) {
-			return new StructuredSelection(adapted);
-		} else {
-			return null;
-		}
-	}
-
-	// TODO: should have better way of doing this
-	@Override
-	protected void setManualFilteringAndLinkingEnabled(boolean on) {
-		IViewPart part = super.getPartForAction();
-		if (part instanceof IResourceNavigator) {
-			for (IContributionItem item : ((IResourceNavigator) part).getViewSite()
-					.getActionBars()
-					.getToolBarManager()
-					.getItems()) {
-				if (item instanceof ActionContributionItem) {
-					ActionContributionItem actionItem = (ActionContributionItem) item;
-					if (actionItem.getAction() instanceof ToggleLinkingAction) {
-						actionItem.getAction().setEnabled(on);
-					}
-				}
-			}
-			for (IContributionItem item : ((IResourceNavigator) part).getViewSite()
-					.getActionBars()
-					.getMenuManager()
-					.getItems()) {
-				if (item instanceof ActionContributionItem) {
-					ActionContributionItem actionItem = (ActionContributionItem) item;
-					// TODO: consider filing bug asking for extensibility
-					if (actionItem.getAction() instanceof FilterSelectionAction) {
-						actionItem.getAction().setEnabled(on);
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	protected void setDefaultLinkingEnabled(boolean on) {
-		IViewPart part = super.getPartForAction();
-		if (part instanceof IResourceNavigator) {
-			((IResourceNavigator) part).setLinkingEnabled(on);
-		}
-	}
-
-	@Override
-	protected boolean isDefaultLinkingEnabled() {
-		IViewPart part = super.getPartForAction();
-		if (part instanceof IResourceNavigator) {
-			return ((IResourceNavigator) part).isLinkingEnabled();
-		}
-		return false;
-	}
-
-//	private Set<String> getPreservedFilterPatterns() {
-//		Set<String> preservedIds = ContextUiPlugin.getDefault().getPreservedFilterIds(viewPart.getSite().getId());
-//		IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(
-//				"org.eclipse.ui.ide.resourceFilters"); //$NON-NLS-1$
-//		Set<String> filters = new HashSet<String>();
-//		if (extension != null) {
-//			IExtension[] extensions = extension.getExtensions();
-//			for (IExtension extension2 : extensions) {
-//				IConfigurationElement[] configElements = extension2.getConfigurationElements();
-//				if (extension2.getUniqueIdentifier() != null && preservedIds.contains(extension2.getUniqueIdentifier())) {
-//					for (IConfigurationElement configElement : configElements) {
-//						String pattern = configElement.getAttribute("pattern");//$NON-NLS-1$
-//						if (pattern != null) {
-//							filters.add(pattern);
-//						}
-//					}
-//				}
-//
-//			}
-//		}
-//		return filters;
-//	}
-
-//	@Override
-//	protected boolean isPreservedFilter(ViewerFilter filter) {
-//		if (filter instanceof ResourcePatternFilter) {
-//			Set<String> preservedFilterPatterns = getPreservedFilterPatterns();
-//			//NOTE: since the resource filters are all contained in one filter, if one is preserved, then we preserve all filters
-//			for (String pattern : ((ResourcePatternFilter) filter).getPatterns()) {
-//				if (preservedFilterPatterns.contains(pattern)) {
-//					return true;
-//				}
-//			}
-//		}
-//		return super.isPreservedFilter(filter);
-//	}
-
-}
diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusTaskMarkersViewAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusTaskMarkersViewAction.java
deleted file mode 100644
index 7257da8..0000000
--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/actions/FocusTaskMarkersViewAction.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.ide.ui.actions;
-
-import org.eclipse.mylyn.ide.ui.AbstractFocusMarkerViewAction;
-
-/**
- * @author Mik Kersten
- */
-public class FocusTaskMarkersViewAction extends AbstractFocusMarkerViewAction {
-
-	public FocusTaskMarkersViewAction() {
-		super();
-	}
-}
diff --git a/org.eclipse.mylyn.java-feature/.project b/org.eclipse.mylyn.java-feature/.project
deleted file mode 100644
index 8f5654d..0000000
--- a/org.eclipse.mylyn.java-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.java-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.java-feature/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.java-feature/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.java-feature/.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.java-feature/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.java-feature/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.java-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) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.java-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.java-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 4c9ebcf..0000000
--- a/org.eclipse.mylyn.java-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:51 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.java-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.java-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index c5074cd..0000000
--- a/org.eclipse.mylyn.java-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Dec 20 14:08:31 PST 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.java-feature/about.html b/org.eclipse.mylyn.java-feature/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.java-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.java-feature/build.properties b/org.eclipse.mylyn.java-feature/build.properties
deleted file mode 100644
index dcaa2fa..0000000
--- a/org.eclipse.mylyn.java-feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.properties,\
-               feature.xml,\
-               epl-v10.html,\
-               license.html,\
-               about.html
-src.includes = about.html
diff --git a/org.eclipse.mylyn.java-feature/epl-v10.html b/org.eclipse.mylyn.java-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.mylyn.java-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.java-feature/feature.properties b/org.eclipse.mylyn.java-feature/feature.properties
deleted file mode 100644
index 90bd455..0000000
--- a/org.eclipse.mylyn.java-feature/feature.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-featureName=Mylyn Bridge: Java Development
-description=Mylyn Task-Focused UI extensions for JDT.  Provides focusing of Java element views and editors.
-providerName=Eclipse Mylyn
-copyright=Copyright (c) 2004, 2008 Tasktop Technologies and others. All rights reserved.
-updateSiteName=Mylyn for Eclipse 3.4
-license=\
-Eclipse Foundation Software User Agreement\n\
-\n\
-March 17, 2005\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). 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.\n\
-Applicable Licenses\n\
-\n\
-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 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS modules ("Modules") and made available as downloadable archives ("Downloads").\n\
-\n\
-    * Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
-    * Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java\u2122 ARchive) in a directory named "plugins".\n\
-    * 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 "features". Within a Feature, files named "feature.xml" may contain a list of the names and version 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 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 contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module 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 Eclipse Update Manager, you must agree to a license ("Feature Update License") 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 "license" property of files named "feature.properties" 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.\n\
-\n\
-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):\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\
-    * IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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 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.\n\
-Cryptography\n\
-\n\
-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&apos;s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
diff --git a/org.eclipse.mylyn.java-feature/feature.xml b/org.eclipse.mylyn.java-feature/feature.xml
deleted file mode 100644
index e9898c1..0000000
--- a/org.eclipse.mylyn.java-feature/feature.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.mylyn.java_feature"
-      label="%featureName"
-      version="3.2.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>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.debug"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.junit"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.mylyn.context.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.context.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.monitor.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.resources.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.monitor.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.tasks.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.ide.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.tasks.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui.navigator"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ant.ui"/>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.2.0.qualifier" match="perfect"/>
-      <import feature="org.eclipse.jdt" version="3.4.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.mylyn.java.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.java.tasks"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.ide.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.ide.ant"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.mylyn.java-feature/license.html b/org.eclipse.mylyn.java-feature/license.html
deleted file mode 100644
index 15a10cf..0000000
--- a/org.eclipse.mylyn.java-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">

-<title>Eclipse.org Software User Agreement</title>

-</head>

-

-<body lang="EN-US" link=blue vlink=purple>

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>March 17, 2005</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.org CVS repository (&quot;Repository&quot;) in CVS

-   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 Eclipse Update Manager, 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>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</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>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>

-   

-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   

-</body>

-</html>

diff --git a/org.eclipse.mylyn.java.tasks/.classpath b/org.eclipse.mylyn.java.tasks/.classpath
deleted file mode 100644
index 81bbfc0..0000000
--- a/org.eclipse.mylyn.java.tasks/.classpath
+++ /dev/null
@@ -1,12 +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">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/jdt/internal/debug/ui/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/jdt/internal/junit/model/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.java.tasks/.cvsignore b/org.eclipse.mylyn.java.tasks/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.java.tasks/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.java.tasks/.project b/org.eclipse.mylyn.java.tasks/.project
deleted file mode 100644
index 4648426..0000000
--- a/org.eclipse.mylyn.java.tasks/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.java.tasks</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.java.tasks/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.java.tasks/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.java.tasks/.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.java.tasks/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.java.tasks/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 5e70d08..0000000
--- a/org.eclipse.mylyn.java.tasks/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Sat Mar 01 03:38:47 PST 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\n * Copyright (c) 2004, 2007 Mylyn project committers and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *******************************************************************************/\n\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.java.tasks/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.java.tasks/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.java.tasks/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.java.tasks/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.java.tasks/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.java.tasks/.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.java.tasks/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.java.tasks/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.java.tasks/.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.java.tasks/META-INF/MANIFEST.MF b/org.eclipse.mylyn.java.tasks/META-INF/MANIFEST.MF
deleted file mode 100644
index 51e6d50..0000000
--- a/org.eclipse.mylyn.java.tasks/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.java.tasks;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.ui,
- org.eclipse.jdt.core,
- org.eclipse.jdt.debug.ui,
- org.eclipse.jdt.junit,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.mylyn.internal.java.tasks;x-internal:=true
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.java.tasks/about.html b/org.eclipse.mylyn.java.tasks/about.html
deleted file mode 100644
index 0dd939c..0000000
--- a/org.eclipse.mylyn.java.tasks/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 7, 2007</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.java.tasks/build.properties b/org.eclipse.mylyn.java.tasks/build.properties
deleted file mode 100644
index 2089240..0000000
--- a/org.eclipse.mylyn.java.tasks/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
-
diff --git a/org.eclipse.mylyn.java.tasks/icons/etool16/task-new.gif b/org.eclipse.mylyn.java.tasks/icons/etool16/task-new.gif
deleted file mode 100644
index e2cde50..0000000
--- a/org.eclipse.mylyn.java.tasks/icons/etool16/task-new.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.tasks/plugin.properties b/org.eclipse.mylyn.java.tasks/plugin.properties
deleted file mode 100644
index 5d0469c..0000000
--- a/org.eclipse.mylyn.java.tasks/plugin.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#Properties file for org.eclipse.mylyn.java.tasks
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn Java Tasks
-
-JavaStackTraceHyperlinkDetector.name = Mylyn Stack Trace
-
-NewTaskFromJunitResultViewAction.label = New Task from Failure...
diff --git a/org.eclipse.mylyn.java.tasks/plugin.xml b/org.eclipse.mylyn.java.tasks/plugin.xml
deleted file mode 100644
index a0e744f..0000000
--- a/org.eclipse.mylyn.java.tasks/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
-      <hyperlinkDetector            
-            class="org.eclipse.mylyn.internal.java.tasks.JavaStackTraceHyperlinkDetector"
-            id="org.eclipse.mylyn.java.hyperlink.detector.stack"
-            name="%JavaStackTraceHyperlinkDetector.name"
-            targetId="org.eclipse.ui.DefaultTextEditor"/>
-   </extension>
-      
-   <extension point="org.eclipse.ui.popupMenus">
-        <viewerContribution
-		    id="org.eclipse.mylyn.bugzilla.ui.contribution"
-            targetID="org.eclipse.jdt.junit.ResultView">
-      	<action
-	      	class="org.eclipse.mylyn.internal.java.tasks.NewTaskFromJunitResultViewAction"
-	        icon="icons/etool16/task-new.gif"
-	        id="org.eclipse.mylyn.bugzilla.actions.newTaskFromJunitResultView"
-	        label="%NewTaskFromJunitResultViewAction.label"
-	        menubarPath="org.eclipse.jdt.junit.ResultView"/>
-      </viewerContribution>
-   </extension>
-   
-</plugin>
diff --git a/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/JavaStackTraceFileHyperlink.java b/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/JavaStackTraceFileHyperlink.java
deleted file mode 100644
index 214d57d..0000000
--- a/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/JavaStackTraceFileHyperlink.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.tasks;
-
-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.core.runtime.jobs.Job;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.actions.OpenTypeAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.mylyn.tasks.ui.IHighlightingHyperlink;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * @author Rob Elves
- */
-public class JavaStackTraceFileHyperlink implements IHyperlink, IHighlightingHyperlink {
-
-	private final IRegion region;
-
-	private final String traceLine;
-
-	private final IRegion highlightingRegion;
-
-	public JavaStackTraceFileHyperlink(IRegion region, String traceLine, IRegion highlightingRegion) {
-		this.region = region;
-		this.traceLine = traceLine;
-		this.highlightingRegion = highlightingRegion;
-	}
-
-	public IRegion getHyperlinkRegion() {
-		return region;
-	}
-
-	public String getHyperlinkText() {
-		// ignore
-		return null;
-	}
-
-	public String getTypeLabel() {
-		// ignore
-		return null;
-	}
-
-	public void open() {
-
-		try {
-
-			String typeName = getTypeName();
-			int lineNumber = getLineNumber();
-
-			// documents start at 0
-			if (lineNumber > 0) {
-				lineNumber--;
-			}
-
-			startSourceSearch(typeName, lineNumber);
-
-		} catch (CoreException e1) {
-			MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-					Messages.JavaStackTraceFileHyperlink_Open_Type,
-					Messages.JavaStackTraceFileHyperlink_Failed_to_open_type);
-			return;
-		}
-
-	}
-
-	/**
-	 * Starts a search for the type with the given name. Reports back to 'searchCompleted(...)'.
-	 * 
-	 * @param typeName
-	 *            the type to search for
-	 */
-	protected void startSourceSearch(final String typeName, final int lineNumber) {
-		Job search = new Job(Messages.JavaStackTraceFileHyperlink_Searching_) {
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				try {
-					// search for the type in the workspace
-					Object result = OpenTypeAction.findTypeInWorkspace(typeName);
-					searchCompleted(result, typeName, lineNumber, null);
-				} catch (CoreException e) {
-					searchCompleted(null, typeName, lineNumber, e.getStatus());
-				}
-				return Status.OK_STATUS;
-			}
-
-		};
-		search.schedule();
-	}
-
-	protected void searchCompleted(final Object source, final String typeName, final int lineNumber,
-			final IStatus status) {
-		UIJob job = new UIJob(Messages.JavaStackTraceFileHyperlink_link_search_complete) {
-			@Override
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				if (source == null) {
-					// did not find source
-					MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-							Messages.JavaStackTraceFileHyperlink_Open_Type,
-							Messages.JavaStackTraceFileHyperlink_Type_could_not_be_located);
-				} else {
-					processSearchResult(source, typeName, lineNumber);
-				}
-				return Status.OK_STATUS;
-			}
-		};
-		job.setSystem(true);
-		job.schedule();
-	}
-
-	/**
-	 * The search succeeded with the given result
-	 * 
-	 * @param source
-	 *            resolved source object for the search
-	 * @param typeName
-	 *            type name searched for
-	 * @param lineNumber
-	 *            line number on link
-	 */
-	protected void processSearchResult(Object source, String typeName, int lineNumber) {
-		IDebugModelPresentation presentation = JDIDebugUIPlugin.getDefault().getModelPresentation();
-		IEditorInput editorInput = presentation.getEditorInput(source);
-		if (editorInput != null) {
-			String editorId = presentation.getEditorId(editorInput, source);
-			if (editorId != null) {
-				try {
-					IEditorPart editorPart = PlatformUI.getWorkbench()
-							.getActiveWorkbenchWindow()
-							.getActivePage()
-							.openEditor(editorInput, editorId);
-					if (editorPart instanceof ITextEditor && lineNumber >= 0) {
-						ITextEditor textEditor = (ITextEditor) editorPart;
-						IDocumentProvider provider = textEditor.getDocumentProvider();
-						provider.connect(editorInput);
-						IDocument document = provider.getDocument(editorInput);
-						try {
-							IRegion line = document.getLineInformation(lineNumber);
-							textEditor.selectAndReveal(line.getOffset(), line.getLength());
-						} catch (BadLocationException e) {
-							MessageDialog.openInformation(PlatformUI.getWorkbench()
-									.getActiveWorkbenchWindow()
-									.getShell(), Messages.JavaStackTraceFileHyperlink_Open_Type,
-									Messages.JavaStackTraceFileHyperlink_Line_not_found_in_type);
-						}
-						provider.disconnect(editorInput);
-					}
-				} catch (CoreException e) {
-					MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-							Messages.JavaStackTraceFileHyperlink_Open_Type,
-							Messages.JavaStackTraceFileHyperlink_Failed_to_open_type);
-				}
-			}
-		}
-	}
-
-	// adapted from JavaStackTraceHyperlink
-	private String getTypeName() {
-		int start = traceLine.indexOf('(');
-		int end = traceLine.indexOf(':');
-		if (start >= 0 && end > start) {
-
-			// get File name (w/o .java)
-			String typeName = traceLine.substring(start + 1, end);
-			typeName = typeName.substring(0, typeName.indexOf(".")); //$NON-NLS-1$
-
-			String qualifier = traceLine.substring(0, start);
-			// remove the method name
-			start = qualifier.lastIndexOf('.');
-
-			if (start >= 0) {
-				// remove the class name
-				start = (qualifier.subSequence(0, start).toString()).lastIndexOf('.');
-				if (start == -1) {
-					start = 0; // default package
-				}
-			}
-
-			if (start >= 0) {
-				qualifier = qualifier.substring(0, start);
-			}
-
-			if (qualifier.length() > 0) {
-				typeName = qualifier + "." + typeName; //$NON-NLS-1$
-			}
-			return typeName.trim();
-		}
-
-		return "error"; // TODO: Complain //$NON-NLS-1$
-	}
-
-	// adapted from JavaStackTraceHyperlink
-	private int getLineNumber() throws CoreException {
-		int index = traceLine.lastIndexOf(':');
-		if (index >= 0) {
-			String numText = traceLine.substring(index + 1);
-			index = numText.indexOf(')');
-			if (index >= 0) {
-				numText = numText.substring(0, index);
-			}
-			try {
-				return Integer.parseInt(numText);
-			} catch (NumberFormatException e) {
-				throw new CoreException(null);
-			}
-		}
-
-		throw new CoreException(null);
-	}
-
-	public IRegion getHighlightingRegion() {
-		return (highlightingRegion != null) ? highlightingRegion : region;
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/JavaStackTraceHyperlinkDetector.java b/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/JavaStackTraceHyperlinkDetector.java
deleted file mode 100644
index 5c2c9cc..0000000
--- a/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/JavaStackTraceHyperlinkDetector.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.tasks;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.mylyn.tasks.ui.AbstractTaskHyperlinkDetector;
-
-/**
- * @author Rob Elves
- * @author Steffen Pingel
- */
-public class JavaStackTraceHyperlinkDetector extends AbstractTaskHyperlinkDetector {
-
-	private static final Pattern stackTracePattern = Pattern.compile("\\S*\\(([\\w\\$]*\\.java:\\d*)\\)", //$NON-NLS-1$
-			Pattern.CASE_INSENSITIVE);
-
-	private static IRegion determineRegion(int textOffset, Matcher m, int group) {
-		return new Region(textOffset + m.start(group), m.end(group) - m.start(group));
-	}
-
-	private static boolean isInRegion(int offsetInText, Matcher m) {
-		return (offsetInText == -1) || (offsetInText >= m.start() && offsetInText <= m.end());
-	}
-
-	@Override
-	protected List<IHyperlink> detectHyperlinks(ITextViewer textViewer, String content, int offsetInContent,
-			int contentOffset) {
-		List<IHyperlink> links = null;
-		Matcher m = stackTracePattern.matcher(content);
-		while (m.find()) {
-			if (isInRegion(offsetInContent, m)) {
-				if (links == null) {
-					links = new ArrayList<IHyperlink>();
-				}
-				links.add(new JavaStackTraceFileHyperlink(determineRegion(contentOffset, m, 0), m.group(),
-						determineRegion(contentOffset, m, 1)));
-			}
-		}
-		return links;
-	}
-
-//	private static final Pattern stackTracePattern = Pattern.compile("\\S*\\.java:\\d*\\)", Pattern.CASE_INSENSITIVE);
-//
-//	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
-//		IDocument document = textViewer.getDocument();
-//		if (document == null) {
-//			return null;
-//		}
-//
-//		IRegion lineInfo;
-//		String line;
-//		try {
-//			lineInfo = document.getLineInformationOfOffset(region.getOffset());
-//			line = document.get(lineInfo.getOffset(), lineInfo.getLength());
-//		} catch (BadLocationException ex) {
-//			return null;
-//		}
-//
-//		Matcher m = stackTracePattern.matcher(line);
-//		if (m.find()) {
-//			IRegion urlRegion = new Region(lineInfo.getOffset() + m.start(), m.end() - m.start());
-//			return new IHyperlink[] { new JavaStackTraceFileHyperlink(urlRegion, m.group()) };
-//		}
-//
-//		return null;
-//	}
-
-}
diff --git a/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/Messages.java b/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/Messages.java
deleted file mode 100644
index 50171f2..0000000
--- a/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/Messages.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.tasks;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.java.tasks.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 JavaStackTraceFileHyperlink_Failed_to_open_type;
-
-	public static String JavaStackTraceFileHyperlink_Line_not_found_in_type;
-
-	public static String JavaStackTraceFileHyperlink_link_search_complete;
-
-	public static String JavaStackTraceFileHyperlink_Open_Type;
-
-	public static String JavaStackTraceFileHyperlink_Searching_;
-
-	public static String JavaStackTraceFileHyperlink_Type_could_not_be_located;
-}
diff --git a/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/NewTaskFromJunitResultViewAction.java b/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/NewTaskFromJunitResultViewAction.java
deleted file mode 100644
index c11995f..0000000
--- a/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/NewTaskFromJunitResultViewAction.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.tasks;
-
-import org.eclipse.jdt.internal.junit.model.TestCaseElement;
-import org.eclipse.jdt.internal.junit.model.TestElement;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.mylyn.tasks.core.TaskMapping;
-import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Creates a new task from the selected JUnit Test.
- * 
- * @author Frank Becker
- */
-public class NewTaskFromJunitResultViewAction implements IViewActionDelegate, ISelectionChangedListener {
-
-	public static final String ID = "org.eclipse.mylyn.bugzilla.actions.newTaskFromJunitResultView"; //$NON-NLS-1$
-
-	private String traceString;
-
-	private TestCaseElement testCaseElement;
-
-	public void run(IAction action) {
-		run();
-	}
-
-	public void run() {
-		if (traceString == null || testCaseElement == null) {
-			return;
-		}
-
-		// TODO NLS externalize strings
-		final StringBuilder sb = new StringBuilder();
-		sb.append("\n-- Error Log from JUnit --\nClass: "); //$NON-NLS-1$
-		sb.append(testCaseElement.getTestClassName());
-		sb.append("\nMethod: "); //$NON-NLS-1$
-		sb.append(testCaseElement.getTestMethodName());
-		sb.append("\nActual: "); //$NON-NLS-1$
-		sb.append(testCaseElement.getActual());
-		sb.append("\nExpected: "); //$NON-NLS-1$
-		sb.append(testCaseElement.getExpected());
-		sb.append("\nStack Trace:\n"); //$NON-NLS-1$
-		sb.append(traceString);
-
-		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		TaskMapping taskMapping = new TaskMapping() {
-			@Override
-			public String getDescription() {
-				return sb.toString();
-			}
-		};
-		TasksUiUtil.openNewTaskEditor(shell, taskMapping, null);
-	}
-
-	public void selectionChanged(SelectionChangedEvent event) {
-		// ignore		
-	}
-
-	public void init(IViewPart view) {
-		// ignore
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		traceString = null;
-		testCaseElement = null;
-		if (selection instanceof TreeSelection) {
-			TreeSelection t = (TreeSelection) selection;
-			TestElement testElement = (TestElement) t.getFirstElement();
-			if (testElement instanceof TestCaseElement) {
-				testCaseElement = (TestCaseElement) testElement;
-				traceString = testCaseElement.getTrace();
-			}
-		}
-		action.setEnabled(traceString != null);
-	}
-}
diff --git a/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/messages.properties b/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/messages.properties
deleted file mode 100644
index faf2fab..0000000
--- a/org.eclipse.mylyn.java.tasks/src/org/eclipse/mylyn/internal/java/tasks/messages.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-JavaStackTraceFileHyperlink_Failed_to_open_type=Failed to open type.
-JavaStackTraceFileHyperlink_Line_not_found_in_type=Line not found in type.
-JavaStackTraceFileHyperlink_link_search_complete=link search complete
-JavaStackTraceFileHyperlink_Open_Type=Open Type
-JavaStackTraceFileHyperlink_Searching_=Searching...
-JavaStackTraceFileHyperlink_Type_could_not_be_located=Type could not be located.
diff --git a/org.eclipse.mylyn.java.tests/.classpath b/org.eclipse.mylyn.java.tests/.classpath
deleted file mode 100644
index 77f8017..0000000
--- a/org.eclipse.mylyn.java.tests/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry 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.java.tests/.cvsignore b/org.eclipse.mylyn.java.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.java.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.java.tests/.project b/org.eclipse.mylyn.java.tests/.project
deleted file mode 100644
index a41c7aa..0000000
--- a/org.eclipse.mylyn.java.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.java.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.java.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.java.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 01d52ea..0000000
--- a/org.eclipse.mylyn.java.tests/.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=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.java.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.java.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.java.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.java.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.java.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.java.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.java.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.java.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.java.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.java.tests/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.mylyn.java.tests/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 9e97525..0000000
--- a/org.eclipse.mylyn.java.tests/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,145 +0,0 @@
-#Tue Apr 08 17:49:21 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.java.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.java.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.java.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.java.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.java.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index a475fb3..0000000
--- a/org.eclipse.mylyn.java.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,44 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Java Tests
-Bundle-SymbolicName: org.eclipse.mylyn.java.tests
-Bundle-Version: 0.0.0
-Bundle-Vendor: Eclipse Mylyn
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench,
- org.junit,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.junit,
- org.eclipse.ui,
- org.eclipse.mylyn.context.core,
- org.eclipse.mylyn.java.ui,
- org.eclipse.mylyn.resources.ui,
- org.eclipse.mylyn.ide.ui,
- org.eclipse.mylyn.context.ui,
- org.eclipse.ui.ide,
- org.eclipse.mylyn.tasks.ui,
- org.eclipse.jdt.launching,
- org.eclipse.mylyn.ide.tests,
- org.eclipse.mylyn.tasks.core,
- org.eclipse.mylyn.monitor.ui,
- org.eclipse.search,
- org.eclipse.mylyn.resources.tests,
- org.eclipse.mylyn.monitor.core,
- org.eclipse.mylyn.pde.ui,
- org.eclipse.mylyn.context.tests
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: mylyn-java-tests.jar
-Export-Package: org.eclipse.mylyn.java.tests;x-internal:=true,
- org.eclipse.mylyn.java.tests.search;x-internal:=true,
- org.eclipse.mylyn.java.tests.xml;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.java.tests/about.html b/org.eclipse.mylyn.java.tests/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.java.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.java.tests/build.properties b/org.eclipse.mylyn.java.tests/build.properties
deleted file mode 100644
index 1acc2e8..0000000
--- a/org.eclipse.mylyn.java.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 Mylyn project committers and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-bin.includes = META-INF/,\
-               about.html,\
-               src/,\
-               about.html,\
-               mylyn-java-tests.jar
-jars.compile.order = mylyn-java-tests.jar
-jre.compilation.profile = J2SE-1.5 
-source.mylyn-java-tests.jar = src/
-src.includes = about.html
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/AbstractJavaContextTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/AbstractJavaContextTest.java
deleted file mode 100644
index c44acb6..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/AbstractJavaContextTest.java
+++ /dev/null
@@ -1,159 +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.java.tests;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.mylyn.context.tests.AbstractContextTest;
-import org.eclipse.mylyn.context.tests.support.TestUtil;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.java.ui.JavaEditingMonitor;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-import org.eclipse.mylyn.resources.tests.ResourceTestUtil;
-
-/**
- * @author Mik Kersten
- */
-public abstract class AbstractJavaContextTest extends AbstractContextTest {
-
-	protected InteractionContextManager manager = ContextCorePlugin.getContextManager();
-
-	protected JavaEditingMonitor monitor = new JavaEditingMonitor();
-
-	protected TestJavaProject project;
-
-	protected TestProject nonJavaProject;
-
-	protected IPackageFragment p1;
-
-	protected IType type1;
-
-	protected String contextId = this.getClass().getSimpleName();
-
-	protected InteractionContext context;
-
-	protected InteractionContextScaling scaling = new InteractionContextScaling();
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		TestUtil.triggerContextUiLazyStart();
-		assertNotNull(JavaPlugin.getDefault());
-		assertNotNull(JavaUiBridgePlugin.getDefault());
-		project = new TestJavaProject(this.getClass().getSimpleName());
-		nonJavaProject = new TestProject(this.getClass().getSimpleName() + "nonJava");
-		p1 = project.createPackage("p1");
-		type1 = project.createType(p1, "Type1.java", "public class Type1 { }");
-		context = new InteractionContext(contextId, scaling);
-		context.reset();
-		manager.internalActivateContext(context);
-		assertNotNull(JavaUiBridgePlugin.getDefault());
-		assertTrue(ContextCorePlugin.getDefault().getStructureBridges().toString().indexOf(
-				JavaStructureBridge.class.getCanonicalName()) != -1);
-
-		ContextUiPlugin.getViewerManager().setSyncRefreshMode(true);
-		ResourcesUiBridgePlugin.getDefault().setResourceMonitoringEnabled(false);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		ResourcesUiBridgePlugin.getDefault().setResourceMonitoringEnabled(true);
-		context.reset();
-		assertTrue(context.getInteresting().isEmpty());
-		manager.deactivateContext(contextId);
-		manager.deleteContext(contextId);
-		ContextCorePlugin.getContextStore().getFileForContext(contextId).delete();
-
-		ResourceTestUtil.deleteProject(project.getProject());
-		ResourceTestUtil.deleteProject(nonJavaProject.getProject());
-
-		for (InteractionContext context : manager.getActiveContexts()) {
-			manager.deactivateContext(context.getHandleIdentifier());
-		}
-		assertFalse(manager.isContextActive());
-		waitForAutoBuild();
-		super.tearDown();
-	}
-
-	public static void waitForAutoBuild() {
-		boolean wasInterrupted = false;
-		do {
-			try {
-				Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-				wasInterrupted = false;
-			} catch (OperationCanceledException e) {
-				e.printStackTrace();
-			} catch (InterruptedException e) {
-				wasInterrupted = true;
-			}
-		} while (wasInterrupted);
-	}
-
-	class TestProgressMonitor implements IProgressMonitor {
-
-		boolean done = false;
-
-		public void beginTask(String name, int totalWork) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void done() {
-			done = true;
-		}
-
-		public void internalWorked(double work) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public boolean isCanceled() {
-			// TODO Auto-generated method stub
-			return false;
-		}
-
-		public void setCanceled(boolean value) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void setTaskName(String name) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void subTask(String name) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void worked(int work) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public boolean isDone() {
-			return done;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/AllJavaTests.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/AllJavaTests.java
deleted file mode 100644
index 18db58c..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/AllJavaTests.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.java.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.mylyn.context.tests.support.TestUtil;
-import org.eclipse.mylyn.java.tests.search.JUnitReferencesSearchPluginTest;
-import org.eclipse.mylyn.java.tests.search.JavaImplementorsSearchPluginTest;
-import org.eclipse.mylyn.java.tests.search.JavaReadAccessSearchPluginTest;
-import org.eclipse.mylyn.java.tests.search.JavaReferencesSearchTest;
-import org.eclipse.mylyn.java.tests.search.JavaWriteAccessSearchPluginTest;
-import org.eclipse.mylyn.java.tests.xml.XmlSearchPluginTest;
-
-/**
- * @author Mik Kersten
- */
-public class AllJavaTests {
-
-	public static Test suite() {
-		TestUtil.triggerContextUiLazyStart();
-
-		TestSuite suite = new TestSuite("Tests for org.eclipse.mylyn.java.tests");
-		suite.addTestSuite(ContentSpecificContextTest.class);
-		suite.addTestSuite(ResourceStructureMappingTest.class);
-		suite.addTestSuite(InterestManipulationTest.class);
-		suite.addTestSuite(EditorManagerTest.class);
-		suite.addTestSuite(RefactoringTest.class);
-		suite.addTestSuite(ContentOutlineRefreshTest.class);
-		suite.addTestSuite(TypeHistoryManagerTest.class);
-		suite.addTestSuite(PackageExplorerRefreshTest.class);
-		// XXX reenable test case?
-		//suite.addTestSuite(ResultUpdaterTest.class);
-		suite.addTestSuite(ProblemsListTest.class);
-		suite.addTestSuite(InterestFilterTest.class);
-		suite.addTestSuite(InteractionContextManagerTest.class);
-		suite.addTestSuite(JavaStructureTest.class);
-		suite.addTestSuite(JavaImplementorsSearchPluginTest.class);
-		suite.addTestSuite(JavaReadAccessSearchPluginTest.class);
-		suite.addTestSuite(JavaReferencesSearchTest.class);
-		suite.addTestSuite(JavaWriteAccessSearchPluginTest.class);
-		suite.addTestSuite(JUnitReferencesSearchPluginTest.class);
-		suite.addTestSuite(XmlSearchPluginTest.class);
-		suite.addTestSuite(JavaEditingMonitorTest.class);
-		return suite;
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ContentOutlineRefreshTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ContentOutlineRefreshTest.java
deleted file mode 100644
index d2e8fb1..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ContentOutlineRefreshTest.java
+++ /dev/null
@@ -1,95 +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.java.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.context.tests.UiTestUtil;
-import org.eclipse.mylyn.context.tests.support.TestUtil;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.context.ui.actions.FocusOutlineAction;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class ContentOutlineRefreshTest extends AbstractJavaContextTest {
-
-	private IViewPart view;
-
-	private FocusOutlineAction action;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		view = TestUtil.openView(FocusOutlineAction.ID_CONTENT_OUTLINE);
-		assertNotNull(view);
-		assertNotNull(ContextUiPlugin.getDefault());
-		assertNotNull(JavaUiBridgePlugin.getDefault());
-		action = new FocusOutlineAction();
-
-		UiTestUtil.closeWelcomeView();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	@SuppressWarnings("deprecation")
-	public void testContents() throws JavaModelException, PartInitException {
-		IMethod m1 = type1.createMethod("void m1() { }", null, true, null);
-		TestUtil.openView("org.eclipse.ui.views.ContentOutline");
-		JavaUI.openInEditor(m1);
-
-		// FocusOutlineAction.getDefault().update(true);
-		List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-		IEditorPart[] parts = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getEditors();
-		for (IEditorPart part : parts) {
-			if (part.getTitle().equals("Type1.java")) {
-				AbstractContextUiBridge bridge = ContextUi.getUiBridgeForEditor(part);
-				List<TreeViewer> outlineViewers = bridge.getContentOutlineViewers(part);
-				for (TreeViewer viewer : outlineViewers) {
-					if (viewer != null && !viewers.contains(viewer)) {
-						viewers.add(viewer);
-					}
-				}
-			}
-		}
-		assertEquals(1, viewers.size());
-		TreeViewer viewer = (TreeViewer) viewers.get(0);
-		assertEquals(3, UiTestUtil.countItemsInTree(viewer.getTree()));
-
-//		action.run();
-		action.updateInterestFilter(true, viewer);
-
-		assertEquals(0, UiTestUtil.countItemsInTree(viewer.getTree()));
-
-		StructuredSelection sm1 = new StructuredSelection(m1);
-		monitor.selectionChanged(view, sm1);
-		viewer.refresh();
-		assertEquals(2, UiTestUtil.countItemsInTree(viewer.getTree()));
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ContentSpecificContextTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ContentSpecificContextTest.java
deleted file mode 100644
index f324ee0..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ContentSpecificContextTest.java
+++ /dev/null
@@ -1,79 +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.java.tests;
-
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.tests.AbstractContextTest;
-import org.eclipse.mylyn.internal.context.core.CompositeInteractionContext;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- */
-public class ContentSpecificContextTest extends AbstractContextTest {
-
-	public void testEventProcessing() {
-		InteractionContext context = new InteractionContext("global-id", new InteractionContextScaling());
-		context.setContentLimitedTo(JavaStructureBridge.CONTENT_TYPE);
-		ContextCorePlugin.getContextManager().addGlobalContext(context);
-
-		ContextCore.getContextManager().processInteractionEvent(
-				new InteractionEvent(InteractionEvent.Kind.PROPAGATION, "foo-kind", "h0", MOCK_ORIGIN));
-		assertEquals(0, context.getAllElements().size());
-		ContextCorePlugin.getContextManager().processInteractionEvent(mockSelection("h1"), false, false);
-		assertEquals(1, context.getAllElements().size());
-		ContextCorePlugin.getContextManager().removeGlobalContext(context);
-	}
-
-	public void testEventProcessingCompositeContext() {
-		InteractionContext context1 = new InteractionContext("global-id-1", new InteractionContextScaling());
-		InteractionContext context2 = new InteractionContext("global-id-2", new InteractionContextScaling());
-		context1.setContentLimitedTo(JavaStructureBridge.CONTENT_TYPE);
-		context2.setContentLimitedTo(JavaStructureBridge.CONTENT_TYPE);
-
-		CompositeInteractionContext context = new CompositeInteractionContext(new InteractionContextScaling());
-		context.getContextMap().put(context1.getHandleIdentifier(), context1);
-		context.getContextMap().put(context2.getHandleIdentifier(), context2);
-		context.setContentLimitedTo(JavaStructureBridge.CONTENT_TYPE);
-		ContextCorePlugin.getContextManager().addGlobalContext(context);
-
-		ContextCore.getContextManager().processInteractionEvent(
-				new InteractionEvent(InteractionEvent.Kind.PROPAGATION, "foo-kind", "h0", MOCK_ORIGIN));
-		assertEquals(0, context.getAllElements().size());
-		assertEquals(0, context1.getAllElements().size());
-		assertEquals(0, context2.getAllElements().size());
-		ContextCorePlugin.getContextManager().processInteractionEvent(mockSelection("h1"), false, false);
-		assertEquals(1, context.getAllElements().size());
-		assertEquals(1, context1.getAllElements().size());
-		assertEquals(1, context2.getAllElements().size());
-
-		context.getContextMap().remove(context2.getHandleIdentifier());
-
-		ContextCore.getContextManager().processInteractionEvent(
-				new InteractionEvent(InteractionEvent.Kind.PROPAGATION, "foo-kind", "h0", MOCK_ORIGIN));
-		assertEquals(1, context.getAllElements().size());
-		assertEquals(1, context1.getAllElements().size());
-		assertEquals(1, context2.getAllElements().size());
-		ContextCorePlugin.getContextManager().processInteractionEvent(mockSelection("h2"), false, false);
-		assertEquals(2, context.getAllElements().size());
-		assertEquals(2, context1.getAllElements().size());
-		assertEquals(1, context2.getAllElements().size());
-
-		ContextCorePlugin.getContextManager().removeGlobalContext(context);
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/EditorManagerTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/EditorManagerTest.java
deleted file mode 100644
index 15d489d..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/EditorManagerTest.java
+++ /dev/null
@@ -1,285 +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.java.tests;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.UiTestUtil;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.context.ui.IContextUiPreferenceContstants;
-import org.eclipse.mylyn.internal.java.ui.ActiveFoldingEditorTracker;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.tasks.core.LocalTask;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * @author Mik Kersten
- */
-public class EditorManagerTest extends AbstractJavaContextTest {
-
-	private IWorkbenchPage page;
-
-	private IViewPart view;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		assertNotNull(page);
-		view = PackageExplorerPart.openInActivePerspective();
-		assertNotNull(view);
-		assertTrue(ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(
-				IContextUiPreferenceContstants.AUTO_MANAGE_EDITORS));
-
-		ContextUiPlugin.getDefault().getPreferenceStore().setValue(
-				IContextUiPreferenceContstants.AUTO_MANAGE_EDITOR_CLOSE_WARNING, false);
-		UiTestUtil.closeWelcomeView();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		ContextUiPlugin.getEditorManager().closeAllEditors();
-
-		ContextUiPlugin.getDefault().getPreferenceStore().setValue(
-				IContextUiPreferenceContstants.AUTO_MANAGE_EDITOR_CLOSE_WARNING,
-				ContextUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(
-						IContextUiPreferenceContstants.AUTO_MANAGE_EDITOR_CLOSE_WARNING));
-	}
-
-	// XXX: Put back
-//	@SuppressWarnings("deprecation")
-//	public void testAutoOpen() throws JavaModelException, InvocationTargetException, InterruptedException,
-//			PartInitException {
-//		// need a task for mementos
-//		AbstractTask task = new LocalTask(contextId, contextId);
-//		TasksUiPlugin.getTaskList().addTask(task);
-//		manager.deleteContext(contextId);
-//		ResourcesUiBridgePlugin.getEditorManager().closeAllEditors();
-//		assertEquals(0, page.getEditors().length);
-//
-//		manager.activateContext(contextId);
-//		// assertEquals(0, page.getEditors().length);
-//
-//		IType typeA = project.createType(p1, "TypeA.java", "public class TypeA{ }");
-//		IType typeB = project.createType(p1, "TypeB.java", "public class TypeB{ }");
-//
-//		JavaUI.openInEditor(typeA);
-//		JavaUI.openInEditor(typeB);
-//		//		monitor.selectionChanged(view, new StructuredSelection(typeA));
-//		//		monitor.selectionChanged(view, new StructuredSelection(typeB));
-//
-//		assertEquals(2, page.getEditors().length);
-//
-//		manager.deactivateContext(contextId);
-//		assertEquals(0, page.getEditors().length);
-//
-//		manager.activateContext(contextId);
-//		// TODO: verify number
-//		assertEquals(2, page.getEditors().length);
-//		TasksUiPlugin.getTaskList().deleteTask(task);
-//	}
-
-	public void testInterestCapturedForResourceOnFocus() throws CoreException, InvocationTargetException,
-			InterruptedException {
-
-		PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
-		ContextCore.getContextManager().setContextCapturePaused(true);
-
-		IType typeA = project.createType(p1, "TypeAa.java", "public class TypeD{ }");
-		IType typeB = project.createType(p1, "TypeBb.java", "public class TypeC{ }");
-
-		IFile fileA = (IFile) typeA.getAdapter(IResource.class);
-		IFile fileB = (IFile) typeB.getAdapter(IResource.class);
-
-		AbstractContextStructureBridge structureBridge = ContextCore.getStructureBridge(fileA);
-
-		IInteractionElement elementA = ContextCore.getContextManager().getElement(
-				structureBridge.getHandleIdentifier(fileA));
-		IInteractionElement elementB = ContextCore.getContextManager().getElement(
-				structureBridge.getHandleIdentifier(fileB));
-
-		assertFalse(elementA.getInterest().isInteresting());
-		assertFalse(elementB.getInterest().isInteresting());
-		ContextCore.getContextManager().setContextCapturePaused(false);
-
-		elementA = ContextCore.getContextManager().getElement(structureBridge.getHandleIdentifier(fileA));
-		assertFalse(elementA.getInterest().isInteresting());
-
-		IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), fileA, true);
-		elementA = ContextCore.getContextManager().getElement(structureBridge.getHandleIdentifier(fileA));
-		float selectionFactor = ContextCore.getCommonContextScaling().get(InteractionEvent.Kind.SELECTION);
-		// TODO: should use selectionFactor test instead
-		assertTrue(elementA.getInterest().isInteresting());
-		assertTrue(elementA.getInterest().getValue() <= selectionFactor);
-//		assertEquals(selectionFactor, elementA.getInterest().getValue());
-		IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), fileB, true);
-		IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), fileA, true);
-		elementA = ContextCore.getContextManager().getElement(structureBridge.getHandleIdentifier(fileA));
-		// TODO: punting on decay
-//		assertEquals(selectionFactor-decayFactor*2, elementA.getInterest().getValue());
-		assertTrue(elementA.getInterest().getValue() > 1 && elementA.getInterest().getValue() < 2);
-//		MylarContextManager.getScalingFactors().getDecay().setValue(decayFactor);
-	}
-
-	public void testWaitingListenersDoNotLeakOnEditorActivation() throws JavaModelException {
-		manager.deleteContext(contextId);
-		ContextUiPlugin.getEditorManager().closeAllEditors();
-
-		int initialNumListeners = manager.getListeners().size();
-		manager.activateContext(contextId);
-		assertEquals(initialNumListeners, manager.getListeners().size());
-
-		IType typeA = project.createType(p1, "TypeA.java", "public class TypeA{ }");
-		monitor.selectionChanged(view, new StructuredSelection(typeA));
-		manager.deactivateContext(contextId);
-		assertEquals(initialNumListeners, manager.getListeners().size());
-
-		manager.activateContext(contextId);
-		assertEquals(initialNumListeners + 1, manager.getListeners().size());
-		manager.deactivateContext(contextId);
-		assertEquals(initialNumListeners, manager.getListeners().size());
-
-		manager.activateContext(contextId);
-		manager.deactivateContext(contextId);
-		assertEquals(initialNumListeners, manager.getListeners().size());
-
-		manager.activateContext(contextId);
-		manager.deactivateContext(contextId);
-		assertEquals(initialNumListeners, manager.getListeners().size());
-	}
-
-	public void testEditorTrackerListenerRegistration() throws JavaModelException {
-		ContextUiPlugin.getEditorManager().closeAllEditors();
-
-		ActiveFoldingEditorTracker tracker = JavaUiBridgePlugin.getDefault().getEditorTracker();
-		assertTrue(tracker.getEditorListenerMap().isEmpty());
-
-		AbstractContextUiBridge bridge = ContextUi.getUiBridge(JavaStructureBridge.CONTENT_TYPE);
-		IMethod m1 = type1.createMethod("void m111() { }", null, true, null);
-		monitor.selectionChanged(view, new StructuredSelection(m1));
-
-		int numListeners = ContextCorePlugin.getContextManager().getListeners().size();
-		IInteractionElement element = ContextCore.getContextManager().getElement(type1.getHandleIdentifier());
-		bridge.open(element);
-
-		assertEquals(numListeners + 1, ContextCorePlugin.getContextManager().getListeners().size());
-		assertEquals(1, page.getEditorReferences().length);
-		assertEquals(1, tracker.getEditorListenerMap().size());
-		ContextUiPlugin.getEditorManager().closeAllEditors();
-
-		assertEquals(numListeners, ContextCorePlugin.getContextManager().getListeners().size());
-		assertEquals(0, page.getEditorReferences().length);
-		assertEquals(0, tracker.getEditorListenerMap().size());
-	}
-
-	public void testActivationPreservesActiveTaskEditor() throws JavaModelException, InvocationTargetException,
-			InterruptedException {
-		assertEquals(0, page.getEditorReferences().length);
-		AbstractTask task = new LocalTask(contextId, contextId);
-		TasksUiUtil.openTask(task);
-		assertEquals(1, page.getEditorReferences().length);
-		manager.activateContext(contextId);
-		assertEquals(1, page.getEditorReferences().length);
-	}
-
-	@SuppressWarnings("deprecation")
-	public void testAutoCloseWithDecay() throws JavaModelException, InvocationTargetException, InterruptedException {
-		ContextUiPlugin.getEditorManager().closeAllEditors();
-		assertEquals(0, page.getEditors().length);
-		AbstractContextUiBridge bridge = ContextUi.getUiBridge(JavaStructureBridge.CONTENT_TYPE);
-		IMethod m1 = type1.createMethod("void m111() { }", null, true, null);
-		monitor.selectionChanged(view, new StructuredSelection(m1));
-		IInteractionElement element = ContextCore.getContextManager().getElement(type1.getHandleIdentifier());
-		bridge.open(element);
-
-		IType typeA = project.createType(p1, "TypeA.java", "public class TypeA{ }");
-		monitor.selectionChanged(view, new StructuredSelection(typeA));
-		IInteractionElement elementA = ContextCore.getContextManager().getElement(typeA.getHandleIdentifier());
-		bridge.open(elementA);
-
-		assertEquals(2, page.getEditors().length);
-		for (int i = 0; i < 1 / (scaling.getDecay()) * 3; i++) {
-			ContextCore.getContextManager().processInteractionEvent(mockSelection());
-		}
-		assertFalse(element.getInterest().isInteresting());
-		assertFalse(elementA.getInterest().isInteresting());
-		IType typeB = project.createType(p1, "TypeB.java", "public class TypeB{ }");
-		monitor.selectionChanged(view, new StructuredSelection(typeB));
-		IInteractionElement elementB = ContextCore.getContextManager().getElement(typeB.getHandleIdentifier());
-		bridge.open(elementB);
-		monitor.selectionChanged(view, new StructuredSelection(typeB));
-		assertEquals(1, page.getEditors().length);
-	}
-
-	@SuppressWarnings("deprecation")
-	public void testAutoClose() throws JavaModelException, InvocationTargetException, InterruptedException {
-		ContextUiPlugin.getEditorManager().closeAllEditors();
-		assertEquals(0, page.getEditors().length);
-		AbstractContextUiBridge bridge = ContextUi.getUiBridge(JavaStructureBridge.CONTENT_TYPE);
-		IMethod m1 = type1.createMethod("void m111() { }", null, true, null);
-		monitor.selectionChanged(view, new StructuredSelection(m1));
-		IInteractionElement element = ContextCore.getContextManager().getElement(type1.getHandleIdentifier());
-		bridge.open(element);
-
-		assertEquals(1, page.getEditors().length);
-		manager.deactivateContext(contextId);
-		assertEquals(0, page.getEditors().length);
-	}
-
-	public void testCloseOnUninteresting() {
-		// fail();
-	}
-
-	// private int getNumActiveEditors() {
-	// return ;
-	// for (int i = 0; i < page.getEditors().length; i++) {
-	// IEditorPart editor = page.getEditors()[i];
-
-	// if (editor instanceof AbstractDecoratedTextEditor) {
-	// manager.contextDeactivated(contextId, contextId);
-	// assertEquals(0, page.getEditors().length);
-	// }
-	// }
-	// }
-
-	// assertEquals(1, page.getEditors().length);
-	// WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
-	// protected void execute(IProgressMonitor monitor) throws CoreException {
-
-	// }
-	// };
-	// IProgressService service =
-	// PlatformUI.getWorkbench().getProgressService();
-	// service.run(true, true, op);
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/FocusViewActionTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/FocusViewActionTest.java
deleted file mode 100644
index c5a9b75..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/FocusViewActionTest.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.java.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.tests.UiTestUtil;
-import org.eclipse.mylyn.context.tests.support.TestUtil;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.context.ui.actions.FocusOutlineAction;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.mylyn.internal.java.ui.actions.FocusPackageExplorerAction;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class FocusViewActionTest extends AbstractJavaContextTest {
-
-	private IViewPart view;
-
-	private FocusOutlineAction action;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		view = TestUtil.openView(FocusOutlineAction.ID_CONTENT_OUTLINE);
-		assertNotNull(view);
-		assertNotNull(ContextUiPlugin.getDefault());
-		assertNotNull(JavaUiBridgePlugin.getDefault());
-		action = new FocusOutlineAction();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testPreservationOfContextPause() {
-		FocusPackageExplorerAction action = new FocusPackageExplorerAction();
-		ContextCore.getContextManager().setContextCapturePaused(true);
-		action.update(true);
-		assertTrue(ContextCore.getContextManager().isContextCapturePaused());
-
-		ContextCore.getContextManager().setContextCapturePaused(false);
-		action.update(false);
-		assertFalse(ContextCore.getContextManager().isContextCapturePaused());
-		action.update(true);
-		assertFalse(ContextCore.getContextManager().isContextCapturePaused());
-	}
-
-	@SuppressWarnings("deprecation")
-	public void testContents() throws JavaModelException, PartInitException {
-		IMethod m1 = type1.createMethod("void m1() { }", null, true, null);
-		TestUtil.openView("org.eclipse.ui.views.ContentOutline");
-		JavaUI.openInEditor(m1);
-
-//		FocusOutlineAction.getDefault().update(true);
-		List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-		IEditorPart[] parts = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getEditors();
-		for (IEditorPart part : parts) {
-			if (part.getTitle().equals("Type1.java")) {
-				AbstractContextUiBridge bridge = ContextUi.getUiBridgeForEditor(part);
-				List<TreeViewer> outlineViewers = bridge.getContentOutlineViewers(part);
-				for (TreeViewer viewer : outlineViewers) {
-					if (viewer != null && !viewers.contains(viewer)) {
-						viewers.add(viewer);
-					}
-				}
-			}
-		}
-		assertEquals(1, viewers.size());
-		TreeViewer viewer = (TreeViewer) viewers.get(0);
-		assertEquals(3, UiTestUtil.countItemsInTree(viewer.getTree()));
-
-		action.updateInterestFilter(true, viewer);
-		assertEquals(0, UiTestUtil.countItemsInTree(viewer.getTree()));
-
-		StructuredSelection sm1 = new StructuredSelection(m1);
-		monitor.selectionChanged(view, sm1);
-		viewer.refresh();
-		assertEquals(2, UiTestUtil.countItemsInTree(viewer.getTree()));
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InteractionContextManagerTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InteractionContextManagerTest.java
deleted file mode 100644
index 5725c26..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InteractionContextManagerTest.java
+++ /dev/null
@@ -1,454 +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.java.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.core.JavaModel;
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.AbstractRelationProvider;
-import org.eclipse.mylyn.internal.context.core.CompositeInteractionContext;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-import org.eclipse.mylyn.internal.context.core.LocalContextStore;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class InteractionContextManagerTest extends AbstractJavaContextTest {
-
-	private PackageExplorerPart explorer;
-
-	private LocalContextStore contextStore;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		explorer = PackageExplorerPart.openInActivePerspective();
-		contextStore = ContextCorePlugin.getContextStore();
-		assertNotNull(explorer);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	};
-
-	class LandmarksModelListener extends AbstractContextListener {
-
-		public int numAdditions = 0;
-
-		public int numDeletions = 0;
-
-		@Override
-		public void contextChanged(ContextChangeEvent event) {
-			switch (event.getEventKind()) {
-			case LANDMARKS_ADDED:
-				numAdditions += event.getElements().size();
-				break;
-			case LANDMARKS_REMOVED:
-				numDeletions += event.getElements().size();
-				break;
-			}
-		}
-	}
-
-	public void testHandleToPathConversion() throws IOException {
-		String handle = "https://bugs.eclipse.org/bugs-123";
-		File file = contextStore.getFileForContext(handle);
-		assertFalse(file.exists());
-		file.createNewFile();
-		assertTrue(file.exists());
-	}
-
-	public void testPauseAndResume() throws JavaModelException {
-		ContextCore.getContextManager().setContextCapturePaused(true);
-		ContextCore.getContextManager().processInteractionEvent(mockInterestContribution("paused", 3));
-		IInteractionElement paused = ContextCore.getContextManager().getElement("paused");
-		assertFalse(paused.getInterest().isInteresting());
-
-		ContextCore.getContextManager().setContextCapturePaused(false);
-		ContextCore.getContextManager().processInteractionEvent(mockInterestContribution("paused", 3));
-		IInteractionElement resumed = ContextCore.getContextManager().getElement("paused");
-		assertTrue(resumed.getInterest().isInteresting());
-	}
-
-	public void testShellLifecycleActivityStart() {
-		List<InteractionEvent> events = manager.getActivityMetaContext().getInteractionHistory();
-		assertEquals(InteractionContextManager.ACTIVITY_DELTA_STARTED, events.get(0).getDelta());
-		assertEquals(InteractionContextManager.ACTIVITY_DELTA_ACTIVATED, events.get(1).getDelta());
-	}
-
-	public void testActivityHistory() {
-		manager.resetActivityMetaContext();
-		InteractionContext history = manager.getActivityMetaContext();
-		assertNotNull(history);
-		assertEquals(0, manager.getActivityMetaContext().getInteractionHistory().size());
-
-		manager.internalActivateContext(contextStore.loadContext("1"));
-		assertEquals(1, manager.getActivityMetaContext().getInteractionHistory().size());
-
-		manager.deactivateContext("2");
-		assertEquals(2, manager.getActivityMetaContext().getInteractionHistory().size());
-	}
-
-	public void testChangeHandle() {
-		ContextCore.getContextManager().processInteractionEvent(mockInterestContribution("old", 3));
-		IInteractionElement old = ContextCore.getContextManager().getElement("old");
-		assertTrue(old.getInterest().isInteresting());
-
-		ContextCore.getContextManager().getActiveContext().updateElementHandle(old, "new");
-		IInteractionElement changed = ContextCore.getContextManager().getElement("new");
-		assertTrue(changed.getInterest().isInteresting());
-	}
-
-	public void testCopyContext() {
-		File sourceFile = contextStore.getFileForContext(context.getHandleIdentifier());
-		context.parseEvent(mockSelection("1"));
-		assertFalse(context.getInteractionHistory().isEmpty());
-		contextStore.saveContext(context);
-		assertTrue(sourceFile.exists());
-
-		File toFile = contextStore.getFileForContext("toContext");
-		assertFalse(toFile.exists());
-
-		contextStore.cloneContext(context.getHandleIdentifier(), "toContext");
-		assertTrue(toFile.exists());
-
-		manager.activateContext("toContext");
-		IInteractionContext toContext = manager.getActiveContext();
-		assertFalse(toContext.getInteractionHistory().isEmpty());
-//		assertEquals(((CompositeInteractionContext) manager.getActiveContext()).get("toContext").getHandleIdentifier(),
-//				toContext.getHandleIdentifier());
-
-		toFile.delete();
-		assertFalse(toFile.delete());
-		manager.deactivateAllContexts();
-	}
-
-	public void testHasContext() {
-		contextStore.getFileForContext("1").delete();
-		assertFalse(contextStore.getFileForContext("1").exists());
-		assertFalse(manager.hasContext("1"));
-		manager.internalActivateContext(contextStore.loadContext("1"));
-		assertTrue(manager.isContextActive());
-
-		manager.deactivateContext("1");
-		assertFalse(manager.hasContext("1"));
-
-		manager.internalActivateContext(contextStore.loadContext("1"));
-		manager.processInteractionEvent(mockSelection());
-		manager.deactivateContext("1");
-		assertTrue(manager.hasContext("1"));
-		contextStore.getFileForContext("1").delete();
-	}
-
-	public void testDelete() {
-		contextStore.getFileForContext("1").delete();
-		manager.deleteContext("1");
-		assertFalse(contextStore.getFileForContext("1").exists());
-		assertFalse(manager.hasContext("1"));
-		manager.internalActivateContext(contextStore.loadContext("1"));
-		assertTrue(manager.isContextActive());
-
-		InteractionContext activeContext = ((CompositeInteractionContext) manager.getActiveContext()).getContextMap()
-				.values()
-				.iterator()
-				.next();
-		activeContext.parseEvent(mockSelection());
-		assertTrue(containsHandle(activeContext, MOCK_HANDLE));
-		activeContext.delete(activeContext.get(MOCK_HANDLE));
-		assertFalse(containsHandle(activeContext, MOCK_HANDLE));
-
-		manager.deactivateContext("1");
-		assertFalse(manager.hasContext("1"));
-
-		manager.activateContext("1");
-		activeContext = ((CompositeInteractionContext) manager.getActiveContext()).getContextMap()
-				.values()
-				.iterator()
-				.next();
-		assertFalse(containsHandle(activeContext, MOCK_HANDLE));
-
-		manager.internalActivateContext(contextStore.loadContext("1"));
-		manager.processInteractionEvent(mockSelection());
-		manager.deactivateContext("1");
-		assertTrue(manager.hasContext("1"));
-		contextStore.getFileForContext("1").delete();
-	}
-
-	private boolean containsHandle(InteractionContext context, String mockHandle) {
-		for (IInteractionElement element : context.getAllElements()) {
-			if (element.getHandleIdentifier().equals(mockHandle)) {
-				return true;
-			}
-		}
-
-		for (InteractionEvent element : context.getInteractionHistory()) {
-			if (element.getStructureHandle().equals(mockHandle)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public void testEdgeReset() throws CoreException, InterruptedException, InvocationTargetException {
-		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-		IMethod m1 = type1.createMethod("public void m1() { }", null, true, null);
-		IPackageFragment p2 = project.createPackage("p2");
-
-		IType type2 = project.createType(p2, "Type2.java", "public class Type2 { }");
-		IMethod m2 = type2.createMethod("void m2() { }", null, true, null);
-
-		assertTrue(m1.exists());
-		assertEquals(1, type1.getMethods().length);
-
-		monitor.selectionChanged(part, new StructuredSelection(m1));
-		IInteractionElement m1Node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertTrue(m1Node.getInterest().isInteresting());
-		monitor.selectionChanged(part, new StructuredSelection(m2));
-		IInteractionElement m2Node = ContextCore.getContextManager().getElement(m2.getHandleIdentifier());
-		manager.processInteractionEvent(mockInterestContribution(m2.getHandleIdentifier(), scaling.getLandmark()));
-		assertTrue(m2Node.getInterest().isLandmark());
-
-		AbstractRelationProvider provider = ContextCorePlugin.getDefault()
-				.getRelationProviders("java")
-				.iterator()
-				.next();
-		provider.createEdge(m2Node, m1Node.getContentType(), m2.getHandleIdentifier());
-
-		assertEquals(1, m2Node.getRelations().size());
-
-		manager.resetLandmarkRelationshipsOfKind(provider.getId());
-
-		assertEquals(0, m2Node.getRelations().size());
-	}
-
-	public void testPredictedInterest() {
-		IInteractionElement node = ContextCore.getContextManager().getElement("doesn't exist");
-		assertFalse(node.getInterest().isInteresting());
-		assertFalse(node.getInterest().isPropagated());
-	}
-
-	public void testParentInterestAfterDecay() throws JavaModelException {
-		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-		IMethod m1 = type1.createMethod("void m1() { }", null, true, null);
-		StructuredSelection sm1 = new StructuredSelection(m1);
-		monitor.selectionChanged(part, sm1);
-
-		IInteractionElement node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertTrue(node.getInterest().isInteresting());
-		AbstractContextStructureBridge bridge = ContextCorePlugin.getDefault()
-				.getStructureBridge(node.getContentType());
-		IInteractionElement parent = ContextCore.getContextManager().getElement(
-				bridge.getParentHandle(node.getHandleIdentifier()));
-		assertTrue(parent.getInterest().isInteresting());
-		assertTrue(parent.getInterest().isPropagated());
-
-		for (int i = 0; i < 1 / (scaling.getDecay()) * 3; i++) {
-			ContextCore.getContextManager().processInteractionEvent(mockSelection());
-		}
-
-		assertFalse(ContextCore.getContextManager().getElement(m1.getHandleIdentifier()).getInterest().isInteresting());
-		ContextCore.getContextManager().processInteractionEvent(mockSelection(m1.getHandleIdentifier()));
-		assertTrue(ContextCore.getContextManager().getElement(m1.getHandleIdentifier()).getInterest().isInteresting());
-	}
-
-	public void testPropagation() throws JavaModelException, Exception {
-		IMethod m1 = type1.createMethod("void m1() { }", null, true, null);
-		IInteractionElement node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertFalse(node.getInterest().isInteresting());
-
-		InteractionEvent event = new InteractionEvent(InteractionEvent.Kind.MANIPULATION,
-				new JavaStructureBridge().getContentType(), m1.getHandleIdentifier(), "source");
-		ContextCorePlugin.getContextManager().processInteractionEvent(event, true);
-
-		node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertTrue(node.getInterest().isInteresting());
-
-		project.build();
-		IJavaElement parent = m1.getParent();
-		IInteractionElement parentNode = ContextCore.getContextManager().getElement(parent.getHandleIdentifier());
-		assertFalse(parentNode.getInterest().isInteresting());
-
-		InteractionEvent selectionEvent = new InteractionEvent(InteractionEvent.Kind.SELECTION,
-				new JavaStructureBridge().getContentType(), m1.getHandleIdentifier(), "source");
-		ContextCorePlugin.getContextManager().processInteractionEvent(selectionEvent, true);
-		parentNode = ContextCore.getContextManager().getElement(parent.getHandleIdentifier());
-		assertTrue(parentNode.getInterest().isInteresting());
-	}
-
-	public void testIncremenOfParentDoi() throws JavaModelException, Exception {
-		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-		IMethod m1 = type1.createMethod("void m1() { }", null, true, null);
-		IInteractionElement node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertFalse(node.getInterest().isInteresting());
-
-		StructuredSelection sm1 = new StructuredSelection(m1);
-		monitor.selectionChanged(part, sm1);
-		node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertTrue(node.getInterest().isInteresting());
-
-		project.build();
-		IJavaElement parent = m1.getParent();
-		int level = 1;
-		do {
-			level++;
-			IInteractionElement parentNode = ContextCore.getContextManager().getElement(parent.getHandleIdentifier());
-			if (!(parent instanceof JavaModel)) {
-				assertEquals("failed on: " + parent.getClass(), node.getInterest().getValue(), parentNode.getInterest()
-						.getValue());
-			}
-			parent = parent.getParent();
-		} while (parent != null);
-	}
-
-	public void testIncremenOfParentDoiAfterForcedDecay() throws JavaModelException, Exception {
-		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-		IMethod m1 = type1.createMethod("void m1() { }", null, true, null);
-		IMethod m2 = type1.createMethod("void m2() { }", null, true, null);
-		IInteractionElement node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertFalse(node.getInterest().isInteresting());
-
-		monitor.selectionChanged(part, new StructuredSelection(m1));
-		node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertTrue(node.getInterest().isInteresting());
-
-		// make all the parents interest propated to have negative interest
-		IJavaElement parent = m1.getParent();
-		int level = 1;
-		do {
-			level++;
-			IInteractionElement parentNode = ContextCore.getContextManager().getElement(parent.getHandleIdentifier());
-			if (!(parent instanceof JavaModel)) {
-				assertTrue(parentNode.getInterest().isInteresting());
-				ContextCore.getContextManager().processInteractionEvent(
-						mockInterestContribution(parentNode.getHandleIdentifier(), -2
-								* parentNode.getInterest().getValue()));
-				IInteractionElement updatedParent = ContextCore.getContextManager().getElement(
-						parent.getHandleIdentifier());
-				assertFalse(updatedParent.getInterest().isInteresting());
-			}
-			parent = parent.getParent();
-		} while (parent != null);
-
-//		assertFalse(node.getInterest().isInteresting());
-
-		// select the element, should propagate up
-		monitor.selectionChanged(part, new StructuredSelection(m2));
-		monitor.selectionChanged(part, new StructuredSelection(m1));
-		node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertTrue(node.getInterest().isInteresting());
-
-		project.build();
-		parent = m1.getParent();
-		level = 1;
-		do {
-			level++;
-			IInteractionElement parentNode = ContextCore.getContextManager().getElement(parent.getHandleIdentifier());
-			if (!(parent instanceof JavaModel)) {
-				assertTrue(parentNode.getInterest().isInteresting());
-//				assertEquals("failed on: " + parent.getClass(), node.getInterest().getValue(), parentNode.getInterest()
-//						.getValue());
-			}
-			parent = parent.getParent();
-		} while (parent != null);
-	}
-
-	public void testLandmarks() throws CoreException, IOException {
-		LandmarksModelListener listener = new LandmarksModelListener();
-		try {
-			manager.addListener(listener);
-
-			IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-			IMethod m1 = type1.createMethod("void m1() { }", null, true, null);
-
-			StructuredSelection sm1 = new StructuredSelection(m1);
-			monitor.selectionChanged(part, sm1);
-			manager.processInteractionEvent(mockInterestContribution(m1.getHandleIdentifier(), scaling.getLandmark()));
-			// packages can't be landmarks
-			manager.processInteractionEvent(mockInterestContribution(m1.getCompilationUnit()
-					.getParent()
-					.getHandleIdentifier(), scaling.getLandmark()));
-			// source folders can't be landmarks
-			manager.processInteractionEvent(mockInterestContribution(m1.getCompilationUnit()
-					.getParent()
-					.getParent()
-					.getHandleIdentifier(), scaling.getLandmark()));
-			// projects can't be landmarks
-			manager.processInteractionEvent(mockInterestContribution(m1.getCompilationUnit()
-					.getParent()
-					.getParent()
-					.getParent()
-					.getHandleIdentifier(), scaling.getLandmark()));
-
-			assertEquals(1, ContextCore.getContextManager().getActiveLandmarks().size());
-			assertEquals(1, listener.numAdditions);
-
-			manager.processInteractionEvent(mockInterestContribution(m1.getHandleIdentifier(), -scaling.getLandmark()));
-			assertEquals(1, listener.numDeletions);
-		} finally {
-			manager.removeListener(listener);
-		}
-	}
-
-	public void testEventProcessWithObject() throws JavaModelException {
-		InteractionContext context = new InteractionContext("global-id", new InteractionContextScaling());
-		context.setContentLimitedTo(JavaStructureBridge.CONTENT_TYPE);
-		ContextCorePlugin.getContextManager().addGlobalContext(context);
-
-		assertEquals(0, ContextCore.getContextManager().getActiveContext().getAllElements().size());
-		assertEquals(0, context.getAllElements().size());
-		ContextCorePlugin.getContextManager().processInteractionEvent(type1, InteractionEvent.Kind.SELECTION,
-				MOCK_ORIGIN, context);
-		assertEquals(9, context.getAllElements().size());
-		assertEquals(0, ContextCore.getContextManager().getActiveContext().getAllElements().size());
-		ContextCorePlugin.getContextManager().removeGlobalContext(context);
-	}
-
-	public void testEventProcessWithNonExistentObject() throws JavaModelException {
-		InteractionContext context = new InteractionContext("global-id", new InteractionContextScaling());
-		context.setContentLimitedTo(JavaStructureBridge.CONTENT_TYPE);
-		ContextCorePlugin.getContextManager().addGlobalContext(context);
-
-		assertEquals(0, ContextCore.getContextManager().getActiveContext().getAllElements().size());
-		assertEquals(0, context.getAllElements().size());
-		ContextCorePlugin.getContextManager().processInteractionEvent(new String("non existent"),
-				InteractionEvent.Kind.SELECTION, MOCK_ORIGIN, context);
-		assertEquals(0, context.getAllElements().size());
-		assertEquals(0, ContextCore.getContextManager().getActiveContext().getAllElements().size());
-		ContextCorePlugin.getContextManager().removeGlobalContext(context);
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InterestFilterTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InterestFilterTest.java
deleted file mode 100644
index b44c2a9..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InterestFilterTest.java
+++ /dev/null
@@ -1,111 +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.java.tests;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.filters.ImportDeclarationFilter;
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.mylyn.internal.java.ui.actions.FocusPackageExplorerAction;
-
-/**
- * @author Mik Kersten
- */
-public class InterestFilterTest extends AbstractJavaContextTest {
-
-	private InterestFilter filter;
-
-	private PackageExplorerPart explorer;
-
-	private AbstractFocusViewAction applyAction;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		explorer = PackageExplorerPart.openInActivePerspective();
-		assertNotNull(explorer);
-		applyAction = AbstractFocusViewAction.getActionForPart(explorer);
-		assertTrue(applyAction instanceof FocusPackageExplorerAction);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testPreservedFilterRemovalExclusion() throws JavaModelException {
-		List<Class<?>> filterClasses = new ArrayList<Class<?>>();
-		for (ViewerFilter filter : Arrays.asList(explorer.getTreeViewer().getFilters())) {
-			filterClasses.add(filter.getClass());
-		}
-		assertTrue(filterClasses.contains(ImportDeclarationFilter.class));
-
-		applyAction.update(true);
-		filterClasses = new ArrayList<Class<?>>();
-		for (ViewerFilter filter : Arrays.asList(explorer.getTreeViewer().getFilters())) {
-			filterClasses.add(filter.getClass());
-		}
-		assertTrue(filterClasses.contains(ImportDeclarationFilter.class));
-	}
-
-	public void testFilterRemovalAndRestore() throws JavaModelException {
-		applyAction.update(false);
-		ViewerFilter[] previousFilters = explorer.getTreeViewer().getFilters();
-		assertTrue(previousFilters.length > 1);
-		for (ViewerFilter viewerFilter : previousFilters) {
-			if (viewerFilter instanceof InterestFilter) {
-				fail();
-			}
-		}
-		applyAction.update(true);
-		ViewerFilter[] afterInstall = explorer.getTreeViewer().getFilters();
-		// more than 1 since we preserve some filters
-		assertEquals(3, afterInstall.length);
-
-		applyAction.update(false);
-		ViewerFilter[] restoredFilters = explorer.getTreeViewer().getFilters();
-		assertEquals(previousFilters.length, restoredFilters.length);
-	}
-
-	public void testInterestFilter() throws JavaModelException {
-
-		applyAction.update(true);
-		filter = applyAction.getInterestFilter();
-		assertNotNull(filter);
-
-		IMethod m1 = type1.createMethod("public void m10() { }", null, true, null);
-
-		assertFalse(filter.select(explorer.getTreeViewer(), null, type1));
-		monitor.selectionChanged(PackageExplorerPart.getFromActivePerspective(), new StructuredSelection(type1));
-		manager.internalActivateContext(context);
-
-		monitor.selectionChanged(PackageExplorerPart.getFromActivePerspective(), new StructuredSelection(type1));
-		assertTrue(filter.select(explorer.getTreeViewer(), null, type1));
-
-		assertFalse(filter.select(explorer.getTreeViewer(), null, m1));
-
-//		filter.setExcludedMatches("*1*");
-//		assertTrue(filter.select(explorer.getTreeViewer(), null, m1));
-//		// teardown
-//		filter.setExcludedMatches(null);
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InterestManipulationTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InterestManipulationTest.java
deleted file mode 100644
index 324a3f2..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/InterestManipulationTest.java
+++ /dev/null
@@ -1,194 +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.java.tests;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.ui.actions.AbstractInterestManipulationAction;
-import org.eclipse.mylyn.internal.resources.ui.ResourceInteractionMonitor;
-import org.eclipse.mylyn.internal.resources.ui.ResourceStructureBridge;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- */
-public class InterestManipulationTest extends AbstractJavaContextTest {
-
-	private IInteractionElement method;
-
-	private IInteractionElement clazz;
-
-	private IInteractionElement cu;
-
-	private IMethod javaMethod;
-
-	private IType javaType;
-
-	private ICompilationUnit javaCu;
-
-	private IPackageFragment javaPackage;
-
-	private final IWorkbenchPart part = PlatformUI.getWorkbench()
-			.getActiveWorkbenchWindow()
-			.getActivePage()
-			.getActivePart();
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		javaMethod = type1.createMethod("void testDecrement() { }", null, true, null);
-		javaType = (IType) javaMethod.getParent();
-		javaCu = (ICompilationUnit) javaType.getParent();
-		javaPackage = (IPackageFragment) javaCu.getParent();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testDecrementNonJavaProject() throws CoreException, InvocationTargetException, InterruptedException {
-		IFile file = nonJavaProject.getProject().getFile("foo.txt");
-		file.create(null, true, null);
-		ResourceStructureBridge bridge = new ResourceStructureBridge();
-		new ResourceInteractionMonitor().selectionChanged(part, new StructuredSelection(file));
-
-		IInteractionElement fileElement = ContextCore.getContextManager().getElement(bridge.getHandleIdentifier(file));
-
-		IInteractionElement projectElement = ContextCore.getContextManager().getElement(
-				new ResourceStructureBridge().getHandleIdentifier(nonJavaProject.getProject()));
-
-		assertTrue(fileElement.getInterest().isInteresting());
-		assertTrue(projectElement.getInterest().isInteresting());
-
-		assertTrue(ContextCorePlugin.getContextManager().manipulateInterestForElement(projectElement, false, false,
-				false, "test"));
-
-		projectElement = ContextCore.getContextManager().getElement(
-				new ResourceStructureBridge().getHandleIdentifier(nonJavaProject.getProject()));
-
-		fileElement = ContextCore.getContextManager().getElement(bridge.getHandleIdentifier(file));
-
-		assertFalse(projectElement.getInterest().isInteresting());
-		assertFalse(fileElement.getInterest().isInteresting());
-	}
-
-	public void testDecrementAcrossBridges() throws CoreException, InvocationTargetException, InterruptedException {
-		monitor.selectionChanged(part, new StructuredSelection(javaMethod));
-		method = ContextCore.getContextManager().getElement(javaMethod.getHandleIdentifier());
-
-		IFile file = project.getProject().getFile("foo.txt");
-		file.create(null, true, null);
-		// IFile file = (IFile)javaCu.getAdapter(IResource.class);
-		ResourceStructureBridge bridge = new ResourceStructureBridge();
-		new ResourceInteractionMonitor().selectionChanged(part, new StructuredSelection(file));
-
-		IInteractionElement fileElement = ContextCore.getContextManager().getElement(bridge.getHandleIdentifier(file));
-		IInteractionElement projectElement = ContextCore.getContextManager().getElement(
-				javaCu.getJavaProject().getHandleIdentifier());
-
-		assertTrue(fileElement.getInterest().isInteresting());
-		assertTrue(method.getInterest().isInteresting());
-
-		assertTrue(ContextCorePlugin.getContextManager().manipulateInterestForElement(projectElement, false, false,
-				false, "test"));
-
-		fileElement = ContextCore.getContextManager().getElement(bridge.getHandleIdentifier(file));
-		assertFalse(fileElement.getInterest().isInteresting());
-		// TODO: re-enable, fails in AllTests
-		// assertFalse(method.getInterest().isInteresting());
-	}
-
-	public void testDecrementInterestOfCompilationUnit() throws JavaModelException {
-		monitor.selectionChanged(part, new StructuredSelection(javaMethod));
-		monitor.selectionChanged(part, new StructuredSelection(javaCu));
-		method = ContextCore.getContextManager().getElement(javaMethod.getHandleIdentifier());
-		clazz = ContextCore.getContextManager().getElement(javaType.getHandleIdentifier());
-		cu = ContextCore.getContextManager().getElement(javaCu.getHandleIdentifier());
-
-		IInteractionElement packageNode = ContextCore.getContextManager().getElement(javaPackage.getHandleIdentifier());
-
-		assertTrue(method.getInterest().isInteresting());
-		assertTrue(clazz.getInterest().isInteresting());
-		assertTrue(cu.getInterest().isInteresting());
-
-		assertTrue(ContextCorePlugin.getContextManager().manipulateInterestForElement(packageNode, false, false, false,
-				"test"));
-
-		method = ContextCore.getContextManager().getElement(javaMethod.getHandleIdentifier());
-		clazz = ContextCore.getContextManager().getElement(javaType.getHandleIdentifier());
-		cu = ContextCore.getContextManager().getElement(javaCu.getHandleIdentifier());
-
-		packageNode = ContextCore.getContextManager().getElement(javaPackage.getHandleIdentifier());
-
-		assertFalse(packageNode.getInterest().isInteresting());
-		assertFalse(cu.getInterest().isInteresting());
-		assertFalse(clazz.getInterest().isInteresting());
-		assertFalse(method.getInterest().isInteresting());
-	}
-
-	public void testManipulation() throws JavaModelException {
-		InterestManipulationAction action = new InterestManipulationAction();
-
-		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-		IMethod m1 = type1.createMethod("void m22() { }", null, true, null);
-		StructuredSelection sm1 = new StructuredSelection(m1);
-		monitor.selectionChanged(part, sm1);
-		IInteractionElement node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertFalse(node.getInterest().isLandmark());
-		assertNotNull(ContextCore.getContextManager().getActiveElement());
-		action.changeInterestForSelected(true);
-		assertTrue(node.getInterest().isLandmark());
-		action.changeInterestForSelected(true);
-
-		assertEquals((scaling.getForcedLandmark()) + scaling.get(InteractionEvent.Kind.SELECTION), node.getInterest()
-				.getValue());
-
-		action.changeInterestForSelected(false);
-
-		node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertFalse(node.getInterest().isLandmark());
-		assertTrue(node.getInterest().isInteresting());
-		action.changeInterestForSelected(false);
-		assertFalse(node.getInterest().isInteresting());
-		assertEquals(node.getInterest().getValue(), -scaling.get(InteractionEvent.Kind.SELECTION));
-		action.changeInterestForSelected(false);
-		assertEquals(node.getInterest().getValue(), -scaling.get(InteractionEvent.Kind.SELECTION));
-	}
-
-	class InterestManipulationAction extends AbstractInterestManipulationAction {
-
-		@Override
-		protected boolean isIncrement() {
-			return true;
-		}
-
-		public void changeInterestForSelected(boolean increment) {
-			assertTrue(ContextCorePlugin.getContextManager().manipulateInterestForElement(
-					ContextCore.getContextManager().getActiveElement(), increment, false, true, ""));
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaEditingMonitorTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaEditingMonitorTest.java
deleted file mode 100644
index 2d16abb..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaEditingMonitorTest.java
+++ /dev/null
@@ -1,163 +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.java.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.mylyn.internal.java.ui.JavaEditingMonitor;
-import org.eclipse.mylyn.monitor.core.IInteractionEventListener;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.core.InteractionEvent.Kind;
-import org.eclipse.mylyn.monitor.ui.MonitorUi;
-import org.eclipse.mylyn.resources.tests.ResourceTestUtil;
-import org.eclipse.ui.PartInitException;
-
-/**
- * @author Jingwen Ou
- * @author Shawn Minto
- */
-public class JavaEditingMonitorTest extends AbstractJavaContextTest {
-	private IMethod callee;
-
-	private IMethod caller;
-
-	private int editingCount;
-
-	private final JavaEditingMonitor monitor = new JavaEditingMonitor();
-
-	private IPackageFragment pkg;
-
-	private TestJavaProject project;
-
-	private int selectingCount;
-
-	private IType typeFoo;
-
-	@Override
-	protected void setUp() throws Exception {
-		project = new TestJavaProject(this.getClass().getName());
-		pkg = project.createPackage("pkg1");
-		typeFoo = project.createType(pkg, "Foo.java", "public class Foo { }");
-		caller = typeFoo.createMethod("void caller() {  }", null, true, null);
-		callee = typeFoo.createMethod("void callee() { }", callee, true, null);
-
-		selectingCount = 0;
-		editingCount = 0;
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		ResourceTestUtil.deleteProject(project.getProject());
-	}
-
-	/**
-	 * Selects a method twice to see whether the editing is handled correctly. Note: Two sequential selections on the
-	 * same element are deemed to be an edit of the selection as this is the best guess that can be made. See bug
-	 * 252306.
-	 */
-	public void testHandleElementEdit() throws PartInitException, JavaModelException, InterruptedException {
-		IInteractionEventListener listener = new IInteractionEventListener() {
-			public void interactionObserved(InteractionEvent event) {
-				if (event.getKind() == Kind.EDIT) {
-					editingCount++;
-				} else if (event.getKind() == Kind.SELECTION) {
-					selectingCount++;
-				}
-			}
-
-			public void startMonitoring() {
-				// ignore
-			}
-
-			public void stopMonitoring() {
-				// ignore
-			}
-		};
-		MonitorUi.addInteractionListener(listener);
-
-		CompilationUnitEditor editorPart = (CompilationUnitEditor) JavaUI.openInEditor(caller);
-		Document document = new Document(typeFoo.getCompilationUnit().getSource());
-
-		// select callee
-		TextSelection calleeSelection = new TextSelection(document, typeFoo.getCompilationUnit().getSource().indexOf(
-				"callee()"), "callee".length());
-		editorPart.setHighlightRange(calleeSelection.getOffset(), calleeSelection.getLength(), true);
-
-		// select it once
-		monitor.handleWorkbenchPartSelection(editorPart, calleeSelection, false);
-
-		assertEquals(0, editingCount);
-		assertEquals(1, selectingCount);
-
-		// select it again
-		monitor.handleWorkbenchPartSelection(editorPart, calleeSelection, false);
-
-		assertEquals(1, editingCount);
-		assertEquals(1, selectingCount);
-	}
-
-	public void testHandleElementSelection() throws PartInitException, JavaModelException, InterruptedException {
-		IInteractionEventListener listener = new IInteractionEventListener() {
-			public void interactionObserved(InteractionEvent event) {
-				if (event.getKind() == Kind.EDIT) {
-					editingCount++;
-				} else if (event.getKind() == Kind.SELECTION) {
-					selectingCount++;
-				}
-			}
-
-			public void startMonitoring() {
-				// ignore
-			}
-
-			public void stopMonitoring() {
-				// ignore
-			}
-		};
-		MonitorUi.addInteractionListener(listener);
-
-		CompilationUnitEditor editorPart = (CompilationUnitEditor) JavaUI.openInEditor(caller);
-		Document document = new Document(typeFoo.getCompilationUnit().getSource());
-
-		// select callee
-		TextSelection calleeSelection = new TextSelection(document, typeFoo.getCompilationUnit().getSource().indexOf(
-				"callee()"), "callee".length());
-		editorPart.setHighlightRange(calleeSelection.getOffset(), calleeSelection.getLength(), true);
-
-		// select it once
-		monitor.handleWorkbenchPartSelection(editorPart, calleeSelection, false);
-
-		assertEquals(0, editingCount);
-		assertEquals(1, selectingCount);
-
-		TextSelection callerSelection = new TextSelection(document, typeFoo.getCompilationUnit().getSource().indexOf(
-				"caller()"), "caller".length());
-		editorPart.setHighlightRange(callerSelection.getOffset(), callerSelection.getLength(), true);
-		// select a different element
-		monitor.handleWorkbenchPartSelection(editorPart, callerSelection, false);
-
-		assertEquals(0, editingCount);
-		assertEquals(2, selectingCount);
-
-		// select a different element
-		monitor.handleWorkbenchPartSelection(editorPart, callerSelection, false);
-
-		assertEquals(1, editingCount);
-		assertEquals(2, selectingCount);
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaStructureTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaStructureTest.java
deleted file mode 100644
index ab4e0b1..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaStructureTest.java
+++ /dev/null
@@ -1,110 +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.java.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-import org.eclipse.mylyn.internal.java.ui.JavaEditingMonitor;
-import org.eclipse.mylyn.resources.tests.ResourceTestUtil;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class JavaStructureTest extends AbstractJavaContextTest {
-
-	private final InteractionContextManager manager = ContextCorePlugin.getContextManager();
-
-	private final JavaEditingMonitor monitor = new JavaEditingMonitor();
-
-	private final IWorkbenchPart part = PlatformUI.getWorkbench()
-			.getActiveWorkbenchWindow()
-			.getActivePage()
-			.getActivePart();
-
-	private TestJavaProject project;
-
-	private IPackageFragment pkg;
-
-	private IType typeFoo;
-
-	private IMethod caller;
-
-	private IMethod callee;
-
-	private InteractionContext taskscape;
-
-	private final InteractionContextScaling scaling = new InteractionContextScaling();
-
-	@Override
-	protected void setUp() throws Exception {
-		project = new TestJavaProject(this.getClass().getName());
-		pkg = project.createPackage("pkg1");
-		typeFoo = project.createType(pkg, "Foo.java", "public class Foo { }");
-		caller = typeFoo.createMethod("void caller() { callee(); }", null, true, null);
-		callee = typeFoo.createMethod("void callee() { }", callee, true, null);
-
-		taskscape = new InteractionContext("12312", scaling);
-		manager.internalActivateContext(taskscape);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		manager.deactivateContext("12312");
-		ResourceTestUtil.deleteProject(project.getProject());
-	}
-
-	public void testNavigation() throws JavaModelException, PartInitException {
-		CompilationUnitEditor editorPart = (CompilationUnitEditor) JavaUI.openInEditor(caller);
-
-		monitor.selectionChanged(part, new StructuredSelection(caller));
-
-		Document document = new Document(typeFoo.getCompilationUnit().getSource());
-
-		TextSelection callerSelection = new TextSelection(document, typeFoo.getCompilationUnit().getSource().indexOf(
-				"callee();"), "callee".length());
-		editorPart.setHighlightRange(callerSelection.getOffset(), callerSelection.getLength(), true);
-		monitor.selectionChanged(editorPart, callerSelection);
-
-		TextSelection calleeSelection = new TextSelection(document, callee.getSourceRange().getOffset(),
-				callee.getSourceRange().getLength());
-		editorPart.setHighlightRange(callerSelection.getOffset(), callerSelection.getLength(), true);
-		monitor.selectionChanged(editorPart, calleeSelection);
-
-		IInteractionElement callerNode = manager.getElement(caller.getHandleIdentifier());
-		IInteractionElement calleeNode = manager.getElement(callee.getHandleIdentifier());
-		assertTrue(callerNode.getInterest().isInteresting());
-		assertTrue(calleeNode.getInterest().isInteresting());
-		assertEquals(1, callerNode.getRelations().size());
-
-		TextSelection callerAgain = new TextSelection(document, typeFoo.getCompilationUnit().getSource().indexOf(
-				"callee();"), "callee".length());
-		editorPart.setHighlightRange(callerAgain.getOffset(), callerAgain.getLength(), true);
-		monitor.selectionChanged(editorPart, callerSelection);
-		assertTrue(calleeNode.getRelations().size() == 1);
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/PackageExplorerRefreshTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/PackageExplorerRefreshTest.java
deleted file mode 100644
index 7f96156..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/PackageExplorerRefreshTest.java
+++ /dev/null
@@ -1,100 +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.java.tests;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.mylyn.context.tests.UiTestUtil;
-import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-
-/**
- * @author Mik Kersten
- */
-public class PackageExplorerRefreshTest extends AbstractJavaContextTest {
-
-	private PackageExplorerPart view;
-
-	private TreeViewer viewer;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		view = PackageExplorerPart.openInActivePerspective();
-		viewer = view.getTreeViewer();
-		ContextUiPlugin.getViewerManager().setSyncRefreshMode(true);
-		AbstractFocusViewAction.getActionForPart(view).update(true);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testIsEmptyAfterDeactivation() throws JavaModelException, InterruptedException {
-		IMethod m1 = type1.createMethod("void m111() { }", null, true, null);
-		StructuredSelection sm1 = new StructuredSelection(m1);
-		monitor.selectionChanged(view, sm1);
-		viewer.expandAll();
-
-		assertTrue(UiTestUtil.countItemsInTree(viewer.getTree()) > 0);
-		assertNotNull(viewer.testFindItem(m1));
-		assertNotNull(viewer.testFindItem(m1.getParent()));
-
-		manager.deactivateContext(contextId);
-		AbstractFocusViewAction.getActionForPart(view).update(true);
-		assertTrue("num items: " + UiTestUtil.countItemsInTree(viewer.getTree()),
-				UiTestUtil.countItemsInTree(viewer.getTree()) == 0);
-		AbstractFocusViewAction.getActionForPart(view).update();
-	}
-
-	public void testFocusPackageExplorerFilterAddition() {
-		AbstractFocusViewAction.getActionForPart(view).update(false);
-		List<ViewerFilter> filters = Arrays.asList(viewer.getFilters());
-
-		for (ViewerFilter viewerFilter : filters) {
-			if (viewerFilter instanceof InterestFilter) {
-				fail();
-			}
-		}
-
-		AbstractFocusViewAction.getActionForPart(view).update(true);
-		AbstractFocusViewAction.getActionForPart(view).update(true);
-
-		filters = Arrays.asList(viewer.getFilters());
-		int filterCount = 0;
-		for (ViewerFilter viewerFilter : filters) {
-			if (viewerFilter instanceof InterestFilter) {
-				filterCount++;
-			}
-		}
-		assertEquals(1, filterCount);
-	}
-
-	public void testPropagation() throws JavaModelException {
-		IMethod m1 = type1.createMethod("void m111() { }", null, true, null);
-		StructuredSelection sm1 = new StructuredSelection(m1);
-		monitor.selectionChanged(view, sm1);
-		viewer.expandAll();
-
-		assertNotNull(viewer.testFindItem(m1));
-		assertNotNull(viewer.testFindItem(m1.getParent()));
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ProblemsListTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ProblemsListTest.java
deleted file mode 100644
index aa1699f..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ProblemsListTest.java
+++ /dev/null
@@ -1,74 +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.java.tests;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaModelMarker;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.mylyn.internal.ide.ui.MarkerViewerInterestSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.views.markers.internal.ProblemMarker;
-
-/**
- * @author Mik Kersten
- */
-public class ProblemsListTest extends AbstractJavaContextTest {
-
-	boolean done = false;
-
-	public void testInterestSorting() throws CoreException, InvocationTargetException, InterruptedException {
-		IViewPart problemsPart = JavaPlugin.getActivePage().showView("org.eclipse.ui.views.ProblemView");
-		assertNotNull(problemsPart);
-
-		IMethod m1 = type1.createMethod("void m1() { int a; }\n", null, true, null);
-		IMethod m2 = type1.createMethod("void m2() { int b; }\n", null, true, null);
-		type1.createMethod("void m3() { c; }", null, true, null);
-		project.build();
-
-		manager.processInteractionEvent(mockInterestContribution(m1.getHandleIdentifier(), 3f));
-		manager.processInteractionEvent(mockInterestContribution(m2.getHandleIdentifier(), 2f));
-
-		TableViewer viewer = new TableViewer(new Table(problemsPart.getViewSite().getShell(), SWT.NULL));
-		viewer.setSorter(new MarkerViewerInterestSorter());
-
-		IMarker[] markers = type1.getResource().findMarkers(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER, false,
-				IResource.DEPTH_INFINITE);
-		List<ProblemMarker> problemMarkers = new ArrayList<ProblemMarker>();
-		for (IMarker marker2 : markers) {
-			ProblemMarker marker = new ProblemMarker(marker2);
-			problemMarkers.add(marker);
-			viewer.add(marker);
-		}
-
-		// TODO: re-enable
-		// // item 0 should be error
-		// assertEquals(problemMarkers.get(0),
-		// viewer.getTable().getItem(1).getData());
-		// viewer.refresh();
-		// manager.handleInteractionEvent(mockInterestContribution(m2.getHandleIdentifier(),
-		// 4f));
-		// for (int i = 0; i < markers.length; i++) viewer.add(new
-		// ProblemMarker(markers[i]));
-		// assertEquals(problemMarkers.get(1),
-		// viewer.getTable().getItem(1).getData());
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/RefactoringTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/RefactoringTest.java
deleted file mode 100644
index 7b7f879..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/RefactoringTest.java
+++ /dev/null
@@ -1,120 +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.java.tests;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.java.ui.InterestUpdateDeltaListener;
-import org.eclipse.ui.IViewPart;
-
-/**
- * @author Mik Kersten
- */
-public class RefactoringTest extends AbstractJavaContextTest {
-
-	private IViewPart view;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		view = PackageExplorerPart.openInActivePerspective();
-		InterestUpdateDeltaListener.setAsyncExecMode(false);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testDelete() throws CoreException, InvocationTargetException, InterruptedException {
-		IType type = project.createType(p1, "Refactor.java", "public class Refactor { }");
-
-		IMethod method = type.createMethod("public void deleteMe() { }", null, true, null);
-		monitor.selectionChanged(view, new StructuredSelection(method));
-		IInteractionElement node = ContextCore.getContextManager().getElement(method.getHandleIdentifier());
-		assertTrue(node.getInterest().isInteresting());
-		project.build();
-		TestProgressMonitor monitor = new TestProgressMonitor();
-		method.delete(true, monitor);
-		if (!monitor.isDone()) {
-			Thread.sleep(100);
-		}
-		IInteractionElement deletedNode = ContextCore.getContextManager().getElement(method.getHandleIdentifier());
-		assertFalse(deletedNode.getInterest().isInteresting());
-	}
-
-	// XXX: Put back
-	/**
-	 * Limitation: only interest of compilation unit is preserved
-	 */
-	public void testTypeRename() throws CoreException, InterruptedException, InvocationTargetException {
-		IType type = project.createType(p1, "Refactor.java", "public class Refactor { }");
-		monitor.selectionChanged(view, new StructuredSelection(type));
-		monitor.selectionChanged(view, new StructuredSelection(type.getParent()));
-		project.build();
-		IInteractionElement node = ContextCore.getContextManager().getElement(type.getHandleIdentifier());
-		IInteractionElement parentNode = ContextCore.getContextManager().getElement(
-				type.getParent().getHandleIdentifier());
-		assertTrue(node.getInterest().isInteresting());
-		assertTrue(parentNode.getInterest().isInteresting());
-
-		TestProgressMonitor monitor = new TestProgressMonitor();
-		type.rename("NewName", true, monitor);
-		if (!monitor.isDone()) {
-			Thread.sleep(200);
-		}
-		project.build();
-		ICompilationUnit unit = (ICompilationUnit) p1.getChildren()[0];
-
-		IType newType = unit.getTypes()[0];
-		IInteractionElement oldParentNode = ContextCore.getContextManager()
-				.getElement(parentNode.getHandleIdentifier());
-		assertFalse(oldParentNode.getInterest().isInteresting());
-		IInteractionElement newParentNode = ContextCore.getContextManager().getElement(
-				newType.getParent().getHandleIdentifier());
-		assertTrue(newParentNode.getInterest().isInteresting());
-	}
-
-	public void testMethodRename() throws CoreException, InterruptedException, InvocationTargetException {
-		IType type = project.createType(p1, "Refactor.java", "public class Refactor { }");
-		IMethod method = type.createMethod("public void refactorMe() { }", null, true, null);
-
-		assertTrue(method.exists());
-		assertEquals(1, type.getMethods().length);
-
-		monitor.selectionChanged(view, new StructuredSelection(method));
-		IInteractionElement node = ContextCore.getContextManager().getElement(method.getHandleIdentifier());
-		assertTrue(node.getInterest().isInteresting());
-
-		project.build();
-		TestProgressMonitor monitor = new TestProgressMonitor();
-		method.rename("refactored", true, monitor);
-		if (!monitor.isDone()) {
-			Thread.sleep(200);
-		}
-		IMethod newMethod = type.getMethods()[0];
-		assertTrue(newMethod.getElementName().equals("refactored"));
-		IInteractionElement newNode = ContextCore.getContextManager().getElement(newMethod.getHandleIdentifier());
-		assertTrue(newNode.getInterest().isInteresting());
-
-		IInteractionElement goneNode = ContextCore.getContextManager().getElement(node.getHandleIdentifier());
-		assertFalse(goneNode.getInterest().isInteresting());
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ResourceStructureMappingTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ResourceStructureMappingTest.java
deleted file mode 100644
index 7b3712a..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/ResourceStructureMappingTest.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.java.tests;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class ResourceStructureMappingTest extends AbstractJavaContextTest {
-
-	public void testParentResourceMapping() throws CoreException {
-		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-		IMethod m1 = type1.createMethod("public void m1() { }", null, true, null);
-
-		monitor.selectionChanged(part, new StructuredSelection(m1));
-		IInteractionElement m1Node = ContextCore.getContextManager().getElement(m1.getHandleIdentifier());
-		assertTrue(m1Node.getInterest().isInteresting());
-
-		IResource containingResource = ResourcesUiBridgePlugin.getDefault().getResourceForElement(m1Node, true);
-		assertEquals(m1.getCompilationUnit().getAdapter(IResource.class), containingResource);
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TestJavaProject.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TestJavaProject.java
deleted file mode 100644
index f00a88c..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TestJavaProject.java
+++ /dev/null
@@ -1,172 +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.java.tests;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.TypeNameRequestor;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.progress.IProgressService;
-
-/**
- * From Erich Gamma's "Contributing to Eclipse" book.
- * 
- * @author Mik Kersten
- */
-public class TestJavaProject {
-	public IProject project;
-
-	public IJavaProject javaProject;
-
-	private IPackageFragmentRoot sourceFolder;
-
-	public TestJavaProject(final String name) throws CoreException, InvocationTargetException, InterruptedException {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		project = root.getProject(name);
-		project.create(null);
-		project.open(null);
-
-		javaProject = JavaCore.create(project);
-		IFolder binFolder = createBinFolder();
-		setJavaNature();
-		javaProject.setRawClasspath(new IClasspathEntry[0], null);
-		createOutputFolder(binFolder);
-		addSystemLibraries();
-	}
-
-	public IProject getProject() {
-		return project;
-	}
-
-	public IJavaProject getJavaProject() {
-		return javaProject;
-	}
-
-	public void build() throws CoreException, InvocationTargetException, InterruptedException {
-		WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
-			@Override
-			protected void execute(IProgressMonitor monitor) throws CoreException {
-				project.build(IncrementalProjectBuilder.FULL_BUILD, null);
-			};
-		};
-		IProgressService service = PlatformUI.getWorkbench().getProgressService();
-		service.run(true, true, op);
-	}
-
-	public IPackageFragment createPackage(String name) throws CoreException {
-		if (sourceFolder == null) {
-			sourceFolder = createSourceFolder();
-		}
-		return sourceFolder.createPackageFragment(name, false, null);
-	}
-
-	public IType createType(IPackageFragment pack, String cuName, String source) throws JavaModelException {
-		StringBuffer buf = new StringBuffer();
-		buf.append("package " + pack.getElementName() + ";\n");
-		buf.append("\n");
-		buf.append(source);
-		ICompilationUnit cu = pack.createCompilationUnit(cuName, buf.toString(), false, null);
-		return cu.getTypes()[0];
-	}
-
-	private IFolder createBinFolder() throws CoreException {
-		IFolder binFolder = project.getFolder("bin");
-		binFolder.create(false, true, null);
-		return binFolder;
-	}
-
-	private void setJavaNature() throws CoreException {
-		IProjectDescription description = project.getDescription();
-		description.setNatureIds(new String[] { JavaCore.NATURE_ID });
-		project.setDescription(description, null);
-	}
-
-	private void createOutputFolder(IFolder binFolder) throws JavaModelException {
-		IPath outputLocation = binFolder.getFullPath();
-		javaProject.setOutputLocation(outputLocation, null);
-	}
-
-	private IPackageFragmentRoot createSourceFolder() throws CoreException {
-		IFolder folder = project.getFolder("src");
-		folder.create(false, true, null);
-		IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder);
-
-		IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
-		IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
-		newEntries[oldEntries.length] = JavaCore.newSourceEntry(root.getPath());
-		javaProject.setRawClasspath(newEntries, null);
-		return root;
-	}
-
-	private void addSystemLibraries() throws JavaModelException {
-		IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
-		IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
-		newEntries[oldEntries.length] = JavaRuntime.getDefaultJREContainerEntry();
-		javaProject.setRawClasspath(newEntries, null);
-	}
-
-	public void addJar(Plugin plugin, String jar) throws MalformedURLException, IOException, JavaModelException {
-		Path result = findFileInPlugin(plugin, jar);
-		IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
-		IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
-		newEntries[oldEntries.length] = JavaCore.newLibraryEntry(result, null, null);
-		javaProject.setRawClasspath(newEntries, null);
-	}
-
-	private Path findFileInPlugin(Plugin plugin, String file) throws MalformedURLException, IOException {
-		// Plugin p = Platform.getPlugin(plugin);
-		URL pluginURL = plugin.getBundle().getEntry("/");
-		URL jarURL = new URL(pluginURL, file);
-		URL localJarURL = FileLocator.toFileURL(jarURL);//Platform.asLocalURL(jarURL);
-		return new Path(localJarURL.getPath());
-	}
-
-	@SuppressWarnings("deprecation")
-	public void waitForIndexer() throws JavaModelException {
-		new SearchEngine().searchAllTypeNames(null, null, SearchPattern.R_EXACT_MATCH, IJavaSearchConstants.CLASS,
-				SearchEngine.createJavaSearchScope(new IJavaElement[0]), new TypeNameRequestor() {
-					// nothing needs to be done here...we accept everything
-				}, IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TestProject.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TestProject.java
deleted file mode 100644
index bbf5af4..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TestProject.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.java.tests;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author Shawn Minto
- */
-public class TestProject {
-	public IProject project;
-
-	public TestProject(final String name) throws CoreException, InvocationTargetException, InterruptedException {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		project = root.getProject(name);
-		project.create(null);
-		project.open(null);
-	}
-
-	public IProject getProject() {
-		return project;
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TypeHistoryManagerTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TypeHistoryManagerTest.java
deleted file mode 100644
index 8f3dbf6..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/TypeHistoryManagerTest.java
+++ /dev/null
@@ -1,56 +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.java.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.corext.util.OpenTypeHistory;
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.internal.java.ui.TypeHistoryManager;
-
-/**
- * @author Mik Kersten
- */
-public class TypeHistoryManagerTest extends AbstractJavaContextTest {
-
-	private TypeHistoryManager manager;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		manager = new TypeHistoryManager();
-//		ContextCorePlugin.getContextManager().addListener(manager);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-//		ContextCorePlugin.getContextManager().removeListener(manager);
-	}
-
-	public void testPredictedElementPopulationOfTypeHistory() throws JavaModelException {
-		manager.clearTypeHistory();
-		assertEquals(0, OpenTypeHistory.getInstance().getTypeInfos().length);
-
-		StructuredSelection sm1 = new StructuredSelection(type1);
-		monitor.selectionChanged(PackageExplorerPart.openInActivePerspective(), sm1);
-		assertEquals(1, OpenTypeHistory.getInstance().getTypeInfos().length);
-
-		IType type2 = project.createType(p1, "Type2.java", "public class Type2 { }");
-		IMethod m1 = type2.createMethod("void m1() { }", null, true, null);
-		StructuredSelection sm2 = new StructuredSelection(m1);
-		monitor.selectionChanged(PackageExplorerPart.openInActivePerspective(), sm2);
-		assertEquals(2, OpenTypeHistory.getInstance().getTypeInfos().length);
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/ActiveSearchNotifier.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/ActiveSearchNotifier.java
deleted file mode 100644
index 16597f9..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/ActiveSearchNotifier.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.java.tests.search;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.AbstractContextTest;
-import org.eclipse.mylyn.internal.context.core.CompositeInteractionContext;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Shawn Minto
- */
-public class ActiveSearchNotifier extends AbstractContextTest {
-
-	private CompositeInteractionContext context;
-
-	private final String source;
-
-	public ActiveSearchNotifier(CompositeInteractionContext context, String source) {
-		this.context = context;
-		this.source = source;
-	}
-
-	public IInteractionElement mockLowerInterest(IInteractionElement node) {
-		return context.addEvent(mockUserEvent(node.getHandleIdentifier(), node.getContentType(), source, -3));
-	}
-
-	public IInteractionElement mockRaiseInterest(IInteractionElement node) {
-		return context.addEvent(mockUserEvent(node.getHandleIdentifier(), node.getContentType(), source, 2));
-	}
-
-	public IInteractionElement mockLowerInterest(String handle, String kind) {
-		return mockLowerInterest(mockEditorSelection(handle, kind));
-	}
-
-	public IInteractionElement mockRaiseInterest(String handle, String kind) {
-		return mockRaiseInterest(mockEditorSelection(handle, kind));
-	}
-
-	public IInteractionElement mockEditorSelection(String handle, String kind) {
-		context.addEvent(mockSelection(handle, kind, source));
-		return context.addEvent(mockSelection(handle, kind, source));
-	}
-
-	public IInteractionElement getElement(String handle, String kind) {
-		IInteractionElement node = context.addEvent(mockSelection(handle, kind, source));
-		ContextCorePlugin.getContextManager().processInteractionEvent(
-				mockUserEvent(handle, kind, source, (1 / ContextCore.getCommonContextScaling().getLandmark()) * -2),
-				true);
-		return node;
-	}
-
-	public void clearContext() throws IOException, CoreException {
-		WorkspaceSetupHelper.clearDoiModel();
-		try {
-			InteractionContext workspaceContext = WorkspaceSetupHelper.getContext();
-			ContextCore.getContextManager().activateContext(workspaceContext.getHandleIdentifier());
-			context = (CompositeInteractionContext) ContextCore.getContextManager().getActiveContext();
-		} catch (Exception e) {
-			fail();
-		}
-	}
-
-	private InteractionEvent mockSelection(String handle, String kind, String origin) {
-		return new InteractionEvent(InteractionEvent.Kind.SELECTION, kind, handle, origin);
-	}
-
-	private InteractionEvent mockUserEvent(String handle, String kind, String origin, float scale) {
-		InteractionEvent e = new InteractionEvent(InteractionEvent.Kind.MANIPULATION, kind, handle, origin, scale
-				* ContextCore.getCommonContextScaling().getLandmark());
-		e.getInterestContribution();
-		return e;
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JUnitReferencesSearchPluginTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JUnitReferencesSearchPluginTest.java
deleted file mode 100644
index e81c039..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JUnitReferencesSearchPluginTest.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.java.tests.search;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.support.search.ISearchPluginTest;
-import org.eclipse.mylyn.context.tests.support.search.TestActiveSearchListener;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchOperation;
-import org.eclipse.mylyn.internal.java.ui.search.JUnitReferencesProvider;
-
-/**
- * @author Mik Kersten
- */
-public class JUnitReferencesSearchPluginTest extends TestCase implements ISearchPluginTest {
-
-	// TESTCASENEEDED need a project that has a method that starts with test,
-	// but doesn't extend junit.framework.TestCase
-
-	public void testJUnitReferencesSearchDOS1() {
-		// List<?> results = search(1);
-	}
-
-	//	
-	// public void testJUnitReferencesSearchDOS2(){
-	// List<?> results = search(2);
-	// }
-	//	
-	// public void testJUnitReferencesSearchDOS3(){
-	// List<?> results = search(3);
-	// }
-	//	
-	// public void testJUnitReferencesSearchDOS4(){
-	// List<?> results = search(4);
-	// }
-	//	
-	// public void testJUnitReferencesSearchDOS5(){
-	// List<?> results = search(5);
-	// }
-
-	public List<?> search(int dos, IInteractionElement node) {
-
-		if (node == null) {
-			return null;
-		}
-
-		// test with each of the sepatations
-		JUnitReferencesProvider prov = new JUnitReferencesProvider();
-
-		TestActiveSearchListener l = new TestActiveSearchListener(prov);
-		IActiveSearchOperation o = prov.getSearchOperation(node, IJavaSearchConstants.REFERENCES, dos);
-		SearchPluginTestHelper.search(o, l);
-		return l.getResults();
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaImplementorsSearchPluginTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaImplementorsSearchPluginTest.java
deleted file mode 100644
index d5cdeda..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaImplementorsSearchPluginTest.java
+++ /dev/null
@@ -1,74 +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.java.tests.search;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.support.search.ISearchPluginTest;
-import org.eclipse.mylyn.context.tests.support.search.TestActiveSearchListener;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchOperation;
-import org.eclipse.mylyn.internal.java.ui.search.JavaImplementorsProvider;
-
-/**
- * @author Mik Kersten
- */
-public class JavaImplementorsSearchPluginTest extends TestCase implements ISearchPluginTest {
-
-	@Override
-	protected void setUp() throws Exception {
-		// nothing to do here yet
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		// nothing to do here yet
-	}
-
-	public void testJavaImplementorsSearchDOS1() throws InterruptedException {
-		// List<?> results = search(1);
-	}
-
-	//	
-	// public void testJavaImplementorsSearchDOS2(){
-	// List<?> results = search(2);
-	// }
-	//	
-	// public void testJavaImplementorsSearchDOS3(){
-	// List<?> results = search(3);
-	// }
-	//	
-	// public void testJavaImplementorsSearchDOS4(){
-	// List<?> results = search(4);
-	// }
-	//	
-	// public void testJavaImplementorsSearchDOS5(){
-	// List<?> results = search(5);
-	// }
-
-	public List<?> search(int dos, IInteractionElement node) {
-		if (node == null) {
-			return null;
-		}
-
-		// test with each of the sepatations
-		JavaImplementorsProvider prov = new JavaImplementorsProvider();
-
-		IActiveSearchOperation o = prov.getSearchOperation(node, IJavaSearchConstants.IMPLEMENTORS, dos);
-		TestActiveSearchListener l = new TestActiveSearchListener(prov);
-		SearchPluginTestHelper.search(o, l);
-		return l.getResults();
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaReadAccessSearchPluginTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaReadAccessSearchPluginTest.java
deleted file mode 100644
index 66d4bd0..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaReadAccessSearchPluginTest.java
+++ /dev/null
@@ -1,65 +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.java.tests.search;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.support.search.ISearchPluginTest;
-import org.eclipse.mylyn.context.tests.support.search.TestActiveSearchListener;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchOperation;
-import org.eclipse.mylyn.internal.java.ui.search.JavaReadAccessProvider;
-
-/**
- * @author Mik Kersten
- */
-public class JavaReadAccessSearchPluginTest extends TestCase implements ISearchPluginTest {
-
-	public void testJavaReadAccessSearchDOS1() {
-		// List<?> results = search(1);
-	}
-
-	//	
-	// public void testJavaReadAccessSearchDOS2(){
-	// List<?> results = search(2);
-	// }
-	//	
-	// public void testJavaReadAccessSearchDOS3(){
-	// List<?> results = search(3);
-	// }
-	//	
-	// public void testJavaReadAccessSearchDOS4(){
-	// List<?> results = search(4);
-	// }
-	//	
-	// public void testJavaReadAccessSearchDOS5(){
-	// List<?> results = search(5);
-	// }
-
-	public List<?> search(int dos, IInteractionElement node) {
-
-		if (node == null) {
-			return null;
-		}
-
-		// test with each of the sepatations
-		JavaReadAccessProvider prov = new JavaReadAccessProvider();
-
-		TestActiveSearchListener l = new TestActiveSearchListener(null);
-		IActiveSearchOperation o = prov.getSearchOperation(node, IJavaSearchConstants.READ_ACCESSES, dos);
-		SearchPluginTestHelper.search(o, l);
-		return l.getResults();
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaReferencesSearchTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaReferencesSearchTest.java
deleted file mode 100644
index cbe6e7b..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaReferencesSearchTest.java
+++ /dev/null
@@ -1,310 +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.java.tests.search;
-
-import java.io.IOException;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.support.search.ISearchPluginTest;
-import org.eclipse.mylyn.context.tests.support.search.TestActiveSearchListener;
-import org.eclipse.mylyn.internal.context.core.CompositeInteractionContext;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchOperation;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-import org.eclipse.mylyn.internal.java.ui.search.JavaReferencesProvider;
-import org.eclipse.mylyn.internal.pde.ui.PdeStructureBridge;
-
-/**
- * @author Shawn Minto
- * @author Mik Kersten
- */
-public class JavaReferencesSearchTest extends TestCase implements ISearchPluginTest {
-
-	private IType type1;
-
-	private IType type11;
-
-	private IType type2;
-
-	private IFile plugin1;
-
-	private IJavaProject jp1;
-
-	private IJavaProject jp2;
-
-	private static final String SOURCE_ID = "JavaReferencesSearchTest";
-
-	private SearchPluginTestHelper helper;
-
-	@Override
-	protected void setUp() throws Exception {
-		// TODO: clear the relationship providers?
-		WorkspaceSetupHelper.setupWorkspace();
-		jp1 = WorkspaceSetupHelper.getProject1();
-		jp2 = WorkspaceSetupHelper.getProject2();
-		type1 = WorkspaceSetupHelper.getType(jp1, "org.eclipse.mylar.tests.project1.views.SampleView");
-		type11 = WorkspaceSetupHelper.getType(jp1, "org.eclipse.mylar.tests.project1.Project1Plugin");
-		type2 = WorkspaceSetupHelper.getType(jp2, "org.eclipse.mylar.tests.project2.builder.ToggleNatureAction");
-		plugin1 = WorkspaceSetupHelper.getFile(jp1, "plugin.xml");
-
-		InteractionContext context = WorkspaceSetupHelper.getContext();
-		ContextCore.getContextManager().activateContext(context.getHandleIdentifier());
-		helper = new SearchPluginTestHelper(this);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		WorkspaceSetupHelper.clearDoiModel();
-		ContextCore.getContextManager().deactivateContext(WorkspaceSetupHelper.getContext().getHandleIdentifier());
-		assertFalse(ContextCore.getContextManager().isContextActive());
-	}
-
-	public void testJavaReferencesSearchDOS1() throws IOException, CoreException {
-
-		int dos = 1;
-
-		CompositeInteractionContext t = (CompositeInteractionContext) ContextCore.getContextManager()
-				.getActiveContext();
-		ActiveSearchNotifier notifier = new ActiveSearchNotifier(t, SOURCE_ID);
-		IInteractionElement searchNode = notifier.getElement(type1.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE);
-
-		// results should be null since the scope would be null.
-		// There are no landmarks to search over
-		helper.searchResultsNull(notifier, searchNode, dos);
-
-		// results should be not null, but have no references since the landmark
-		// is an element in a different project
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, type2.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 0);
-
-		// results should be not null, but have no java references since the
-		// landmark
-		// is an element in the same project, but there are no references in it
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, type11.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 1);
-
-		// results should be not null, but have no references
-		// This file type should never affect the scope
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNull(notifier, plugin1.getFullPath().toString(), PdeStructureBridge.CONTENT_TYPE,
-				searchNode, dos);
-
-		// results should be not null, and there should be 1 reference since we
-		// are searching
-		// the file with the element in it
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 2);
-	}
-
-	public void testJavaReferencesSearchDOS2() throws CoreException, IOException {
-		int dos = 2;
-
-		CompositeInteractionContext t = (CompositeInteractionContext) ContextCore.getContextManager()
-				.getActiveContext();
-		ActiveSearchNotifier notifier = new ActiveSearchNotifier(t, SOURCE_ID);
-		IInteractionElement searchNode = notifier.getElement(type1.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE);
-
-		// results should be null since the scope would be null.
-		// There are no landmarks to search over
-		helper.searchResultsNull(notifier, searchNode, dos);
-
-		// results should be not null, but have no references since the landmark
-		// is an element in a different project
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, type2.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 0);
-
-		// results should be not null, but have no references since the
-		// interesting element
-		// is an element in the same project, but no references in it
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, type11.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 1);
-
-		// results should be not null, but have no references
-		// This file type should never affect the scope
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNull(notifier, plugin1.getFullPath().toString(), PdeStructureBridge.CONTENT_TYPE,
-				searchNode, dos);
-
-		// results should be not null, and we should get 1 result back
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 2);
-
-		// results should be null, since we have nothing to search
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNull(notifier, searchNode, dos);
-
-		// results should be not null, and we should get 1 result back
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNullInteresting(notifier, type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 2);
-	}
-
-	public void testJavaReferencesSearchDOS3() throws Exception {
-		int dos = 3;
-
-		CompositeInteractionContext t = (CompositeInteractionContext) ContextCore.getContextManager()
-				.getActiveContext();
-		ActiveSearchNotifier notifier = new ActiveSearchNotifier(t, SOURCE_ID);
-		IInteractionElement searchNode = notifier.getElement(type1.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE);
-
-		// results should be null since the scope would be null.
-		// There are no landmarks to search over
-		helper.searchResultsNull(notifier, searchNode, dos);
-
-		// results should be not null, but have no references since the landmark
-		// is an element in a different project
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, type2.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 0);
-
-		// results should be not null, and have 1 reference since the project is
-		// the same
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNullInteresting(notifier, type11.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE, searchNode, dos, 2);
-
-		// results should be not null, and have 1 reference
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, plugin1.getFullPath().toString(), PdeStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 2);
-
-		// results should be not null, and we should get 1 result back
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 2);
-
-		// results should be null, since we have nothing to search
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNull(notifier, searchNode, dos);
-
-		// results should be not null, and we should get 1 result back
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNullInteresting(notifier, type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 2);
-	}
-
-	public void testJavaReferencesSearchDOS4() throws Exception {
-		// TODO this is the same as 3, but there are some flags to search
-		// libraries...we should check this too
-
-		int dos = 4;
-
-		CompositeInteractionContext t = (CompositeInteractionContext) ContextCore.getContextManager()
-				.getActiveContext();
-		ActiveSearchNotifier notifier = new ActiveSearchNotifier(t, SOURCE_ID);
-		IInteractionElement searchNode = notifier.getElement(type1.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE);
-
-		// results should be null since the scope would be null.
-		// There are no landmarks to search over
-		helper.searchResultsNull(notifier, searchNode, dos);
-
-		// results should be not null, but have no references since the landmark
-		// is an element in a different project
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, type2.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 0);
-
-		// results should be not null, and have 1 reference since the project is
-		// the same
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNullInteresting(notifier, type11.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE, searchNode, dos, 2);
-
-		// results should be not null, and have 1 reference
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, plugin1.getFullPath().toString(), PdeStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 2);
-
-		// results should be not null, and we should get 1 result back
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 2);
-
-		// results should be null, since we have nothing to search
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNull(notifier, searchNode, dos);
-
-		// results should be not null, and we should get 1 result back
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNullInteresting(notifier, type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 2);
-	}
-
-	public void testJavaReferencesSearchDOS5() throws IOException, CoreException {
-		int dos = 5;
-
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		CompositeInteractionContext t = (CompositeInteractionContext) ContextCore.getContextManager()
-				.getActiveContext();
-		ActiveSearchNotifier notifier = new ActiveSearchNotifier(t, SOURCE_ID);
-		IInteractionElement searchNode = notifier.getElement(type1.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE);
-
-		// we should have 1 result since we are searching the entire workspace
-		helper.searchResultsNotNull(notifier, searchNode, dos, 2);
-
-		// we should have no results since there are no java references in the
-		// workspace
-		// NOTE: as of 3.2M3 there is a plugin.xml reference
-		searchNode = notifier.getElement(type2.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, searchNode, dos, 1);
-	}
-
-	public List<?> search(int dos, IInteractionElement node) {
-		if (node == null) {
-			return null;
-		}
-
-		// test with each of the sepatations
-		JavaReferencesProvider prov = new JavaReferencesProvider();
-
-		TestActiveSearchListener l = new TestActiveSearchListener(prov);
-		IActiveSearchOperation o = prov.getSearchOperation(node, IJavaSearchConstants.REFERENCES, dos);
-		if (o == null) {
-			return null;
-		}
-
-		SearchPluginTestHelper.search(o, l);
-		return l.getResults();
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaWriteAccessSearchPluginTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaWriteAccessSearchPluginTest.java
deleted file mode 100644
index 8f2d10b..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/JavaWriteAccessSearchPluginTest.java
+++ /dev/null
@@ -1,62 +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.java.tests.search;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.support.search.ISearchPluginTest;
-import org.eclipse.mylyn.context.tests.support.search.TestActiveSearchListener;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchOperation;
-import org.eclipse.mylyn.internal.java.ui.search.JavaWriteAccessProvider;
-
-public class JavaWriteAccessSearchPluginTest extends TestCase implements ISearchPluginTest {
-
-	public void testJavaWriteAccessSearchDOS1() {
-		// List<?> results = search(1);
-	}
-
-	//	
-	// public void testJavaWriteAccessSearchDOS2(){
-	// List<?> results = search(2);
-	// }
-	//	
-	// public void testJavaWriteAccessSearchDOS3(){
-	// List<?> results = search(3);
-	// }
-	//	
-	// public void testJavaWriteAccessSearchDOS4(){
-	// List<?> results = search(4);
-	// }
-	//	
-	// public void testJavaWriteAccessSearchDOS5(){
-	// List<?> results = search(5);
-	// }
-
-	public List<?> search(int dos, IInteractionElement node) {
-
-		if (node == null) {
-			return null;
-		}
-
-		// test with each of the sepatations
-		JavaWriteAccessProvider prov = new JavaWriteAccessProvider();
-
-		TestActiveSearchListener l = new TestActiveSearchListener(prov);
-		IActiveSearchOperation o = prov.getSearchOperation(node, IJavaSearchConstants.WRITE_ACCESSES, dos);
-		SearchPluginTestHelper.search(o, l);
-		return l.getResults();
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/SearchPluginTestHelper.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/SearchPluginTestHelper.java
deleted file mode 100644
index dc057eb..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/SearchPluginTestHelper.java
+++ /dev/null
@@ -1,116 +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.java.tests.search;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.support.search.ISearchPluginTest;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchListener;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchOperation;
-
-/**
- * @author Shawn Minto
- */
-public class SearchPluginTestHelper extends TestCase {
-
-	private final ISearchPluginTest test;
-
-	/**
-	 * maximum time to wait for search results * 2. so 60 = 30sec - only sleeping 500ms at a time instead of 1 sec
-	 */
-	private static final long MAXWAIT = 360;
-
-	public SearchPluginTestHelper(ISearchPluginTest test) {
-		this.test = test;
-	}
-
-	public void searchResultsNotNull(ActiveSearchNotifier notifier, String handle, String kind,
-			IInteractionElement searchNode, int dos, int expected) throws IOException, CoreException {
-		notifier.mockRaiseInterest(handle, kind);
-
-		List<?> results = test.search(dos, searchNode);
-		assertNotNull("Results Null", results);
-		assertEquals("Wrong number search results", expected, results.size());
-		notifier.clearContext();
-	}
-
-	public void searchResultsNotNullInteresting(ActiveSearchNotifier notifier, String handle, String kind,
-			IInteractionElement searchNode, int dos, int expected) throws IOException, CoreException {
-		notifier.mockEditorSelection(handle, kind);
-
-		List<?> results = test.search(dos, searchNode);
-		assertNotNull("Results Null", results);
-		assertEquals("Wrong number search results", expected, results.size());
-		notifier.clearContext();
-	}
-
-	public void searchResultsNotNull(ActiveSearchNotifier notifier, IInteractionElement searchNode, int dos,
-			int expected) throws IOException, CoreException {
-		List<?> results = test.search(dos, searchNode);
-		assertNotNull("Results Null", results);
-		assertEquals("Wrong number search results", expected, results.size());
-		notifier.clearContext();
-	}
-
-	public void searchResultsNull(ActiveSearchNotifier notifier, String handle, String kind,
-			IInteractionElement searchNode, int dos) throws IOException, CoreException {
-		notifier.mockRaiseInterest(handle, kind);
-
-		List<?> results = test.search(dos, searchNode);
-		assertNull("Results Not Null", results);
-		notifier.clearContext();
-	}
-
-	public void searchResultsNull(ActiveSearchNotifier notifier, IInteractionElement searchNode, int dos)
-			throws IOException, CoreException {
-		List<?> results = test.search(dos, searchNode);
-		assertNull("Results Not Null", results);
-		notifier.clearContext();
-	}
-
-	/**
-	 * @return -1 if there was a prob, else the search time in seconds
-	 */
-	public static long search(IActiveSearchOperation op, IActiveSearchListener listener) {
-		if (op == null) {
-			return -1;
-		}
-
-		op.addListener(listener);
-
-		long start = new Date().getTime();
-
-		op.run(new NullProgressMonitor());
-
-		for (int i = 0; i < MAXWAIT && !listener.resultsGathered(); i++) {
-			try {
-				Thread.sleep(500);
-			} catch (InterruptedException e) {
-				// don't need to do anything here
-			}
-		}
-
-		long time = (new Date().getTime() - start) / 1000;
-
-		if (!listener.resultsGathered()) {
-			return -1;
-		}
-		return time;
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/WorkspaceSetupHelper.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/WorkspaceSetupHelper.java
deleted file mode 100644
index 0fb942f..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/search/WorkspaceSetupHelper.java
+++ /dev/null
@@ -1,154 +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.java.tests.search;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.tests.support.ResourceHelper;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-import org.eclipse.mylyn.java.tests.TestJavaProject;
-
-public class WorkspaceSetupHelper {
-
-	private static final String HELPER_CONTEXT_ID = "helper-context";
-
-	private static boolean isSetup = false;
-
-	private static InteractionContext taskscape;
-
-	private static IJavaProject project1;
-
-	private static IJavaProject project2;
-
-	private static TestJavaProject jdtCoreDomProject;
-
-	private static IWorkspaceRoot workspaceRoot;
-
-	public static void clearWorkspace() throws CoreException, IOException {
-		isSetup = false;
-		ResourcesPlugin.getWorkspace().getRoot().delete(true, true, new NullProgressMonitor());
-		clearDoiModel();
-	}
-
-	public static IWorkspaceRoot setupWorkspace() throws CoreException, IOException, InvocationTargetException,
-			InterruptedException {
-		if (isSetup) {
-			clearDoiModel();
-			return workspaceRoot;
-		}
-		taskscape = new InteractionContext(HELPER_CONTEXT_ID, new InteractionContextScaling());
-
-		workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-
-		project1 = ResourceHelper.createJavaPluginProjectFromZip("project1", "project1.zip");
-		project2 = ResourceHelper.createJavaPluginProjectFromZip("project2", "project2.zip");
-
-		jdtCoreDomProject = new TestJavaProject("workspace-helper-project");
-		IPackageFragment jdtCoreDomPkg = jdtCoreDomProject.createPackage("org.eclipse.jdt.core.dom");
-		IType astNodeType = jdtCoreDomProject.createType(jdtCoreDomPkg, "ASTNode.java", "public class ASTNode { }");
-		astNodeType.createMethod("public final void setSourceRange(int startPosition, int length) { }", null, false,
-				null);
-		isSetup = true;
-
-		project1.open(new NullProgressMonitor());
-		project2.open(new NullProgressMonitor());
-		jdtCoreDomProject.getJavaProject().open(new NullProgressMonitor());
-
-		return workspaceRoot;
-	}
-
-	public static void clearDoiModel() throws CoreException {
-		ContextCore.getContextManager().deleteContext(HELPER_CONTEXT_ID);
-		taskscape = new InteractionContext(HELPER_CONTEXT_ID, new InteractionContextScaling());
-	}
-
-	public static InteractionContext getContext() throws CoreException, IOException, InvocationTargetException,
-			InterruptedException {
-		if (!isSetup) {
-			setupWorkspace();
-		}
-		return taskscape;
-	}
-
-	public static IJavaProject getJdtCoreDomProject() throws CoreException, IOException, InvocationTargetException,
-			InterruptedException {
-		if (!isSetup) {
-			setupWorkspace();
-		}
-		return jdtCoreDomProject.getJavaProject();
-	}
-
-	public static IJavaProject getProject1() throws CoreException, IOException, InvocationTargetException,
-			InterruptedException {
-		if (!isSetup) {
-			setupWorkspace();
-		}
-		return project1;
-	}
-
-	public static IJavaProject getProject2() throws CoreException, IOException, InvocationTargetException,
-			InterruptedException {
-		if (!isSetup) {
-			setupWorkspace();
-		}
-		return project2;
-	}
-
-	public static IWorkspaceRoot getWorkspaceRoot() throws CoreException, IOException, InvocationTargetException,
-			InterruptedException {
-		if (!isSetup) {
-			setupWorkspace();
-		}
-		return workspaceRoot;
-	}
-
-	public static IFile getFile(IJavaProject jp, String name) throws JavaModelException {
-		if (jp == null || name == null) {
-			return null;
-		}
-		Object[] files = jp.getNonJavaResources();
-		for (Object o : files) {
-			if (o instanceof IFile && ((IFile) o).getName().equals(name)) {
-				return (IFile) o;
-			}
-		}
-		return null;
-	}
-
-	public static IType getType(IJavaProject jp, String fullyQualifiedName) throws JavaModelException {
-		if (jp == null || fullyQualifiedName == null) {
-			return null;
-		}
-		IType t = jp.findType(fullyQualifiedName);
-		return t;
-	}
-
-	public static IMethod getMethod(IType t, String methodName, String[] params) {
-		if (t == null || methodName == null || params == null) {
-			return null;
-		}
-		return t.getMethod(methodName, params);
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/ResultUpdaterTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/ResultUpdaterTest.java
deleted file mode 100644
index 0f548f6..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/ResultUpdaterTest.java
+++ /dev/null
@@ -1,142 +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.java.tests.xml;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.support.ResourceHelper;
-import org.eclipse.mylyn.context.tests.support.search.ISearchPluginTest;
-import org.eclipse.mylyn.internal.context.core.CompositeInteractionContext;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchOperation;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextRelation;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-import org.eclipse.mylyn.internal.pde.ui.XmlJavaRelationProvider;
-import org.eclipse.mylyn.java.tests.search.ActiveSearchNotifier;
-import org.eclipse.mylyn.java.tests.search.SearchPluginTestHelper;
-import org.eclipse.mylyn.java.tests.search.WorkspaceSetupHelper;
-
-/**
- * @author Mik Kersten
- */
-public class ResultUpdaterTest extends TestCase implements ISearchPluginTest {
-	private IType type1;
-
-	private IFile plugin1;
-
-	private IJavaProject jp1;
-
-	private static final String SOURCE_ID = "XMLSearchResultUpdaterTest";
-
-	private SearchPluginTestHelper helper;
-
-	@Override
-	protected void setUp() throws Exception {
-		// TODO: clear the relationship providers?
-		WorkspaceSetupHelper.setupWorkspace();
-		jp1 = WorkspaceSetupHelper.getProject1();
-		type1 = WorkspaceSetupHelper.getType(jp1, "org.eclipse.mylar.tests.project1.views.SampleView");
-		plugin1 = WorkspaceSetupHelper.getFile(jp1, "plugin.xml");
-
-		InteractionContext t = WorkspaceSetupHelper.getContext();
-		ContextCore.getContextManager().activateContext(t.getHandleIdentifier());// ,
-		// t.getId());
-		helper = new SearchPluginTestHelper(this);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		WorkspaceSetupHelper.clearWorkspace();
-		WorkspaceSetupHelper.clearDoiModel();
-	}
-
-	public void testRemoveFile() throws Exception {
-
-		int dos = 4;
-
-		CompositeInteractionContext t = (CompositeInteractionContext) ContextCore.getContextManager()
-				.getActiveContext();
-		ActiveSearchNotifier notifier = new ActiveSearchNotifier(t, SOURCE_ID);
-		IInteractionElement searchNode = notifier.getElement(type1.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE);
-
-		//
-		// we should get all results since we are searching the entire workspace
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, searchNode, dos, 3);
-		//
-		//
-
-		Collection<InteractionContextRelation> edges = searchNode.getRelations();
-		assertEquals(3, edges.size());
-
-		ResourceHelper.delete(plugin1);
-
-		Collection<InteractionContextRelation> edgesAfterRemove = searchNode.getRelations();
-		assertEquals(0, edgesAfterRemove.size());
-	}
-
-	public void testRemoveProject() throws Exception {
-		int dos = 4;
-
-		CompositeInteractionContext t = (CompositeInteractionContext) ContextCore.getContextManager()
-				.getActiveContext();
-		ActiveSearchNotifier notifier = new ActiveSearchNotifier(t, SOURCE_ID);
-		IInteractionElement searchNode = notifier.getElement(type1.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE);
-
-		//
-		// we should get all results since we are searching the entire workspace
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, searchNode, dos, 3);
-		//
-		//
-
-		Collection<InteractionContextRelation> edges = searchNode.getRelations();
-		assertEquals(3, edges.size());
-
-		ResourceHelper.deleteProject(jp1.getProject().getName());
-
-		Collection<InteractionContextRelation> edgesAfterRemove = searchNode.getRelations();
-		assertEquals(0, edgesAfterRemove.size());
-		;
-	}
-
-	public List<?> search(int dos, IInteractionElement node) throws IOException, CoreException {
-		if (node == null) {
-			return null;
-		}
-
-		// test with each of the sepatations
-		XmlJavaRelationProvider prov = new XmlJavaRelationProvider();
-
-		IActiveSearchOperation o = prov.getSearchOperation(node, 0, dos);
-		if (o == null) {
-			return null;
-		}
-
-		XmlResultUpdaterSearchListener l = new XmlResultUpdaterSearchListener(prov, node, dos);
-		SearchPluginTestHelper.search(o, l);
-
-		return l.getResults();
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlResultUpdaterSearchListener.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlResultUpdaterSearchListener.java
deleted file mode 100644
index fc90313..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlResultUpdaterSearchListener.java
+++ /dev/null
@@ -1,121 +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.java.tests.xml;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.internal.resources.File;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.support.search.TestActiveSearchListener;
-import org.eclipse.mylyn.internal.context.core.AbstractRelationProvider;
-import org.eclipse.mylyn.internal.ide.ui.XmlNodeHelper;
-import org.eclipse.mylyn.internal.pde.ui.PdeStructureBridge;
-import org.eclipse.mylyn.internal.pde.ui.XmlJavaRelationProvider;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.search.internal.ui.text.FileSearchResult;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * @author Mik Kersten
- */
-public class XmlResultUpdaterSearchListener extends TestActiveSearchListener {
-
-	private List<IInteractionElement> results = null;
-
-	private final IInteractionElement node;
-
-	private final int degreeOfSeparation;
-
-	public XmlResultUpdaterSearchListener(AbstractRelationProvider prov, IInteractionElement searchNode,
-			int degreeOfSeparation) {
-		super(prov);
-		this.node = searchNode;
-		this.degreeOfSeparation = degreeOfSeparation;
-	}
-
-	private boolean gathered = false;
-
-	@Override
-	public void searchCompleted(List<?> l) {
-		results = new ArrayList<IInteractionElement>();
-
-		if (l.isEmpty()) {
-			return;
-		}
-
-		Map<String, String> nodes = new HashMap<String, String>();
-
-		if (l.get(0) instanceof FileSearchResult) {
-			FileSearchResult fsr = (FileSearchResult) l.get(0);
-
-			Object[] far = fsr.getElements();
-			for (Object element : far) {
-				Match[] mar = fsr.getMatches(element);
-
-				if (element instanceof File) {
-					File f = (File) element;
-
-					// change the file into a document
-					FileEditorInput fei = new FileEditorInput(f);
-
-					for (Match m : mar) {
-						try {
-							XmlNodeHelper xnode = new XmlNodeHelper(fei.getFile().getFullPath().toString(),
-									m.getOffset());
-							AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(f.getName());
-							String handle = xnode.getHandle();
-							Object o = bridge.getObjectForHandle(handle);
-							String name = bridge.getLabel(o);
-							if (o != null) {
-								nodes.put(handle, name);
-								results.add(node);
-							}
-						} catch (Exception e) {
-							e.printStackTrace();
-						}
-					}
-				}
-			}
-		}
-
-		for (String handle : nodes.keySet()) {
-			incrementInterest(node, PdeStructureBridge.CONTENT_TYPE, handle, degreeOfSeparation);
-		}
-		gathered = true;
-	}
-
-	protected void incrementInterest(IInteractionElement node, String elementKind, String elementHandle,
-			int degreeOfSeparation) {
-		int predictedInterest = 1;// (7-degreeOfSeparation) *
-		// TaskscapeManager.getScalingFactors().getDegreeOfSeparationScale();
-		InteractionEvent event = new InteractionEvent(InteractionEvent.Kind.PREDICTION, elementKind, elementHandle,
-				XmlJavaRelationProvider.SOURCE_ID, XmlJavaRelationProvider.SOURCE_ID, null, predictedInterest);
-		ContextCore.getContextManager().processInteractionEvent(event);
-
-	}
-
-	@Override
-	public boolean resultsGathered() {
-		return gathered;
-	}
-
-	@Override
-	public List<?> getResults() {
-		return results;
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlSearchPluginTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlSearchPluginTest.java
deleted file mode 100644
index 3c8883a..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlSearchPluginTest.java
+++ /dev/null
@@ -1,334 +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.java.tests.xml;
-
-import java.io.IOException;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.support.search.ISearchPluginTest;
-import org.eclipse.mylyn.internal.context.core.CompositeInteractionContext;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchOperation;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-import org.eclipse.mylyn.internal.pde.ui.PdeStructureBridge;
-import org.eclipse.mylyn.internal.pde.ui.XmlJavaRelationProvider;
-import org.eclipse.mylyn.internal.resources.ui.ResourceStructureBridge;
-import org.eclipse.mylyn.java.tests.search.ActiveSearchNotifier;
-import org.eclipse.mylyn.java.tests.search.SearchPluginTestHelper;
-import org.eclipse.mylyn.java.tests.search.WorkspaceSetupHelper;
-
-/**
- * TEST CASES TO HANDLE 1. all dos - with and without results TODO - in both the plugin.xml and the build.xml 2.
- * different type of xml file with and without reference - shouldn't have result
- * 
- * DEGREE OF SEPARATIONS 1 xml landmark files 2 projects of any landmark 3 workspace 4 workspace 5 NONE
- * 
- * @author Shawn Minto
- */
-public class XmlSearchPluginTest extends TestCase implements ISearchPluginTest {
-
-	private IType type1;
-
-	private IType type2;
-
-	private IFile plugin1;
-
-	private IFile plugin2;
-
-	private IFile tocRefs;
-
-	private IFile tocNoRefs;
-
-	private IJavaProject jp1;
-
-	private IJavaProject jp2;
-
-	private static final String SOURCE_ID = "XMLSearchTest";
-
-	private SearchPluginTestHelper helper;
-
-	@Override
-	protected void setUp() throws Exception {
-		// TODO: clear the relationship providers?
-		WorkspaceSetupHelper.setupWorkspace();
-		jp1 = WorkspaceSetupHelper.getProject1();
-		jp2 = WorkspaceSetupHelper.getProject2();
-		type1 = WorkspaceSetupHelper.getType(jp1, "org.eclipse.mylar.tests.project1.views.SampleView");
-		type2 = WorkspaceSetupHelper.getType(jp2,
-				"org.eclipse.mylar.tests.project2.builder.SampleBuilder.SampleResourceVisitor");
-		plugin1 = WorkspaceSetupHelper.getFile(jp1, "plugin.xml");
-		tocRefs = WorkspaceSetupHelper.getFile(jp1, "toc-refs.xml");
-		tocNoRefs = WorkspaceSetupHelper.getFile(jp1, "toc-no-refs.xml");
-		plugin2 = WorkspaceSetupHelper.getFile(jp2, "plugin.xml");
-
-		InteractionContext t = WorkspaceSetupHelper.getContext();
-		ContextCore.getContextManager().activateContext(t.getHandleIdentifier());
-		helper = new SearchPluginTestHelper(this);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		WorkspaceSetupHelper.clearDoiModel();
-		ContextCore.getContextManager().deactivateContext(WorkspaceSetupHelper.getContext().getHandleIdentifier());
-		assertFalse(ContextCore.getContextManager().isContextActive());
-	}
-
-	public void testXMLSearchDOS1() throws IOException, CoreException {
-
-		int dos = 1;
-
-		CompositeInteractionContext t = (CompositeInteractionContext) ContextCore.getContextManager()
-				.getActiveContext();
-		ActiveSearchNotifier notifier = new ActiveSearchNotifier(t, SOURCE_ID);
-		IInteractionElement searchNode = notifier.getElement(type1.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE);
-
-		//
-		// results should be null since the scope would be null.
-		// There are no landmarks to search over
-		helper.searchResultsNull(notifier, searchNode, dos);
-		//
-		//
-
-		//
-		// add an element to the taskscape, results should still be null
-		// There is a landmark, but not one that is an xml file that we care
-		// about
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNull(notifier, type1.getHandleIdentifier(), ResourceStructureBridge.CONTENT_TYPE,
-				searchNode, dos);
-
-		//
-		//
-
-		//
-		// add an element to the taskscape, results should still be null
-		// There is a landmark that has references in it, but not one that is an
-		// xml file that we care about
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNull(notifier, tocRefs.getFullPath().toString(), ResourceStructureBridge.CONTENT_TYPE,
-				searchNode, dos);
-		//
-		//
-
-		//
-		// add an element to the taskscape, results should still be null
-		// There is a landmark, but not one that is an xml file that we care
-		// about
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNull(notifier, tocNoRefs.getFullPath().toString(), ResourceStructureBridge.CONTENT_TYPE,
-				searchNode, dos);
-		//
-		//
-
-		//
-		// add the plugin.xml from a different project to the taskscape, should
-		// have non null results, but 0 size
-		// There is a lanmark that can be added to create a scope with the
-		// proper xml file type
-		// but it is in the wrong project and shouldn't have any references
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, plugin2.getFullPath().toString(), PdeStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 0);
-		//
-		//
-
-		//
-		// add the plugin.xml to the taskscape, should have results now
-		// We should get the results now since we have the proper xml file as
-		// the landmark now
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, plugin1.getFullPath().toString(), PdeStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 3);
-		//
-		//
-	}
-
-	public void testXMLSearchDOS2() throws IOException, CoreException {
-
-		int dos = 2;
-
-		CompositeInteractionContext t = (CompositeInteractionContext) ContextCore.getContextManager()
-				.getActiveContext();
-		ActiveSearchNotifier notifier = new ActiveSearchNotifier(t, SOURCE_ID);
-		IInteractionElement searchNode = notifier.getElement(type1.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE);
-
-//		// results should be null since the scope would be null.
-//		// There are no landmarks and therefore no projects to search over
-//		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-//		helper.searchResultsNull(notifier, searchNode, dos);
-//
-//		// add an element to the taskscape, results should not be null
-//		// There is a landmark with references in it, but not one that is an xml
-//		// file that we care about
-//		// therefore, we still only get 3 references - landmark is in the same
-//		// project
-//		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-//		helper.searchResultsNotNull(notifier, tocRefs.getFullPath().toString(), ResourceStructureBridge.CONTENT_TYPE,
-//				searchNode, dos, 3);
-//
-//		// add an element to the taskscape, results should not be null, but only
-//		// 3
-//		// There is a landmark, but not one that is an xml file that we care
-//		// about - landmark is in the same project
-//		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-//		helper.searchResultsNotNull(notifier, tocNoRefs.getFullPath().toString(), ResourceStructureBridge.CONTENT_TYPE,
-//				searchNode, dos, 3);
-//
-//		// add the plugin.xml from a different project to the taskscape, should
-//		// have non null results, but 0 size
-//		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-//		helper.searchResultsNotNull(notifier, plugin2.getFullPath().toString(), PdeStructureBridge.CONTENT_TYPE,
-//				searchNode, dos, 0);
-//
-//		// add java element from the same project, should get result since we
-//		// are looking at the projects
-//		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-//		helper.searchResultsNotNull(notifier, type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-//				searchNode, dos, 3);
-
-		// add a java element from a different project, should get non null
-		// result, but 0 size
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, type2.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 0);
-
-		// add the plugin.xml from the same project to the taskscape, should
-		// have results
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, plugin1.getFullPath().toString(), PdeStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 3);
-	}
-
-	public void testXMLSearchDOS3() throws IOException, CoreException {
-
-		int dos = 3;
-
-		CompositeInteractionContext t = (CompositeInteractionContext) ContextCore.getContextManager()
-				.getActiveContext();
-		ActiveSearchNotifier notifier = new ActiveSearchNotifier(t, SOURCE_ID);
-		IInteractionElement searchNode = notifier.getElement(type1.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE);
-
-		//
-		// add an element to the taskscape, results should not be null
-		// There is a landmark with references in it, but not one that is an xml
-		// file that we care about
-		// therefore, we still only get 3 references
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, tocRefs.getFullPath().toString(), ResourceStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 3);
-		//
-		//
-
-		//
-		// add an element to the taskscape, results should still be null
-		// There is a landmark, but not one that is an xml file that we care
-		// about
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, tocNoRefs.getFullPath().toString(), ResourceStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 3);
-		//
-		//
-
-		//
-		// we should get all results since we are searching the entire workspace
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, searchNode, dos, 3);
-		//
-		//
-
-		//
-		// we should get 0 results since there should be no references to the
-		// type we are looking at
-		searchNode = notifier.getElement(type2.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, searchNode, dos, 0);
-		//
-		//
-	}
-
-	public void testXMLSearchDOS4() throws IOException, CoreException {
-		// right now, dos 3 and 4 are exactly the same, workspace scope
-
-		int dos = 4;
-
-		CompositeInteractionContext t = (CompositeInteractionContext) ContextCore.getContextManager()
-				.getActiveContext();
-		ActiveSearchNotifier notifier = new ActiveSearchNotifier(t, SOURCE_ID);
-		IInteractionElement searchNode = notifier.getElement(type1.getHandleIdentifier(),
-				JavaStructureBridge.CONTENT_TYPE);
-
-		//
-		// add an element to the taskscape, results should not be null
-		// There is a landmark with references in it, but not one that is an xml
-		// file that we care about
-		// therefore, we still only get 3 references
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, tocRefs.getFullPath().toString(), ResourceStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 3);
-		//
-		//
-
-		//
-		// add an element to the taskscape, results should still be null
-		// There is a landmark, but not one that is an xml file that we care
-		// about
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, tocNoRefs.getFullPath().toString(), ResourceStructureBridge.CONTENT_TYPE,
-				searchNode, dos, 3);
-		//
-		//
-
-		//
-		// we should get all results since we are searching the entire workspace
-		searchNode = notifier.getElement(type1.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, searchNode, dos, 3);
-		//
-		//
-
-		//
-		// we should get 0 results since there should be no references to the
-		// type we are looking at
-		searchNode = notifier.getElement(type2.getHandleIdentifier(), JavaStructureBridge.CONTENT_TYPE);
-		helper.searchResultsNotNull(notifier, searchNode, dos, 0);
-		//
-		//
-	}
-
-	public List<?> search(int dos, IInteractionElement node) throws IOException, CoreException {
-		if (node == null) {
-			return null;
-		}
-
-		// test with each of the sepatations
-		XmlJavaRelationProvider prov = new XmlJavaRelationProvider();
-
-		IActiveSearchOperation o = prov.getSearchOperation(node, 0, dos);
-		if (o == null) {
-			return null;
-		}
-
-		XmlTestActiveSearchListener l = new XmlTestActiveSearchListener(prov);
-		SearchPluginTestHelper.search(o, l);
-
-		return l.getResults();
-	}
-}
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlTestActiveSearchListener.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlTestActiveSearchListener.java
deleted file mode 100644
index 8c1f2b7..0000000
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/xml/XmlTestActiveSearchListener.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.java.tests.xml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.internal.resources.File;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.tests.support.search.TestActiveSearchListener;
-import org.eclipse.mylyn.internal.context.core.AbstractRelationProvider;
-import org.eclipse.mylyn.internal.ide.ui.XmlNodeHelper;
-import org.eclipse.search.internal.ui.text.FileSearchResult;
-import org.eclipse.search.ui.text.Match;
-
-/**
- * @author Shawn Minto
- */
-public class XmlTestActiveSearchListener extends TestActiveSearchListener {
-
-	private List<?> results = null;
-
-	public XmlTestActiveSearchListener(AbstractRelationProvider prov) {
-		super(prov);
-	}
-
-	private boolean gathered = false;
-
-	@Override
-	public void searchCompleted(List<?> l) {
-
-		results = l;
-
-		// deal with File
-		if (l.isEmpty()) {
-			gathered = true;
-			return;
-		}
-
-		if (l.get(0) instanceof FileSearchResult) {
-			FileSearchResult fsr = (FileSearchResult) l.get(0);
-			List<Object> nodes = new ArrayList<Object>();
-			Object[] far = fsr.getElements();
-			for (Object element : far) {
-				Match[] mar = fsr.getMatches(element);
-
-				if (element instanceof File) {
-					File f = (File) element;
-
-					for (Match m : mar) {
-						try {
-
-							AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(f.getName());
-
-							String handle = bridge.getHandleForOffsetInObject(f, m.getOffset());
-
-							XmlNodeHelper node = new XmlNodeHelper(handle);
-							nodes.add(node);
-						} catch (Exception e) {
-							e.printStackTrace();
-							// don't care
-						}
-					}
-				}
-			}
-			results = nodes;
-		}
-		gathered = true;
-	}
-
-	@Override
-	public boolean resultsGathered() {
-		return gathered;
-	}
-
-	@Override
-	public List<?> getResults() {
-		return results;
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/.classpath b/org.eclipse.mylyn.java.ui/.classpath
deleted file mode 100644
index b692d67..0000000
--- a/org.eclipse.mylyn.java.ui/.classpath
+++ /dev/null
@@ -1,21 +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/resources/Marker"/>
-			<accessrule kind="accessible" pattern="org/eclipse/debug/internal/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/jdt/internal/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/search/internal/ui/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/search2/internal/ui/*"/>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/internal/*"/>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/views/markers/internal/ConcreteMarker"/>
-		</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">
-		<accessrules>
-			<accessrule kind="nonaccessible" pattern="com/sun/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.java.ui/.cvsignore b/org.eclipse.mylyn.java.ui/.cvsignore
deleted file mode 100644
index 4a98758..0000000
--- a/org.eclipse.mylyn.java.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-.fbwarnings
diff --git a/org.eclipse.mylyn.java.ui/.project b/org.eclipse.mylyn.java.ui/.project
deleted file mode 100644
index 8de69d8..0000000
--- a/org.eclipse.mylyn.java.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.java.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.java.ui/.settings/.api_filters b/org.eclipse.mylyn.java.ui/.settings/.api_filters
deleted file mode 100644
index af84df3..0000000
--- a/org.eclipse.mylyn.java.ui/.settings/.api_filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.mylyn.java.ui" version="2">
-    <resource path="src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaSourceViewerConfiguration.java" type="org.eclipse.mylyn.internal.java.ui.editor.FocusedJavaSourceViewerConfiguration">
-        <filter id="571473929">
-            <message_arguments>
-                <message_argument value="JavaSourceViewerConfiguration"/>
-                <message_argument value="FocusedJavaSourceViewerConfiguration"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitMainTab.java" type="org.eclipse.mylyn.internal.java.ui.junit.TaskContextJUnitMainTab">
-        <filter id="571473929">
-            <message_arguments>
-                <message_argument value="JUnitLaunchConfigurationTab"/>
-                <message_argument value="TaskContextJUnitMainTab"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/mylyn/internal/java/ui/search/AbstractJavaRelationProvider.java" type="org.eclipse.mylyn.internal.java.ui.search.AbstractJavaRelationProvider">
-        <filter id="572522506">
-            <message_arguments>
-                <message_argument value="ElementQuerySpecification"/>
-                <message_argument value="AbstractJavaRelationProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.mylyn.java.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.java.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7b6172c..0000000
--- a/org.eclipse.mylyn.java.ui/.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.java.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.java.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.java.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.java.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.java.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.java.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.java.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.java.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.java.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.java.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.java.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 761c56f..0000000
--- a/org.eclipse.mylyn.java.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,24 +0,0 @@
-#Tue May 20 17:40:40 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=2
-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.java.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.java.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 3d3bd14..0000000
--- a/org.eclipse.mylyn.java.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.java.ui;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Activator: org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.ui,
- org.eclipse.jdt.core,
- org.eclipse.jdt.debug,
- org.eclipse.jdt.debug.ui,
- org.eclipse.jdt.junit,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.search,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
- org.eclipse.ui.forms,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.resources.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.ide.ui;bundle-version="[3.0.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.mylyn.internal.java.ui;x-internal:=true,
- org.eclipse.mylyn.internal.java.ui.actions;x-internal:=true,
- org.eclipse.mylyn.internal.java.ui.editor;x-internal:=true,
- org.eclipse.mylyn.internal.java.ui.junit;x-internal:=true,
- org.eclipse.mylyn.internal.java.ui.search;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.java.ui/about.html b/org.eclipse.mylyn.java.ui/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.java.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.java.ui/build-user.xml b/org.eclipse.mylyn.java.ui/build-user.xml
deleted file mode 100644
index 6097713..0000000
--- a/org.eclipse.mylyn.java.ui/build-user.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<target name="help">
-    <echo message="Please run: $ ant -v -projecthelp"/>
-</target>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.java.ui/build.properties b/org.eclipse.mylyn.java.ui/build.properties
deleted file mode 100644
index 1119465..0000000
--- a/org.eclipse.mylyn.java.ui/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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 = plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               META-INF/,\
-               about.html,\
-               doc/,\
-               .
-src.includes = about.html,\
-               schema/
-jre.compilation.profile = J2SE-1.5
-source.. = src/
diff --git a/org.eclipse.mylyn.java.ui/doc/active-views.html b/org.eclipse.mylyn.java.ui/doc/active-views.html
deleted file mode 100644
index 6e9b190..0000000
--- a/org.eclipse.mylyn.java.ui/doc/active-views.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="STYLESHEET" href="book.css" charset="ISO-8859-1"
-	type="text/css">
-<title>Mylar New & Noteworthy</title>
-</head>
-<body>
-<h2>Active Views</h2>As you work and elements become landmarks 
-			(bold decoration), Active Search eagerly finds related elements.&nbsp; 
-			To force an element to populate the Active Search view manually make 
-			it a landmark by right-clicking or hitting Ctrl+Alt+Shift+Up Arrow.&nbsp; 
-			Use the pull-downs on the toolbar to alter the degree-of-separation 
-			scope of the search.&nbsp; Note that elements with predicted 
-			interest are gray.<p>
-			<img border="0" src="images/active-search.gif" width="340" height="309"><p>Similar to Active Search, this view actively 
-			finds and presents the type hierarchy of the current set of 
-			landmarks.</p>
-<p>
-			<img border="0" src="images/active-hierarchy.gif" width="364" height="145"><p>
-			&nbsp;
-
-</body>
-</html>
diff --git a/org.eclipse.mylyn.java.ui/doc/book.css b/org.eclipse.mylyn.java.ui/doc/book.css
deleted file mode 100644
index faa4199..0000000
--- a/org.eclipse.mylyn.java.ui/doc/book.css
+++ /dev/null
@@ -1 +0,0 @@
-@import "../../PRODUCT_PLUGIN/book.css";
diff --git a/org.eclipse.mylyn.java.ui/doc/editing.html b/org.eclipse.mylyn.java.ui/doc/editing.html
deleted file mode 100644
index 4b8fc68..0000000
--- a/org.eclipse.mylyn.java.ui/doc/editing.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="STYLESHEET" href="book.css" charset="ISO-8859-1"
-	type="text/css">
-<title>Mylar New & Noteworthy</title>
-</head>
-<body>
-<h2>Java Editing</h2><b>Interest-based content assist</b><p>The top of the content assist menu will put the items that are in 
-			your task context on top of the list, to enable quick selection via 
-			arrow keys. Once you start typing the menu will work as usual. Note 
-			that the Mylar Java Editor needs to be set as default for &quot;.java&quot; 
-			files (this is the only new functionality that comes from the Mylar 
-			Java editor).</p>
-<p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/interest-content-assist.gif" width="432" height="131"></p>
-			<b>Toggle auto folding</b><p>Pressing the editor toolbar button with the Mylar glasses on it will 
-			enable/disable Mylar's automatic folding.&nbsp; This can be useful 
-			when needing to browse through the code, or copy/paste code around 
-			(since Eclipse's folding support can cause odd expansions when 
-			copying folded regions,
-			<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=104648">bug 
-			104648</a>).</p>
-<p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/folding-toggle.gif" width="276" height="127"></p><b>Support Ctrl+click in Java Editor to navigate to 
-			bug</b><p><span style="background-color: #FFFFFF">Ctrl+click on a comment that 
-			contains one of the following forms will open the bug with the given 
-			id: bug# 123, bug 123, Bug #123, Bug#123. (Note that all of these 
-			are case insensitive and can be followed by a colon or whitespace).</span></p>
-<p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/bugzilla-hyperlink.gif" width="381" height="102"></p>
-			
-</body>
-</html>
diff --git a/org.eclipse.mylyn.java.ui/doc/images/active-hierarchy.gif b/org.eclipse.mylyn.java.ui/doc/images/active-hierarchy.gif
deleted file mode 100644
index 35651b1..0000000
--- a/org.eclipse.mylyn.java.ui/doc/images/active-hierarchy.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/doc/images/active-search.gif b/org.eclipse.mylyn.java.ui/doc/images/active-search.gif
deleted file mode 100644
index 63af2fd..0000000
--- a/org.eclipse.mylyn.java.ui/doc/images/active-search.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/doc/images/interest-error.gif b/org.eclipse.mylyn.java.ui/doc/images/interest-error.gif
deleted file mode 100644
index d57c90d..0000000
--- a/org.eclipse.mylyn.java.ui/doc/images/interest-error.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/doc/java.html b/org.eclipse.mylyn.java.ui/doc/java.html
deleted file mode 100644
index 3978411..0000000
--- a/org.eclipse.mylyn.java.ui/doc/java.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="STYLESHEET" href="book.css" charset="ISO-8859-1"
-	type="text/css">
-<title>Mylar New & Noteworthy</title>
-</head>
-<body>
-<h2>Java Support</h2>
-<p>&nbsp;</p>
-
-</body>
-</html>
diff --git a/org.eclipse.mylyn.java.ui/doc/navigation.html b/org.eclipse.mylyn.java.ui/doc/navigation.html
deleted file mode 100644
index b5e5344..0000000
--- a/org.eclipse.mylyn.java.ui/doc/navigation.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="STYLESHEET" href="book.css" charset="ISO-8859-1"
-	type="text/css">
-<title>Mylar New & Noteworthy</title>
-</head>
-<body>
-<h2>Java Program Navigation</h2><b>Show all filtered children</b><p>When you are using filtering in a Mylar view you have the option of 
-			temporarily showing all children of a filtered node by &lt;alt&gt;clicking 
-			a node that is not currently selected.&nbsp; For example, you can 
-			&lt;alt&gt;click a source folder, keep the &lt;alt&gt; key down, and continue 
-			drilling down until you find a method of interest.&nbsp;
-			</p>
-			<p>
-			<img src="../../org.eclipse.mylar.doc/doc/images/0.3/alt-click.gif" alt="Alt Click"
-				title="New Java Project Wizard"></p>
-			<p><b>Predicted interest of errors</b></p>
-			Only available in Phase 2 of 
-			the user study.&nbsp; Java elements that have errors get a predicted 
-			interest, which means that they show up in views such as a the 
-			package explorer.&nbsp; Once the errors are fixed the predicted 
-			interest goes away.<p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/interest-error.gif" width="233" height="189"><p><b>Filter declarations in Package Explorer </b>
-</p>
-			If you don't like Mylar's constant showing of Java members in the 
-			Package Explorer, select the drop-down menu, then &quot;Filters...&quot; and 
-			enable the &quot;Mylar Java Declarations Filter&quot;.&nbsp; It will then 
-			stick in the menu in case you want to toggle between modes.<p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/filtering-declarations.gif" width="441" height="211"></p>
-			<p><b>Automatic interest filter toggling</b></p>
-			By default the interest 
-			filter will automatically be toggled on the Package Explorer when a 
-			task with context is activated, and toggled off when the task is 
-			deactivated.&nbsp; This preference is under Mylar -&gt; Java.<p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/filter-auto-toggle.gif" width="414" height="47"></p>
-<p>
-			<b>Interest filtering for the Java Browsing 
-			perspective</b></p>Interest filtering can be toggled for 
-			the Packages, Types, and Members views simultaneously by clicking 
-			the leftmost toolbar button visible below.<p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/interest-java-browsing.gif" width="404" height="100"></p>
-
-			</body>
-</html>
diff --git a/org.eclipse.mylyn.java.ui/doc/toc.xml b/org.eclipse.mylyn.java.ui/doc/toc.xml
deleted file mode 100644
index d09f51b..0000000
--- a/org.eclipse.mylyn.java.ui/doc/toc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc link_to="../org.eclipse.mylyn.doc/doc/toc.xml#java" label="Java Development">
-	<!--
-	<topic label="Java Support" href="doc/java.html">
-		<topic label="Editing" href="doc/editing.html"/> 
-		<topic label="Navigation" href="doc/navigation.html"/>
-		<topic label="Active Views" href="doc/active-views.html"/>
-	</topic>
-		-->
-</toc>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/edge-ref-java.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/edge-ref-java.gif
deleted file mode 100644
index a20a2ba..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/edge-ref-java.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/edge-ref-junit.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/edge-ref-junit.gif
deleted file mode 100644
index 32bcf89..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/edge-ref-junit.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/focus-browsing.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/focus-browsing.gif
deleted file mode 100644
index c3ca8c4..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/focus-browsing.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/focus-disabled.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/focus-disabled.gif
deleted file mode 100644
index 24bbeae..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/focus-disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/focus.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/focus.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/focus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/interest-decrease.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/interest-decrease.gif
deleted file mode 100644
index 645a58f..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/interest-decrease.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/interest-folding.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/interest-folding.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/interest-folding.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/interest-increase.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/interest-increase.gif
deleted file mode 100644
index 98a2586..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/interest-increase.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/mylyn-overlay.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/mylyn-overlay.gif
deleted file mode 100644
index 6b16d40..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/mylyn-overlay.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/proposals-other.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/proposals-other.gif
deleted file mode 100644
index 28f69f0..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/proposals-other.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/proposals-type.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/proposals-type.gif
deleted file mode 100644
index b709469..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/proposals-type.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/elcl16/templateprop_co.gif b/org.eclipse.mylyn.java.ui/icons/elcl16/templateprop_co.gif
deleted file mode 100644
index fdde5fb..0000000
--- a/org.eclipse.mylyn.java.ui/icons/elcl16/templateprop_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/etool16/browse-filtered.gif b/org.eclipse.mylyn.java.ui/icons/etool16/browse-filtered.gif
deleted file mode 100644
index 273bda0..0000000
--- a/org.eclipse.mylyn.java.ui/icons/etool16/browse-filtered.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/etool16/junit-tab.gif b/org.eclipse.mylyn.java.ui/icons/etool16/junit-tab.gif
deleted file mode 100644
index 956ec81..0000000
--- a/org.eclipse.mylyn.java.ui/icons/etool16/junit-tab.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/etool16/launch-junit-pde.gif b/org.eclipse.mylyn.java.ui/icons/etool16/launch-junit-pde.gif
deleted file mode 100644
index bef090f..0000000
--- a/org.eclipse.mylyn.java.ui/icons/etool16/launch-junit-pde.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/etool16/launch-junit.gif b/org.eclipse.mylyn.java.ui/icons/etool16/launch-junit.gif
deleted file mode 100644
index d3c85e3..0000000
--- a/org.eclipse.mylyn.java.ui/icons/etool16/launch-junit.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/etool16/link-with-editor.gif b/org.eclipse.mylyn.java.ui/icons/etool16/link-with-editor.gif
deleted file mode 100644
index 068d4c9..0000000
--- a/org.eclipse.mylyn.java.ui/icons/etool16/link-with-editor.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/etool16/no-scroll.gif b/org.eclipse.mylyn.java.ui/icons/etool16/no-scroll.gif
deleted file mode 100644
index 33f40b9..0000000
--- a/org.eclipse.mylyn.java.ui/icons/etool16/no-scroll.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/etool16/wizard-prefs.gif b/org.eclipse.mylyn.java.ui/icons/etool16/wizard-prefs.gif
deleted file mode 100644
index 9bb095d..0000000
--- a/org.eclipse.mylyn.java.ui/icons/etool16/wizard-prefs.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/eview16/active-hierarchy.gif b/org.eclipse.mylyn.java.ui/icons/eview16/active-hierarchy.gif
deleted file mode 100644
index f3aa87a..0000000
--- a/org.eclipse.mylyn.java.ui/icons/eview16/active-hierarchy.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/icons/wizban/banner-prefs.gif b/org.eclipse.mylyn.java.ui/icons/wizban/banner-prefs.gif
deleted file mode 100644
index ce0f6e3..0000000
--- a/org.eclipse.mylyn.java.ui/icons/wizban/banner-prefs.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.java.ui/plugin.properties b/org.eclipse.mylyn.java.ui/plugin.properties
deleted file mode 100644
index 37edf88..0000000
--- a/org.eclipse.mylyn.java.ui/plugin.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 Mylyn project committers and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn Java Bridge
-
-JavaUiBridge.activeSearch.label = Java Search
-
-javaCompletionProposalComputer.javaAllProposalCategory.name = J&ava Proposals (Task-Focused)
-javaCompletionProposalComputer.javaNoTypeProposalCategory.name = Other Java Proposals (Focused)
-javaCompletionProposalComputer.javaTypeProposalCategory.name = Type Proposals (Focused)
-javaCompletionProposalComputer.templateProposalCategory.name = Template Proposals (Focused)
-
-JavaStructureBridge.name = Java Structure Bridge
-JavaDebugStructureBridge.name = Java Debug Structure Bridge
-
-TaskContextJUnitLaunchConfiguration.name = Task Context Test
-TaskContextJUnitTabGroup.description = Test suite automatically populated by elements in the task context.
-
-FocusPackageExplorerAction.label = Focus on Active Task
-FocusPackageExplorerAction.tooltip = Focus on Active Task (Alt+click to reveal filtered elements)
-FocusBreakpointsViewAction.label = Focus on Active Task
-FocusBreakpointsViewAction.tooltip = Focus on Active Task
-FocusDebugViewAction.label = Focus on Active Task (Experimental)
-FocusDebugViewAction.tooltip = Focus on Active Task (Experimental)
-InterestIncrementAction.label = Mark as Landmark
-InterestIncrementAction.tooltip = Mark the selected element as a landmark
-InterestDecrementAction.label = Remove from Context
-InterestDecrementAction.tooltip = Mark selected element as uninteresting
-
-ShowFilteredChildrenAction.label = Show Filtered Children (Alt+click)
-
-actionSet.label = Java Task Context
-ToggleActiveFoldingAction.label = Focus Editor on Active Task
-ToggleActiveFoldingAction.tooltip = Automatically Fold Uninteresting Elements
-
-actionSet.browsing.label = Java Browsing Task Context
-FocusBrowsingPerspectiveAction.label = Focus Browsing Perspective
-FocusBrowsingPerspectiveAction.tooltip = Focus Java Browsing Views on Active Task
-
-JavaDeclarationsFilter.description = Java Declarations Filter
-JavaDeclarationsFilter.name = Java Members
-
-commands.category.description = Java Task-Focused Interface Commands
-commands.category.name = Java Context
-command.folding.auto.description = Toggle Active Folding
-command.folding.auto.name = Toggle Active Folding
diff --git a/org.eclipse.mylyn.java.ui/plugin.xml b/org.eclipse.mylyn.java.ui/plugin.xml
deleted file mode 100644
index 10363ef..0000000
--- a/org.eclipse.mylyn.java.ui/plugin.xml
+++ /dev/null
@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="javaEditorContributor" 
-   		name="Task-Focused Java Editor Contributor" 
-   		schema="schema/javaEditorContributor.exsd"/>
-	
-	<extension
-	       point="org.eclipse.mylyn.context.core.bridges">
-	    <structureBridge
-           class="org.eclipse.mylyn.internal.java.ui.JavaStructureBridge"
-           name="%JavaStructureBridge.name"
-           parentContentType="resource"/>
-     <structureBridge
-           class="org.eclipse.mylyn.internal.java.ui.JavaDebugStructureBridge"
-           name="%JavaDebugStructureBridge.name"/>
-    </extension>
-	   
-	<extension point="org.eclipse.mylyn.context.ui.bridges">
-	    <uiBridge
-	          class="org.eclipse.mylyn.internal.java.ui.JavaUiBridge"
-	          contentType="java"
-	          activeSearchIcon="icons/elcl16/edge-ref-java.gif"
-           	  activeSearchLabel="%JavaUiBridge.activeSearch.label"/>
-        <preservedFilters
-            viewId="org.eclipse.jdt.ui.PackageExplorer">
-       	 	<filter
-               class="org.eclipse.jdt.internal.ui.filters.ImportDeclarationFilter">
-         	</filter>
-         	<filter
-               class="org.eclipse.jdt.internal.ui.filters.PackageDeclarationFilter">
-         	</filter>
-         	<filter
-               class="org.eclipse.mylyn.internal.java.ui.JavaDeclarationsFilter">
-         	</filter>
-          <filter
-                class="org.eclipse.jdt.internal.ui.filters.ClosedProjectFilter">
-          </filter>
-        </preservedFilters>
-        <preservedFilters
-              viewId="org.eclipse.ui.navigator.ProjectExplorer">
-           <filter
-                 class="org.eclipse.jdt.internal.ui.filters.PackageDeclarationFilter">
-           </filter>
-           <filter
-                 class="org.eclipse.jdt.internal.ui.filters.ImportDeclarationFilter">
-           </filter>
-        </preservedFilters>
-   </extension>
-   
- <extension
-       point="org.eclipse.mylyn.context.ui.startup">
-    <startup
-          class="org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin$JavaUiBridgeStartup">
-    </startup>
- </extension>
-
-  	<!-- ==================== Context Editing Common Navigator ==================== -->
-
-	<extension
-			point="org.eclipse.ui.navigator.viewer">
-		<viewerContentBinding 
-			viewerId="org.eclipse.mylyn.context.ui.navigator.context">
-			<includes>
-				<contentExtension pattern="org.eclipse.jdt.java.ui.javaContent" />	
-			</includes>
-		</viewerContentBinding>
-		<viewerContentBinding 
-			viewerId="org.eclipse.mylyn.context.ui.navigator.context.quick">
-			<includes>
-				<contentExtension pattern="org.eclipse.jdt.java.ui.javaContent" />	
-			</includes>
-		</viewerContentBinding>
-	</extension>
-
-  	<!-- ==================== Content Assist ==================== -->
-
- 	<extension
- 		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="javaAllProposalCategory"
-		name="%javaCompletionProposalComputer.javaAllProposalCategory.name">
- 		<proposalCategory
-			icon="icons/elcl16/proposals-other.gif"/>
-	</extension>
-	<!-- e3.4 and earlier -->
-	<!--
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="javaNoTypeProposalCategory"
-		name="%javaCompletionProposalComputer.javaNoTypeProposalCategory.name">
-		<proposalCategory
-			icon="icons/elcl16/proposals-other.gif"/>
-	</extension>
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="javaTypeProposalCategory"
-		name="%javaCompletionProposalComputer.javaTypeProposalCategory.name">
-		<proposalCategory
-			icon="icons/elcl16/proposals-type.gif"/>
-	</extension>
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="templateProposalCategory"
-		name="%javaCompletionProposalComputer.templateProposalCategory.name">
-		<proposalCategory
-			icon="/icons/elcl16/templateprop_co.gif"/>
-	</extension>
-	-->
-	
-	<!-- java completions -->
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="javaAllCompletionProposalComputer">
-		<javaCompletionProposalComputer
-          activate="true"
-          categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory"
-          class="org.eclipse.mylyn.internal.java.ui.editor.FocusedJavaAllProposalComputer">
-			<partition type="__dftl_partition_content_type"/>
-			<partition type="__java_string"/>
-		</javaCompletionProposalComputer>
-	</extension>
-	<!-- e3.4 and earlier -->
-	<!--
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="javaTypeCompletionProposalComputer">
-		<javaCompletionProposalComputer
-        activate="true"
-        categoryId="org.eclipse.mylyn.java.ui.javaTypeProposalCategory"
-        class="org.eclipse.mylyn.internal.java.ui.editor.FocusedJavaTypeProposalComputer">
-			<partition type="__dftl_partition_content_type"/>
-			<partition type="__java_string"/>
-		</javaCompletionProposalComputer>
-	</extension>
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="javaNoTypeCompletionProposalComputer">
-		<javaCompletionProposalComputer
-        activate="true"
-        categoryId="org.eclipse.mylyn.java.ui.javaNoTypeProposalCategory"
-        class="org.eclipse.mylyn.internal.java.ui.editor.FocusedJavaNoTypeProposalComputer">
-			<partition type="__dftl_partition_content_type"/>
-			<partition type="__java_string"/>
-		</javaCompletionProposalComputer>
-	</extension>
-	-->
-	<!-- templates -->
-	<!--
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="templateProposalComputer">
-		<javaCompletionProposalComputer
-        activate="true"
-        categoryId="org.eclipse.mylyn.java.ui.templateProposalCategory"
-        class="org.eclipse.jdt.internal.ui.text.java.TemplateCompletionProposalComputer">
-			<partition type="__dftl_partition_content_type"/>
-			<partition type="__java_singleline_comment"/>
-			<partition type="__java_javadoc"/>
-		</javaCompletionProposalComputer>
-	</extension>
-	-->
-	<!-- javadoc completions -->
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="LegacyJavadocCompletionProposalComputer_all">
-		<javaCompletionProposalComputer 
-			class="org.eclipse.jdt.internal.ui.text.javadoc.LegacyJavadocCompletionProposalComputer"
-			categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory">
-			<partition type="__java_javadoc"/>
-		</javaCompletionProposalComputer>
-	</extension>
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="JavadocCompletionProposalComputer_all">
-		<javaCompletionProposalComputer 
-			class="org.eclipse.jdt.internal.ui.text.javadoc.JavadocCompletionProposalComputer"
-			categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory">
-			<partition type="__java_javadoc"/>
-		</javaCompletionProposalComputer>
-	</extension>
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="JavadocHTMLCompletionProposalComputer_all">
-		<javaCompletionProposalComputer 
-			class="org.eclipse.jdt.internal.ui.text.javadoc.HTMLTagCompletionProposalComputer"
-			categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory">
-			<partition type="__java_javadoc"/>
-		</javaCompletionProposalComputer>
-	</extension>
-	<!-- e3.4 and earlier -->
-	<!--
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="org.eclipse.mylyn.java.editor.LegacyJavadocCompletionProposalComputer">
-		<javaCompletionProposalComputer
-        activate="true"
-        categoryId="org.eclipse.mylyn.java.ui.javaNoTypeProposalCategory"
-        class="org.eclipse.jdt.internal.ui.text.javadoc.LegacyJavadocCompletionProposalComputer">
-			<partition type="__java_javadoc"/>
-		</javaCompletionProposalComputer>
-	</extension>
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="org.eclipse.mylyn.java.editor.JavadocCompletionProposalComputer">
-		<javaCompletionProposalComputer
-        activate="true"
-        categoryId="org.eclipse.mylyn.java.ui.javaNoTypeProposalCategory"
-        class="org.eclipse.jdt.internal.ui.text.javadoc.JavadocCompletionProposalComputer">
-			<partition type="__java_javadoc"/>
-		</javaCompletionProposalComputer>
-	</extension>
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="org.eclipse.mylyn.java.editor.JavadocHTMLCompletionProposalComputer">
-		<javaCompletionProposalComputer
-        activate="true"
-        categoryId="org.eclipse.mylyn.java.ui.javaNoTypeProposalCategory"
-        class="org.eclipse.jdt.internal.ui.text.javadoc.HTMLTagCompletionProposalComputer">
-			<partition type="__java_javadoc"/>
-		</javaCompletionProposalComputer>
-	</extension>
-	-->
-  	<!-- ==================== Launch Configurations ==================== -->
-
-	<extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            name="%TaskContextJUnitLaunchConfiguration.name"
-            delegate="org.eclipse.mylyn.internal.java.ui.junit.TaskContextJUnitLaunchConfiguration"
-            modes="run, debug"
-            id="org.eclipse.mylyn.java.junit.launchconfig"
-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
-      </launchConfigurationType>
-    </extension>
-    
-	<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-	  	<launchConfigurationTypeImage
-	 		id="org.eclipse.mylyn.pde.junit.launchconfig.image"
-	 		configTypeID="org.eclipse.mylyn.pde.junit.launchconfig"
-	 		icon="icons/etool16/launch-junit-pde.gif">
-	  	</launchConfigurationTypeImage>
-	</extension>
-
-	<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-	  	<launchConfigurationTypeImage
-	 		id="org.eclipse.mylyn.java.junit.launchconfig.image"
-	 		configTypeID="org.eclipse.mylyn.java.junit.launchconfig"
-	 		icon="icons/etool16/launch-junit.gif">
-	  	</launchConfigurationTypeImage>
-	</extension>
-	
-	<extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="org.eclipse.mylyn.java.junit.launchconfig"
-            helpContextId="org.eclipse.jdt.junit.junit_tab_group"
-            class="org.eclipse.mylyn.internal.java.ui.junit.TaskContextJUnitTabGroup"
-            id="org.eclipse.mylyn.java.junit.launchconfig.tabgroup">
-         <launchMode
-               perspective="org.eclipse.debug.ui.DebugPerspective"
-               description="%TaskContextJUnitTabGroup.description"
-               mode="debug">
-         </launchMode>
-         <launchMode
-               description="%TaskContextJUnitTabGroup.description"
-               mode="run">
-         </launchMode>
-      </launchConfigurationTabGroup>
-    </extension>
-
-   <extension point="org.eclipse.ui.viewActions"> 
-		<viewContribution 
-		id="org.eclipse.mylyn.java.explorer.contribution" 
-   		targetID="org.eclipse.jdt.ui.PackageExplorer">
-    	<action
-           class="org.eclipse.mylyn.internal.java.ui.actions.FocusPackageExplorerAction"
-           disabledIcon="icons/elcl16/focus-disabled.gif"
-           enablesFor="*"
-           icon="icons/elcl16/focus.gif"
-           id="org.eclipse.mylyn.java.actions.focus.packageExplorer"
-           label="%FocusPackageExplorerAction.label"
-           menubarPath="mylyn"
-           style="toggle"
-           toolbarPath="mylyn"
-           tooltip="%FocusPackageExplorerAction.tooltip">
-        <enablement>
-           <systemProperty
-                 name="org.eclipse.mylyn.context.core.context.active"
-                 value="true">
-           </systemProperty>
-        </enablement>
-  		</action> 
-      </viewContribution>
- 	  <viewContribution
-       id="org.eclipse.mylyn.ui.views.active.search.contribution"
-       targetID="org.eclipse.mylyn.ui.views.active.search">
- 		</viewContribution>
- 	
-	 <viewContribution
-         id="org.eclipse.mylyn.java.ui.markers.breakpoints.contribution"
-         targetID="org.eclipse.debug.ui.BreakpointView">
-      <action
-            class="org.eclipse.mylyn.internal.java.ui.actions.FocusBreakpointsViewAction"
-            disabledIcon="icons/elcl16/focus-disabled.gif"
-            enablesFor="*"
-            icon="icons/elcl16/focus.gif"
-            id="org.eclipse.mylyn.java.ui.actions.focus.markers.breakpoints"
-            label="%FocusBreakpointsViewAction.label"
-            menubarPath="mylyn"
-            style="toggle"
-            toolbarPath="mylyn"
-            tooltip="%FocusBreakpointsViewAction.tooltip">
-      </action>
-   	</viewContribution> 
- 		
- 	<viewContribution 
-		id="org.eclipse.mylyn.ui.debug.view.contribution" 
-   		targetID="org.eclipse.debug.ui.DebugView">
-    	<action
-           class="org.eclipse.mylyn.internal.java.ui.actions.FocusDebugViewAction"
-           disabledIcon="icons/elcl16/focus-disabled.gif"
-           enablesFor="*"
-           icon="icons/elcl16/focus.gif"
-           id="org.eclipse.mylyn.ui.actions.FilterResourceNavigatorAction"
-           label="%FocusDebugViewAction.label"
-           menubarPath="mylyn"
-           style="toggle"
-           toolbarPath="mylyn"
-           tooltip="%FocusDebugViewAction.tooltip">
-        <enablement>
-           <systemProperty
-                 name="org.eclipse.mylyn.context.core.context.active"
-                 value="true">
-           </systemProperty>
-        </enablement> 
-  		</action> 
-      </viewContribution> 
-	</extension>
-
-	
-  <extension point="org.eclipse.ui.popupMenus"> 
-     <objectContribution
-     	   adaptable="false"
-           id="org.eclipse.mylyn.java.ui.interest.increase.contribution"
-           objectClass="org.eclipse.jdt.core.IJavaElement">
-	    <action
-           class="org.eclipse.mylyn.internal.context.ui.actions.InterestIncrementAction"
-           definitionId="org.eclipse.mylyn.context.ui.commands.interest.increment"
-           enablesFor="*"
-           icon="icons/elcl16/interest-increase.gif"
-           id="org.eclipse.mylyn.java.ui.interest.increase.element"
-           label="%InterestIncrementAction.label"
-           menubarPath="group.reorganize"
-           tooltip="%InterestIncrementAction.tooltip">
-     </action>
-     <visibility>
-     	<and>
-	     	<systemProperty
-	               name="org.eclipse.mylyn.context.core.context.active"
-    	           value="true">
-    	    </systemProperty>
-           <objectClass
-                 name="org.eclipse.jdt.core.IMember">
-           </objectClass>
-        </and>
-     </visibility>
-	 </objectContribution>
-     <objectContribution
-           adaptable="false"
-           id="org.eclipse.mylyn.java.ui.interest.remove.contribution.elements"
-           objectClass="org.eclipse.jdt.core.IJavaElement">
-     	<action
-            class="org.eclipse.mylyn.internal.context.ui.actions.InterestDecrementAction"
-            definitionId="org.eclipse.mylyn.context.ui.commands.interest.decrement"
-            enablesFor="*"
-            icon="icons/elcl16/interest-decrease.gif"
-            id="org.eclipse.mylyn.java.ui.interest.remove.element"
-            label="%InterestDecrementAction.label"
-            menubarPath="group.reorganize"
-            tooltip="%InterestDecrementAction.tooltip">
-      </action>
-      <visibility>
-      		<and>
-      			<systemProperty
-	               name="org.eclipse.mylyn.context.core.context.active"
-    	           value="true">
-      			</systemProperty>
-      			<or>
-	               <objectClass
-	                     name="org.eclipse.jdt.core.IMethod">
-	               </objectClass>
-	               <objectClass
-	                     name="org.eclipse.jdt.core.IField">
-	               </objectClass>
-	               <objectClass
-	                     name="org.eclipse.jdt.core.IClassFile">
-	               </objectClass>
-	               <objectClass
-	                     name="org.eclipse.jdt.internal.compiler.env.IBinaryType">
-	               </objectClass>
-	               <objectClass
-	                     name="org.eclipse.jdt.internal.core.JarPackageFragment">
-	               </objectClass>
-	               <objectClass
-	                     name="org.eclipse.jdt.internal.core.JarPackageFragmentRoot">
-	               </objectClass>
-	            </or>
-      		</and>
-      </visibility>
-     </objectContribution>
-     <viewerContribution
-           id="org.eclipse.mylyn.context.ui.browse.filtered.contribution"
-           targetID="org.eclipse.jdt.ui.PackageExplorer">
-        <action
-              class="org.eclipse.mylyn.internal.java.ui.actions.ShowFilteredChildrenAction"
-              enablesFor="1"
-              icon="icons/etool16/browse-filtered.gif"
-              id="org.eclipse.mylyn.java.ui.action.browse.filtered"
-              label="%ShowFilteredChildrenAction.label"
-              menubarPath="group.reorganize">
-        </action>
-        <visibility>
-           <systemProperty
-                 name="org.eclipse.mylyn.context.core.context.active"
-                 value="true">
-           </systemProperty>
-        </visibility>
-     </viewerContribution>
-  </extension>   
-
-  <extension point="org.eclipse.ui.actionSets">
-	<actionSet
-            id="org.eclipse.mylyn.java.actionSet"
-            label="%actionSet.label"
-            visible="false">
-  		<action
-          class="org.eclipse.mylyn.internal.java.ui.actions.ToggleActiveFoldingAction"
-          definitionId="org.eclipse.mylyn.java.ui.editor.folding.auto"
-          icon="icons/elcl16/interest-folding.gif"
-          id="org.eclipse.mylyn.java.ui.editor.folding.auto"
-          label="%ToggleActiveFoldingAction.label"
-          style="toggle"
-          toolbarPath="org.eclipse.ui.edit.text.actionSet.presentation/Presentation"
-          tooltip="%ToggleActiveFoldingAction.tooltip">
-      	</action> 
-      	<!--
-        <action
-               definitionId="org.eclipse.mylyn.java.ui.search.context"
-               label="Search the current task context"
-               class="org.eclipse.mylyn.internal.sandbox.ui.actions.FindReferencesInContextAction"
-               id="org.eclipse.mylyn.java.ui.search.context">
-         </action>
-        -->
-    </actionSet>
-   </extension>
-  
-   <extension
-         point="org.eclipse.ui.actionSetPartAssociations">
-      <actionSetPartAssociation
-            targetID="org.eclipse.mylyn.java.actionSet">
-         <part
-               id="org.eclipse.jdt.ui.CompilationUnitEditor">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.ClassFileEditor">
-         </part>
-      </actionSetPartAssociation>
-   </extension>
-  
-   <extension point="org.eclipse.ui.actionSets">
-	<actionSet
-            id="org.eclipse.mylyn.java.actionSet.browsing"
-            label="%actionSet.browsing.label"
-            visible="false"> 
-	    <action
-           class="org.eclipse.mylyn.internal.java.ui.actions.FocusBrowsingPerspectiveAction"
-           id="org.eclipse.mylyn.java.ui.actions.ApplyMylynToBrowsingPerspectiveAction"
-           style="toggle"
-	       label="%FocusBrowsingPerspectiveAction.label" 
-	       icon="icons/elcl16/focus-browsing.gif"
-	       tooltip="%FocusBrowsingPerspectiveAction.tooltip"
-	       toolbarPath="mylyn"
-	       enablesFor="*">
-	    </action>
-  	</actionSet>
-  </extension>
-  
- <extension point="org.eclipse.ui.actionSetPartAssociations">
-	<actionSetPartAssociation targetID="org.eclipse.mylyn.java.actionSet.browsing">
-         <part id="org.eclipse.jdt.ui.MembersView"/>
-         <part id="org.eclipse.jdt.ui.PackagesView"/>
-         <part id="org.eclipse.jdt.ui.TypesView"/>
-    </actionSetPartAssociation>
-  </extension>
-
-	<extension point="org.eclipse.ui.perspectiveExtensions">
-		<perspectiveExtension 
-			targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
-			<actionSet id="org.eclipse.mylyn.java.actionSet.browsing"/>
-		</perspectiveExtension>
-	</extension>
-
-   <extension point="org.eclipse.jdt.ui.javaElementFilters">
-        <filter
-            targetId="org.eclipse.jdt.ui.PackageExplorer"
-            name="%JavaDeclarationsFilter.name"
-            enabled="false"
-            description="%JavaDeclarationsFilter.description"
-            class="org.eclipse.mylyn.internal.java.ui.JavaDeclarationsFilter"
-            id="org.eclipse.mylyn.java.ui.MembersFilter">
-   		</filter>
-   </extension>
-
-   <extension point="org.eclipse.ui.commands">
-      <category
-            name="%commands.category.name"
-            description="%commands.category.description"
-            id="org.eclipse.mylyn.java.ui.commands">
-      </category>
-	  <command
-         categoryId="org.eclipse.mylyn.java.ui.commands"
-         description="%command.folding.auto.description"
-         id="org.eclipse.mylyn.java.ui.editor.folding.auto"
-         name="%command.folding.auto.name">
-      </command>
-    </extension>
-   
-</plugin>
diff --git a/org.eclipse.mylyn.java.ui/schema/javaEditorContributor.exsd b/org.eclipse.mylyn.java.ui/schema/javaEditorContributor.exsd
deleted file mode 100644
index 669ecbc..0000000
--- a/org.eclipse.mylyn.java.ui/schema/javaEditorContributor.exsd
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.java.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.mylyn.java.ui" id="javaEditorContributor" name="Mylyn Java Editor Contributor"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="hyperlinkDetector" 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="hyperlinkDetector">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </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>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/ActiveFoldingEditorTracker.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/ActiveFoldingEditorTracker.java
deleted file mode 100644
index 14ee324..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/ActiveFoldingEditorTracker.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.mylyn.internal.java.ui.editor.ActiveFoldingListener;
-import org.eclipse.mylyn.monitor.ui.AbstractEditorTracker;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @author Mik Kersten
- */
-public class ActiveFoldingEditorTracker extends AbstractEditorTracker {
-
-	protected Map<JavaEditor, ActiveFoldingListener> editorListenerMap = new HashMap<JavaEditor, ActiveFoldingListener>();
-
-	@Override
-	public void editorOpened(IEditorPart part) {
-		if (part instanceof JavaEditor) {
-			registerEditor((JavaEditor) part);
-		}
-	}
-
-	@Override
-	public void editorClosed(IEditorPart part) {
-		if (part instanceof JavaEditor) {
-			unregisterEditor((JavaEditor) part);
-		}
-	}
-
-	public void registerEditor(final JavaEditor editor) {
-		if (editorListenerMap.containsKey(editor)) {
-			return;
-		} else {
-			ActiveFoldingListener listener = new ActiveFoldingListener(editor);
-			editorListenerMap.put(editor, listener);
-		}
-	}
-
-	public void unregisterEditor(JavaEditor editor) {
-		ActiveFoldingListener listener = editorListenerMap.get(editor);
-		if (listener != null) {
-			listener.dispose();
-		}
-		editorListenerMap.remove(editor);
-	}
-
-	/**
-	 * For testing.
-	 */
-	public Map<JavaEditor, ActiveFoldingListener> getEditorListenerMap() {
-		return editorListenerMap;
-	}
-
-	@Override
-	protected void editorBroughtToTop(IEditorPart part) {
-		// ignore
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/BreakpointsInterestFilter.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/BreakpointsInterestFilter.java
deleted file mode 100644
index e252a7e..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/BreakpointsInterestFilter.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.java.ui;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylyn.ide.ui.AbstractMarkerInterestFilter;
-
-/**
- * @author Mik Kersten
- */
-public class BreakpointsInterestFilter extends AbstractMarkerInterestFilter {
-
-	@Override
-	public boolean select(Viewer viewer, Object parent, Object element) {
-		if (element instanceof IJavaLineBreakpoint) {
-			IJavaLineBreakpoint breakpoint = (IJavaLineBreakpoint) element;
-			return isInteresting(breakpoint.getMarker(), viewer, parent);
-		}
-		if (element instanceof IBreakpoint) {
-			IBreakpoint breakpoint = (IBreakpoint) element;
-			// TODO: could consider use breakpoint.isEnabled() to make enabled breakpoints implicitly interesting	
-			return isInteresting(breakpoint.getMarker(), viewer, parent);
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean isImplicitlyInteresting(IMarker marker) {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/InterestUpdateDeltaListener.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/InterestUpdateDeltaListener.java
deleted file mode 100644
index 5145d2c..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/InterestUpdateDeltaListener.java
+++ /dev/null
@@ -1,119 +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.java.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class InterestUpdateDeltaListener implements IElementChangedListener {
-
-	private static boolean asyncExecMode = true;
-
-	public void elementChanged(ElementChangedEvent event) {
-		IJavaElementDelta delta = event.getDelta();
-		handleDelta(delta.getAffectedChildren());
-	}
-
-	/**
-	 * Only handles first addition/removal
-	 */
-	private void handleDelta(IJavaElementDelta[] delta) {
-		try {
-			IJavaElement added = null;
-			IJavaElement removed = null;
-			for (IJavaElementDelta child : delta) {
-				if (child.getElement() instanceof ICompilationUnit) {
-					if (((ICompilationUnit) child.getElement()).getOwner() != null) {
-						// see bug 195361, do not reduce interest of temporary working copy
-						return;
-					}
-				}
-
-				if (child.getKind() == IJavaElementDelta.ADDED) {
-					if (added == null) {
-						added = child.getElement();
-					}
-				} else if (child.getKind() == IJavaElementDelta.REMOVED) {
-					if (removed == null) {
-						removed = child.getElement();
-					}
-				}
-				handleDelta(child.getAffectedChildren());
-			}
-
-			if (added != null && removed != null) {
-				IInteractionElement element = ContextCore.getContextManager().getElement(removed.getHandleIdentifier());
-				if (element != null) {
-					resetHandle(element, added.getHandleIdentifier());
-				}
-			} else if (removed != null) {
-
-				IInteractionElement element = ContextCore.getContextManager().getElement(removed.getHandleIdentifier());
-				if (element != null) {
-					delete(element);
-				}
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN, "Delta update failed", t)); //$NON-NLS-1$
-		}
-	}
-
-	private void resetHandle(final IInteractionElement element, final String newHandle) {
-		if (!asyncExecMode) {
-			ContextCore.getContextManager().updateHandle(element, newHandle);
-		} else {
-			IWorkbench workbench = PlatformUI.getWorkbench();
-			if (workbench != null) {
-				workbench.getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						ContextCore.getContextManager().updateHandle(element, newHandle);
-					}
-				});
-			}
-		}
-	}
-
-	private void delete(final IInteractionElement element) {
-		if (!asyncExecMode) {
-			ContextCore.getContextManager().deleteElement(element);
-		} else {
-			IWorkbench workbench = PlatformUI.getWorkbench();
-			if (workbench != null) {
-				workbench.getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						ContextCore.getContextManager().deleteElement(element);
-					}
-				});
-			}
-		}
-	}
-
-	/**
-	 * For testing
-	 */
-	public static void setAsyncExecMode(boolean asyncExecMode) {
-		InterestUpdateDeltaListener.asyncExecMode = asyncExecMode;
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaDebugStructureBridge.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaDebugStructureBridge.java
deleted file mode 100644
index 9d7829a..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaDebugStructureBridge.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.ui;
-
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.RuntimeProcess;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.debug.core.JavaDebugUtils;
-import org.eclipse.jdt.internal.debug.core.model.JDIDebugElement;
-import org.eclipse.jdt.internal.debug.core.model.JDIStackFrame;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-
-/**
- * @author Mik Kersten
- */
-public class JavaDebugStructureBridge extends AbstractContextStructureBridge {
-
-	public final static String CONTENT_TYPE = "java/debug"; //$NON-NLS-1$
-
-	private final JavaStructureBridge javaStructureBridge = new JavaStructureBridge();
-
-	/**
-	 * Needed due to slowness in resolving type names. We expect the stack frame elements to disappear, they are never
-	 * explicitly removed.
-	 * 
-	 * TODO: consider clearing on each re-launch
-	 */
-	private final Map<JDIStackFrame, IType> stackFrameMap = new WeakHashMap<JDIStackFrame, IType>();
-
-	@Override
-	public boolean acceptsObject(Object object) {
-		return object instanceof ILaunch || object instanceof JDIDebugElement || object instanceof RuntimeProcess;
-	}
-
-	@Override
-	public boolean canBeLandmark(String handle) {
-		return false;
-	}
-
-	@Override
-	public boolean canFilter(Object element) {
-//		return element instanceof JDIStackFrame;
-		if (element instanceof JDIStackFrame) {
-			JDIStackFrame stackFrame = (JDIStackFrame) element;
-			try {
-				IStackFrame[] frames = stackFrame.getThread().getStackFrames();
-
-				int indexOfInterestingFrame = 0;
-				int indexOfCurrentFrame = 0;
-				for (int i = 0; i < frames.length; i++) {
-					IStackFrame frame = frames[i];
-					if (stackFrame.getName().equals(frame.getName())) {
-						indexOfCurrentFrame = i;
-					}
-
-					IInteractionElement correspondingElement = ContextCore.getContextManager().getElement(
-							getHandleIdentifier(frame));
-					if (correspondingElement != null && correspondingElement.getInterest().isInteresting()) {
-						indexOfInterestingFrame = i;
-					}
-				}
-				return indexOfCurrentFrame > indexOfInterestingFrame;
-			} catch (DebugException e) {
-				return false;
-			}
-		}
-		return element instanceof JDIStackFrame;
-	}
-
-	@Override
-	public List<String> getChildHandles(String handle) {
-		return null;
-	}
-
-	@Override
-	public String getContentType() {
-		return CONTENT_TYPE;
-	}
-
-	@Override
-	public String getContentType(String elementHandle) {
-		return getContentType();
-	}
-
-	@Override
-	public String getHandleForOffsetInObject(Object resource, int offset) {
-		return null;
-	}
-
-	@Override
-	public String getHandleIdentifier(Object object) {
-		if (object instanceof JDIStackFrame) {
-			JDIStackFrame stackFrame = (JDIStackFrame) object;
-			IType type = null;
-			if (stackFrameMap.containsKey(stackFrame)) {
-				type = stackFrameMap.get(stackFrame);
-			} else {
-				try {
-					type = JavaDebugUtils.resolveDeclaringType(stackFrame);
-					stackFrameMap.put(stackFrame, type);
-				} catch (CoreException e) {
-					// ignore
-				}
-			}
-			if (type != null && type.exists()) {
-				return javaStructureBridge.getHandleIdentifier(type);
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public String getLabel(Object object) {
-		return "" + object; //$NON-NLS-1$
-	}
-
-	@Override
-	public Object getObjectForHandle(String handle) {
-		return javaStructureBridge.getObjectForHandle(handle);
-	}
-
-	@Override
-	public String getParentHandle(String handle) {
-		return null;
-	}
-
-	@Override
-	public boolean isDocument(String handle) {
-		return false;
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaDeclarationsFilter.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaDeclarationsFilter.java
deleted file mode 100644
index 27a0e11..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaDeclarationsFilter.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.java.ui;
-
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-/**
- * @author Mik Kersten
- */
-public class JavaDeclarationsFilter extends ViewerFilter {
-
-	@Override
-	public boolean select(Viewer viewer, Object parent, Object element) {
-		return !(element instanceof IMember || element instanceof IType);
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaEditingMonitor.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaEditingMonitor.java
deleted file mode 100644
index 8e5dcaa..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaEditingMonitor.java
+++ /dev/null
@@ -1,168 +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.java.ui;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IImportContainer;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.actions.SelectionConverter;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.java.ui.search.JavaImplementorsProvider;
-import org.eclipse.mylyn.internal.java.ui.search.JavaReferencesProvider;
-import org.eclipse.mylyn.monitor.ui.AbstractUserInteractionMonitor;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Mik Kersten
- */
-public class JavaEditingMonitor extends AbstractUserInteractionMonitor {
-
-	protected IJavaElement lastSelectedElement = null;
-
-	protected IJavaElement lastResolvedElement = null;
-
-	protected JavaEditor currentEditor;
-
-	protected StructuredSelection currentSelection = null;
-
-	public JavaEditingMonitor() {
-		super();
-	}
-
-	/**
-	 * Only public for testing. Note: Two sequential selections on the same element are deemed to be an edit of the
-	 * selection as this is the best guess that can be made. See bug 252306.
-	 */
-	@Override
-	public void handleWorkbenchPartSelection(IWorkbenchPart part, ISelection selection, boolean contributeToContext) {
-		try {
-			IJavaElement selectedElement = null;
-			if (selection instanceof StructuredSelection) {
-				StructuredSelection structuredSelection = (StructuredSelection) selection;
-
-				if (structuredSelection.equals(currentSelection)) {
-					return;
-				}
-				currentSelection = structuredSelection;
-
-				for (Iterator<?> iterator = structuredSelection.iterator(); iterator.hasNext();) {
-					Object selectedObject = iterator.next();
-					if (selectedObject instanceof IJavaElement) {
-						IJavaElement checkedElement = checkIfAcceptedAndPromoteIfNecessary((IJavaElement) selectedObject);
-						if (checkedElement == null) {
-							return;
-						} else {
-							selectedElement = checkedElement;
-						}
-					}
-					if (selectedElement != null) {
-						super.handleElementSelection(part, selectedElement, contributeToContext);
-					}
-				}
-			} else {
-				if (selection instanceof TextSelection && part instanceof JavaEditor) {
-					currentEditor = (JavaEditor) part;
-					TextSelection textSelection = (TextSelection) selection;
-					selectedElement = SelectionConverter.resolveEnclosingElement(currentEditor, textSelection);
-					if (selectedElement instanceof IPackageDeclaration) {
-						// HACK: ignoring these selections
-						return;
-					}
-					IJavaElement[] resolved = SelectionConverter.codeResolve(currentEditor);
-					if (resolved != null && resolved.length == 1 && !resolved[0].equals(selectedElement)) {
-						lastResolvedElement = resolved[0];
-					}
-
-					boolean selectionResolved = false;
-					if (selectedElement instanceof IMethod && lastSelectedElement instanceof IMethod) {
-						// navigation between two elements
-						if (lastResolvedElement != null && lastSelectedElement != null
-								&& lastResolvedElement.equals(selectedElement)
-								&& !lastSelectedElement.equals(lastResolvedElement)) {
-							super.handleNavigation(part, selectedElement, JavaReferencesProvider.ID,
-									contributeToContext);
-							selectionResolved = true;
-						} else if (lastSelectedElement != null && lastSelectedElement.equals(lastResolvedElement)
-								&& !lastSelectedElement.equals(selectedElement)) {
-							super.handleNavigation(part, selectedElement, JavaReferencesProvider.ID,
-									contributeToContext);
-							selectionResolved = true;
-						}
-					} else if (selectedElement != null && lastSelectedElement != null
-							&& !lastSelectedElement.equals(selectedElement)) {
-						if (lastSelectedElement.getElementName().equals(selectedElement.getElementName())) {
-							// navigation between two elements
-							if (selectedElement instanceof IMethod && lastSelectedElement instanceof IMethod) {
-								super.handleNavigation(part, selectedElement, JavaImplementorsProvider.ID,
-										contributeToContext);
-								selectionResolved = true;
-							} else if (selectedElement instanceof IType && lastSelectedElement instanceof IType) {
-								super.handleNavigation(part, selectedElement, JavaImplementorsProvider.ID,
-										contributeToContext);
-								selectionResolved = true;
-							}
-						}
-					}
-					if (selectedElement != null) {
-						// selection of an element
-						if (!selectionResolved && selectedElement.equals(lastSelectedElement)) {
-							super.handleElementEdit(part, selectedElement, contributeToContext);
-						} else if (!selectedElement.equals(lastSelectedElement)) {
-							super.handleElementSelection(part, selectedElement, contributeToContext);
-						}
-					}
-
-					IJavaElement checkedElement = checkIfAcceptedAndPromoteIfNecessary(selectedElement);
-					if (checkedElement == null) {
-						return;
-					} else {
-						selectedElement = checkedElement;
-					}
-				}
-			}
-			if (selectedElement != null) {
-				lastSelectedElement = selectedElement;
-			}
-		} catch (JavaModelException e) {
-			// ignore, fine to fail to resolve an element if the model is not up-to-date
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-					"Failed to update model based on selection", t)); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @return null for elements that aren't modeled
-	 */
-	protected IJavaElement checkIfAcceptedAndPromoteIfNecessary(IJavaElement element) {
-		// if (element instanceof IPackageDeclaration) return null;
-		if (element instanceof IImportContainer) {
-			return element.getParent();
-		} else if (element instanceof IImportDeclaration) {
-			return element.getParent().getParent();
-		} else {
-			return element;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaStructureBridge.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaStructureBridge.java
deleted file mode 100644
index b06ba80..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaStructureBridge.java
+++ /dev/null
@@ -1,395 +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.java.ui;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.internal.resources.Marker;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IParent;
-import org.eclipse.jdt.core.ISourceReference;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.core.JarEntryFile;
-import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
-import org.eclipse.jdt.internal.ui.packageview.ClassPathContainer;
-import org.eclipse.jdt.internal.ui.packageview.PackageFragmentRootContainer;
-import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
-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.context.core.IInteractionElement;
-import org.eclipse.ui.internal.WorkingSet;
-import org.eclipse.ui.views.markers.internal.ConcreteMarker;
-
-/**
- * @author Mik Kersten
- */
-public class JavaStructureBridge extends AbstractContextStructureBridge {
-
-	public final static String CONTENT_TYPE = "java"; //$NON-NLS-1$
-
-	@Override
-	public String getContentType() {
-		return CONTENT_TYPE;
-	}
-
-	@Override
-	public Object getAdaptedParent(Object object) {
-		if (object instanceof IFile) {
-			IFile file = (IFile) object;
-			return JavaCore.create(file.getParent());
-		} else {
-			return super.getAdaptedParent(object);
-		}
-	}
-
-	@Override
-	public String getParentHandle(String handle) {
-		IJavaElement javaElement = (IJavaElement) getObjectForHandle(handle);
-		if (javaElement != null && javaElement.getParent() != null) {
-			return getHandleIdentifier(javaElement.getParent());
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public List<String> getChildHandles(String handle) {
-		Object object = getObjectForHandle(handle);
-		if (object instanceof IJavaElement) {
-			IJavaElement element = (IJavaElement) object;
-			if (element instanceof IParent) {
-				IParent parent = (IParent) element;
-				IJavaElement[] children;
-				try {
-					children = parent.getChildren();
-					List<String> childHandles = new ArrayList<String>();
-					for (IJavaElement element2 : children) {
-						String childHandle = getHandleIdentifier(element2);
-						if (childHandle != null) {
-							childHandles.add(childHandle);
-						}
-					}
-					AbstractContextStructureBridge parentBridge = ContextCore.getStructureBridge(parentContentType);
-					if (parentBridge != null && ContextCore.CONTENT_TYPE_RESOURCE.equals(parentBridge.getContentType())) {
-						if (element.getElementType() < IJavaElement.TYPE) {
-							List<String> resourceChildren = parentBridge.getChildHandles(handle);
-							if (!resourceChildren.isEmpty()) {
-								childHandles.addAll(resourceChildren);
-							}
-						}
-					}
-
-					return childHandles;
-				} catch (JavaModelException e) {
-					// NOTE: it would be better if this was not hard-wired but used the parent/child bridge mapping
-					AbstractContextStructureBridge parentBridge = ContextCore.getStructureBridge(ContextCore.CONTENT_TYPE_RESOURCE);
-					return parentBridge.getChildHandles(handle);
-				} catch (Exception e) {
-					StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN, "Could not get children", //$NON-NLS-1$
-							e));
-				}
-			}
-		}
-		return Collections.emptyList();
-	}
-
-	@Override
-	public Object getObjectForHandle(String handle) {
-		try {
-			return JavaCore.create(handle);
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.WARNING, JavaUiBridgePlugin.ID_PLUGIN,
-					"Could not create java element for handle: " + handle, t)); //$NON-NLS-1$
-			return null;
-		}
-	}
-
-	/**
-	 * Uses resource-compatible path for projects
-	 */
-	@Override
-	public String getHandleIdentifier(Object object) {
-		if (object instanceof IJavaElement) {
-			return ((IJavaElement) object).getHandleIdentifier();
-		} else {
-			if (object instanceof IAdaptable) {
-				Object adapter = ((IAdaptable) object).getAdapter(IJavaElement.class);
-				if (adapter instanceof IJavaElement) {
-					return ((IJavaElement) adapter).getHandleIdentifier();
-				}
-			} else if (isWtpClass(object)) {
-				return getWtpElementHandle(object);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * TODO: remove after WTP 1.5.1 is generally available
-	 */
-	private String getWtpElementHandle(Object object) {
-		Class<?> objectClass = object.getClass();
-		try {
-			Method getProjectMethod = objectClass.getMethod("getProject", new Class[0]); //$NON-NLS-1$
-			Object javaProject = getProjectMethod.invoke(object, new Object[0]);
-			if (javaProject instanceof IJavaProject) {
-				return ((IJavaElement) javaProject).getHandleIdentifier();
-			}
-		} catch (Exception e) {
-			// ignore
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	private boolean isWtpClass(Object object) {
-		try {
-			return object != null && object.getClass().getSimpleName().equals("CompressedJavaProject"); //$NON-NLS-1$
-		} catch (Throwable t) {
-			// could have malformed name, see bug 165065
-			return false;
-		}
-	}
-
-	@Override
-	public String getLabel(Object object) {
-		if (object instanceof IJavaElement) {
-			return ((IJavaElement) object).getElementName();
-		} else {
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	@Override
-	public boolean canBeLandmark(String handle) {
-		IJavaElement element = (IJavaElement) getObjectForHandle(handle);
-		if ((element instanceof IMember || element instanceof IType) && element.exists()) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * TODO: figure out if the non IJavaElement stuff is needed
-	 */
-	@Override
-	public boolean acceptsObject(Object object) {
-		if (object instanceof IResource) {
-			Object adapter = ((IResource) object).getAdapter(IJavaElement.class);
-			return adapter instanceof IJavaElement;
-		}
-
-		boolean accepts = object instanceof IJavaElement || object instanceof PackageFragmentRootContainer
-				|| object instanceof ClassPathContainer.RequiredProjectWrapper || object instanceof JarEntryFile
-				|| object instanceof IPackageFragment || object instanceof WorkingSet || isWtpClass(object);
-
-		return accepts;
-	}
-
-	/**
-	 * Uses special rules for classpath containers since these do not have an associated interest, i.e. they're not
-	 * IJavaElement(s).
-	 */
-	@Override
-	public boolean canFilter(Object object) {
-		if (object instanceof ClassPathContainer.RequiredProjectWrapper) {
-			return true;
-		} else if (object instanceof PackageFragmentRootContainer) {
-			// since not in model, check if it contains anything interesting
-			PackageFragmentRootContainer container = (PackageFragmentRootContainer) object;
-
-			Object[] children = container.getChildren();
-			for (Object element2 : children) {
-				if (element2 instanceof JarPackageFragmentRoot) {
-					JarPackageFragmentRoot element = (JarPackageFragmentRoot) element2;
-					IInteractionElement node = ContextCore.getContextManager()
-							.getElement(element.getHandleIdentifier());
-					if (node != null && node.getInterest().isInteresting()) {
-						return false;
-					}
-				}
-			}
-		} else if (object instanceof WorkingSet) {
-			try {
-				WorkingSet workingSet = (WorkingSet) object;
-				IAdaptable[] elements = workingSet.getElements();
-				for (IAdaptable adaptable : elements) {
-					IInteractionElement interactionElement = ContextCore.getContextManager().getElement(
-							getHandleIdentifier(adaptable));
-					if (interactionElement != null && interactionElement.getInterest().isInteresting()) {
-						return false;
-					}
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-				return false;
-			}
-		}
-		return true;
-	}
-
-	@Override
-	public boolean isDocument(String handle) {
-		IJavaElement element = (IJavaElement) getObjectForHandle(handle);
-		return element instanceof ICompilationUnit || element instanceof IClassFile;
-	}
-
-	@Override
-	public String getHandleForOffsetInObject(Object object, int offset) {
-		IMarker marker;
-		if (object instanceof ConcreteMarker) {
-			marker = ((ConcreteMarker) object).getMarker();
-		} else if (object instanceof Marker) {
-			marker = (Marker) object;
-		} else {
-			return null;
-		}
-
-		try {
-			ICompilationUnit compilationUnit = null;
-			IResource resource = marker.getResource();
-			if (resource instanceof IFile) {
-				IFile file = (IFile) resource;
-				// TODO: get rid of file extension check
-				if (file.getFileExtension().equals("java")) { //$NON-NLS-1$
-					compilationUnit = JavaCore.createCompilationUnitFrom(file);
-				} else {
-					return null;
-				}
-			}
-			if (compilationUnit != null) {
-				// first try to resolve the character start, then the line number if not present
-				int charStart = 0;
-				Object attribute = marker.getAttribute(IMarker.CHAR_START, 0);
-				if (attribute instanceof Integer) {
-					charStart = ((Integer) attribute).intValue();
-				}
-				IJavaElement javaElement = null;
-				if (charStart != -1) {
-					javaElement = compilationUnit.getElementAt(charStart);
-				} else {
-					int lineNumber = 0;
-					Object lineNumberAttribute = marker.getAttribute(IMarker.LINE_NUMBER, 0);
-					if (lineNumberAttribute instanceof Integer) {
-						lineNumber = ((Integer) lineNumberAttribute).intValue();
-					}
-					if (lineNumber != -1) {
-						// could do finer granularity by uncommenting what's below, see bug 132092
-//						Document document = new Document(compilationUnit.getSource());
-//						IRegion region = document.getLineInformation(lineNumber);
-//						javaElement = compilationUnit.getElementAt(region.getOffset());
-						javaElement = compilationUnit;
-					}
-				}
-
-				if (javaElement != null) {
-					if (javaElement instanceof IImportDeclaration) {
-						javaElement = javaElement.getParent().getParent();
-					}
-					return javaElement.getHandleIdentifier();
-				} else {
-					return null;
-				}
-			} else {
-				return null;
-			}
-		} catch (JavaModelException ex) {
-			if (!ex.isDoesNotExist()) {
-				ExceptionHandler.handle(ex, "error", "could not find java element"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			return null;
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN, "Could not find element for: " //$NON-NLS-1$
-					+ marker, t));
-			return null;
-		}
-	}
-
-	@Override
-	public String getContentType(String elementHandle) {
-		return getContentType();
-	}
-
-	/**
-	 * Some copying from:
-	 * 
-	 * @see org.eclipse.jdt.ui.ProblemsLabelDecorator
-	 */
-	public boolean containsProblem(IInteractionElement node) {
-		try {
-			IJavaElement element = (IJavaElement) getObjectForHandle(node.getHandleIdentifier());
-			switch (element.getElementType()) {
-			case IJavaElement.JAVA_PROJECT:
-			case IJavaElement.PACKAGE_FRAGMENT_ROOT:
-				return getErrorTicksFromMarkers(element.getResource(), IResource.DEPTH_INFINITE, null);
-			case IJavaElement.PACKAGE_FRAGMENT:
-			case IJavaElement.COMPILATION_UNIT:
-			case IJavaElement.CLASS_FILE:
-				return getErrorTicksFromMarkers(element.getResource(), IResource.DEPTH_ONE, null);
-			case IJavaElement.PACKAGE_DECLARATION:
-			case IJavaElement.IMPORT_DECLARATION:
-			case IJavaElement.IMPORT_CONTAINER:
-			case IJavaElement.TYPE:
-			case IJavaElement.INITIALIZER:
-			case IJavaElement.METHOD:
-			case IJavaElement.FIELD:
-			case IJavaElement.LOCAL_VARIABLE:
-				ICompilationUnit cu = (ICompilationUnit) element.getAncestor(IJavaElement.COMPILATION_UNIT);
-				if (cu != null) {
-					return getErrorTicksFromMarkers(element.getResource(), IResource.DEPTH_ONE, null);
-				}
-			}
-		} catch (CoreException e) {
-			// ignore
-		}
-		return false;
-	}
-
-	private boolean getErrorTicksFromMarkers(IResource res, int depth, ISourceReference sourceElement)
-			throws CoreException {
-		if (res == null || !res.isAccessible()) {
-			return false;
-		}
-		IMarker[] markers = res.findMarkers(IMarker.PROBLEM, true, depth);
-		if (markers != null) {
-			for (IMarker curr : markers) {
-				if (sourceElement == null) {
-					int priority = curr.getAttribute(IMarker.SEVERITY, -1);
-					if (priority == IMarker.SEVERITY_ERROR) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiBridge.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiBridge.java
deleted file mode 100644
index fb4d6ee..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiBridge.java
+++ /dev/null
@@ -1,152 +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
- *     Remy Chi Jian Suen - Bug 256071 Reduce/remove reflection usage in Java bridge
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.actions.SelectionConverter;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.Page;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * @author Mik Kersten
- */
-public class JavaUiBridge extends AbstractContextUiBridge {
-
-	@Override
-	public void open(IInteractionElement node) {
-		IJavaElement javaElement = JavaCore.create(node.getHandleIdentifier());
-		if (javaElement == null || !javaElement.exists()) {
-			return;
-		}
-		try {
-			IEditorPart part = JavaUI.openInEditor(javaElement);
-			JavaUI.revealInEditor(part, javaElement);
-		} catch (Throwable t) {
-			StatusHandler.fail(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN, "Could not open editor for: " //$NON-NLS-1$
-					+ node, t));
-		}
-	}
-
-	@Override
-	public void close(IInteractionElement node) {
-		try {
-			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			if (page != null) {
-				List<IEditorReference> toClose = new ArrayList<IEditorReference>(4);
-				for (IEditorReference reference : page.getEditorReferences()) {
-					try {
-						IJavaElement input = (IJavaElement) reference.getEditorInput().getAdapter(IJavaElement.class);
-						if (input != null && node.getHandleIdentifier().equals(input.getHandleIdentifier())) {
-							toClose.add(reference);
-						}
-					} catch (PartInitException e) {
-						// ignore
-					}
-				}
-				if (toClose.size() > 0) {
-					page.closeEditors(toClose.toArray(new IEditorReference[toClose.size()]), true);
-				}
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN, "Could not auto close editor", t)); //$NON-NLS-1$
-		}
-	}
-
-	@Override
-	public boolean acceptsEditor(IEditorPart editorPart) {
-		return editorPart instanceof JavaEditor;
-	}
-
-	@Override
-	public IInteractionElement getElement(IEditorInput input) {
-		Object adapter = input.getAdapter(IJavaElement.class);
-		if (adapter instanceof IJavaElement) {
-			IJavaElement javaElement = (IJavaElement) adapter;
-			String handle = ContextCore.getStructureBridge(javaElement).getHandleIdentifier(javaElement);
-			return ContextCore.getContextManager().getElement(handle);
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public List<TreeViewer> getContentOutlineViewers(IEditorPart editorPart) {
-		if (editorPart == null) {
-			return null;
-		}
-		List<TreeViewer> viewers = new ArrayList<TreeViewer>();
-		Object out = editorPart.getAdapter(IContentOutlinePage.class);
-		if (out instanceof Page) {
-			Page page = (Page) out;
-			if (page.getControl() != null) {
-				IWorkbenchSite site = page.getSite();
-				if (site != null) {
-					ISelectionProvider provider = site.getSelectionProvider();
-					if (provider instanceof TreeViewer) {
-						viewers.add((TreeViewer) provider);
-					}
-				}
-			}
-		}
-		return viewers;
-	}
-
-	@Override
-	public Object getObjectForTextSelection(TextSelection selection, IEditorPart editor) {
-		if (editor instanceof JavaEditor) {
-			TextSelection textSelection = selection;
-			try {
-				if (selection != null) {
-					return SelectionConverter.resolveEnclosingElement((JavaEditor) editor, textSelection);
-				} else {
-					Object element = ((JavaEditor) editor).getEditorInput().getAdapter(IJavaElement.class);
-					if (element instanceof IJavaElement) {
-						return element;
-					}
-				}
-			} catch (JavaModelException e) {
-				// ignore
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public String getContentType() {
-		return JavaStructureBridge.CONTENT_TYPE;
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiBridgePlugin.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiBridgePlugin.java
deleted file mode 100644
index bf8dbd1..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiBridgePlugin.java
+++ /dev/null
@@ -1,218 +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.java.ui;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.ui.IContextUiStartup;
-import org.eclipse.mylyn.internal.java.ui.editor.ActiveFoldingListener;
-import org.eclipse.mylyn.monitor.ui.MonitorUi;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.progress.UIJob;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class JavaUiBridgePlugin extends AbstractUIPlugin {
-
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.java.ui"; //$NON-NLS-1$
-
-	public static final String AUTO_FOLDING_ENABLED = "org.eclipse.mylyn.context.ui.editor.folding.enabled"; //$NON-NLS-1$
-
-	private static JavaUiBridgePlugin INSTANCE;
-
-	private ActiveFoldingEditorTracker editorTracker;
-
-	private TypeHistoryManager typeHistoryManager;
-
-	private LandmarkMarkerManager landmarkMarkerManager;
-
-	private JavaEditingMonitor javaEditingMonitor;
-
-	private InterestUpdateDeltaListener javaElementChangeListener;
-
-	private static final String MYLYN_PREVIOUS_RUN = "org.eclipse.mylyn.ui.first.run.0_4_9"; //$NON-NLS-1$
-
-	private static final String MYLYN_RUN_COUNT = "org.eclipse.mylyn.java.ui.run.count.3_1_0"; //$NON-NLS-1$
-
-	private static final String NUM_COMPUTERS_PREF_KEY = "content_assist_number_of_computers"; //$NON-NLS-1$
-
-	public JavaUiBridgePlugin() {
-	}
-
-	/**
-	 * Startup order is critical.
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		INSTANCE = this;
-
-		IPreferenceStore javaPrefs = JavaPlugin.getDefault().getPreferenceStore();
-		// NOTE: moved out of wizard and first task activation to avoid bug 194766
-		int count = getPreferenceStore().getInt(MYLYN_RUN_COUNT);
-		if (count < 1) {
-			getPreferenceStore().setValue(MYLYN_RUN_COUNT, count + 1);
-
-			// Mylyn 3.1 removes 2 computers, migrate JDT setting on first run to avoid prevent JDT from displaying a warning dialog 
-			if (count == 0 && getPreferenceStore().contains(MYLYN_PREVIOUS_RUN)) {
-				if (javaPrefs.contains(NUM_COMPUTERS_PREF_KEY)) {
-					int lastNumberOfComputers = javaPrefs.getInt(NUM_COMPUTERS_PREF_KEY);
-					if (lastNumberOfComputers > 0) {
-						javaPrefs.putValue(NUM_COMPUTERS_PREF_KEY, Integer.toString(lastNumberOfComputers - 2));
-					}
-				}
-			}
-
-			// try installing Task-Focused content assist twice
-			new UIJob("Initialize Content Assist") { //$NON-NLS-1$
-				@Override
-				public IStatus runInUIThread(IProgressMonitor monitor) {
-					IPreferenceStore store = JavaPlugin.getDefault().getPreferenceStore();
-					JavaUiUtil.installContentAssist(store, true);
-					return Status.OK_STATUS;
-				}
-			}.schedule();
-		}
-
-		// the Task-Focused category should be disabled if the user reverts to the default 
-		String defaultValue = javaPrefs.getDefaultString(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES);
-		javaPrefs.setDefault(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES, defaultValue
-				+ JavaUiUtil.ASSIST_MYLYN_ALL + JavaUiUtil.SEPARATOR_CODEASSIST);
-	}
-
-	private void lazyStart() {
-		landmarkMarkerManager = new LandmarkMarkerManager();
-		ContextCore.getContextManager().addListener(landmarkMarkerManager);
-
-		javaEditingMonitor = new JavaEditingMonitor();
-		MonitorUi.getSelectionMonitors().add(javaEditingMonitor);
-		installEditorTracker(PlatformUI.getWorkbench());
-
-		javaElementChangeListener = new InterestUpdateDeltaListener();
-		JavaCore.addElementChangedListener(javaElementChangeListener);
-
-		try {
-			typeHistoryManager = new TypeHistoryManager();
-			ContextCore.getContextManager().addListener(typeHistoryManager);
-		} catch (Throwable t) {
-			// FIXME review error message
-			StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-					"Could not install type history manager: incompatible Eclipse version", t)); //$NON-NLS-1$
-		}
-	}
-
-	private void lazyStop() {
-		if (typeHistoryManager != null) {
-			ContextCore.getContextManager().removeListener(typeHistoryManager);
-		}
-		if (landmarkMarkerManager != null) {
-			ContextCore.getContextManager().removeListener(landmarkMarkerManager);
-		}
-		if (javaEditingMonitor != null) {
-			MonitorUi.getSelectionMonitors().remove(javaEditingMonitor);
-		}
-		if (javaElementChangeListener != null) {
-			JavaCore.removeElementChangedListener(javaElementChangeListener);
-		}
-		// TODO: uninstall editor tracker
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		lazyStop();
-
-		super.stop(context);
-		INSTANCE = null;
-	}
-
-	private void installEditorTracker(IWorkbench workbench) {
-		editorTracker = new ActiveFoldingEditorTracker();
-		editorTracker.install(workbench);
-		// workbench.addWindowListener(editorTracker);
-		// IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
-		// for (int i = 0; i < windows.length; i++) {
-		// windows[i].addPageListener(editorTracker);
-		// IWorkbenchPage[] pages = windows[i].getPages();
-		// for (int j = 0; j < pages.length; j++) {
-		// pages[j].addPartListener(editorTracker);
-		// }
-		// }
-
-		// update editors that are already opened
-		for (IWorkbenchWindow w : PlatformUI.getWorkbench().getWorkbenchWindows()) {
-			IWorkbenchPage page = w.getActivePage();
-			if (page != null) {
-				IEditorReference[] references = page.getEditorReferences();
-				for (IEditorReference reference : references) {
-					IEditorPart part = reference.getEditor(false);
-					if (part != null && part instanceof JavaEditor) {
-						JavaEditor editor = (JavaEditor) part;
-						editorTracker.registerEditor(editor);
-						ActiveFoldingListener.resetProjection(editor);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static JavaUiBridgePlugin getDefault() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 * 
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(ID_PLUGIN, path);
-	}
-
-	/**
-	 * For testing.
-	 */
-	public ActiveFoldingEditorTracker getEditorTracker() {
-		return editorTracker;
-	}
-
-	public static class JavaUiBridgeStartup implements IContextUiStartup {
-
-		public void lazyStartup() {
-			JavaUiBridgePlugin.getDefault().lazyStart();
-		}
-
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiUtil.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiUtil.java
deleted file mode 100644
index 6a97e7c..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/JavaUiUtil.java
+++ /dev/null
@@ -1,107 +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.java.ui;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.java.CompletionProposalCategory;
-import org.eclipse.jdt.internal.ui.text.java.CompletionProposalComputerRegistry;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * @author Mik Kersten
- */
-public class JavaUiUtil {
-
-	static final String SEPARATOR_CODEASSIST = "\0"; //$NON-NLS-1$
-
-	public static final String ASSIST_MYLYN_ALL = "org.eclipse.mylyn.java.ui.javaAllProposalCategory"; //$NON-NLS-1$
-
-//	public static final String ASSIST_MYLYN_TYPE = "org.eclipse.mylyn.java.javaTypeProposalCategory"; //$NON-NLS-1$
-
-//	public static final String ASSIST_MYLYN_NOTYPE = "org.eclipse.mylyn.java.javaNoTypeProposalCategory"; //$NON-NLS-1$
-
-	public static final String ASSIST_JDT_ALL = "org.eclipse.jdt.ui.javaAllProposalCategory"; //$NON-NLS-1$
-
-	public static final String ASSIST_JDT_TYPE = "org.eclipse.jdt.ui.javaTypeProposalCategory"; //$NON-NLS-1$
-
-	public static final String ASSIST_JDT_NOTYPE = "org.eclipse.jdt.ui.javaNoTypeProposalCategory"; //$NON-NLS-1$
-
-	private static final String ASSIST_JDT_TEMPLATE = "org.eclipse.jdt.ui.templateProposalCategory"; //$NON-NLS-1$
-
-	public static boolean isDefaultAssistActive(String computerId) {
-		if (JavaUiUtil.ASSIST_JDT_ALL.equals(computerId)) {
-			CompletionProposalCategory category = getProposalCategory(computerId);
-			return (category != null) ? category.isEnabled() && category.isIncluded() : false;
-		}
-		Set<String> disabledIds = getDisabledIds(JavaPlugin.getDefault().getPreferenceStore());
-		return !disabledIds.contains(computerId);
-	}
-
-	public static CompletionProposalCategory getProposalCategory(String computerId) {
-		List<?> computers = CompletionProposalComputerRegistry.getDefault().getProposalCategories();
-		for (Object object : computers) {
-			CompletionProposalCategory proposalCategory = (CompletionProposalCategory) object;
-			if (computerId.equals((proposalCategory).getId())) {
-				return proposalCategory;
-			}
-		}
-		return null;
-	}
-
-	public static void installContentAssist(IPreferenceStore javaPrefs, boolean mylynContentAssist) {
-		Set<String> disabledIds = getDisabledIds(javaPrefs);
-		if (!mylynContentAssist) {
-			disabledIds.remove(ASSIST_JDT_ALL);
-			disabledIds.remove(ASSIST_JDT_TYPE);
-			disabledIds.remove(ASSIST_JDT_NOTYPE);
-			//disabledIds.remove(ASSIST_JDT_TEMPLATE);
-			disabledIds.add(ASSIST_MYLYN_ALL);
-			//disabledIds.add(ASSIST_MYLYN_TYPE);
-			//disabledIds.add(ASSIST_MYLYN_TEMPLATE);
-		} else {
-			disabledIds.add(ASSIST_JDT_ALL);
-			disabledIds.add(ASSIST_JDT_TYPE);
-			disabledIds.add(ASSIST_JDT_NOTYPE);
-			// re-enable, Mylyn versions <3.1 had a focused template computer that has been removed  
-			disabledIds.remove(ASSIST_JDT_TEMPLATE);
-			disabledIds.remove(ASSIST_MYLYN_ALL);
-			//disabledIds.remove(ASSIST_MYLYN_NOTYPE);
-			//disabledIds.remove(ASSIST_MYLYN_TYPE);
-			//disabledIds.remove(ASSIST_MYLYN_TEMPLATE);
-		}
-		StringBuilder sb = new StringBuilder();
-		for (String id : disabledIds) {
-			sb.append(id);
-			sb.append(SEPARATOR_CODEASSIST);
-		}
-		javaPrefs.setValue(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES, sb.toString());
-
-		CompletionProposalComputerRegistry.getDefault().reload();
-	}
-
-	public static Set<String> getDisabledIds(IPreferenceStore javaPrefs) {
-		String oldValue = javaPrefs.getString(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES);
-		StringTokenizer tokenizer = new StringTokenizer(oldValue, SEPARATOR_CODEASSIST);
-		Set<String> disabledIds = new HashSet<String>();
-		while (tokenizer.hasMoreTokens()) {
-			disabledIds.add((String) tokenizer.nextElement());
-		}
-		return disabledIds;
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/LandmarkMarkerManager.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/LandmarkMarkerManager.java
deleted file mode 100644
index 4d7a0eb..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/LandmarkMarkerManager.java
+++ /dev/null
@@ -1,174 +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.java.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-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.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.ISourceReference;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-
-/**
- * @author Mik Kersten
- */
-public class LandmarkMarkerManager extends AbstractContextListener {
-
-	private static final String ID_MARKER_LANDMARK = "org.eclipse.mylyn.context.ui.markers.landmark"; //$NON-NLS-1$
-
-	private final Map<IInteractionElement, Long> markerMap = new HashMap<IInteractionElement, Long>();
-
-	public LandmarkMarkerManager() {
-		super();
-	}
-
-	@Override
-	public void contextChanged(ContextChangeEvent event) {
-		switch (event.getEventKind()) {
-		case ACTIVATED:
-		case DEACTIVATED:
-			modelUpdated();
-			break;
-		case CLEARED:
-			if (event.isActiveContext()) {
-				modelUpdated();
-			}
-			break;
-		case LANDMARKS_ADDED:
-			for (IInteractionElement element : event.getElements()) {
-				addLandmarkMarker(element);
-			}
-			break;
-		case LANDMARKS_REMOVED:
-			for (IInteractionElement element : event.getElements()) {
-				removeLandmarkMarker(element);
-			}
-			break;
-
-		}
-	}
-
-	private void modelUpdated() {
-		try {
-			for (IInteractionElement node : markerMap.keySet()) {
-				removeLandmarkMarker(node);
-			}
-			markerMap.clear();
-			for (IInteractionElement node : ContextCore.getContextManager().getActiveLandmarks()) {
-				addLandmarkMarker(node);
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-					"Could not update landmark markers", t)); //$NON-NLS-1$
-		}
-	}
-
-	public void addLandmarkMarker(final IInteractionElement node) {
-		if (node == null || node.getContentType() == null) {
-			return;
-		}
-		if (node.getContentType().equals(JavaStructureBridge.CONTENT_TYPE)) {
-			final IJavaElement element = JavaCore.create(node.getHandleIdentifier());
-			if (!element.exists()) {
-				return;
-			}
-			if (element instanceof IMember) {
-				try {
-					final ISourceRange range = ((IMember) element).getNameRange();
-					final IResource resource = element.getUnderlyingResource();
-					if (resource instanceof IFile) {
-						IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-							public void run(IProgressMonitor monitor) throws CoreException {
-								IMarker marker = resource.createMarker(ID_MARKER_LANDMARK);
-								if (marker != null && range != null) {
-									marker.setAttribute(IMarker.CHAR_START, range.getOffset());
-									marker.setAttribute(IMarker.CHAR_END, range.getOffset() + range.getLength());
-									marker.setAttribute(IMarker.MESSAGE, "Mylyn Landmark"); //$NON-NLS-1$
-									marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
-									markerMap.put(node, marker.getId());
-								}
-							}
-						};
-						resource.getWorkspace().run(runnable, null);
-					}
-				} catch (JavaModelException e) {
-					StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-							"Could not update marker", e)); //$NON-NLS-1$
-				} catch (CoreException e) {
-					StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-							"Could not update marker", e)); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	public void removeLandmarkMarker(final IInteractionElement node) {
-		if (node == null) {
-			return;
-		}
-		if (node.getContentType().equals(JavaStructureBridge.CONTENT_TYPE)) {
-			IJavaElement element = JavaCore.create(node.getHandleIdentifier());
-			if (!element.exists()) {
-				return;
-			}
-			if (element.getAncestor(IJavaElement.COMPILATION_UNIT) != null // stuff
-					// from .class files
-					&& element instanceof ISourceReference) {
-				try {
-					final IResource resource = element.getUnderlyingResource();
-					IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-						public void run(IProgressMonitor monitor) throws CoreException {
-							if (resource != null) {
-								try {
-									if (markerMap.containsKey(node)) {
-										long id = markerMap.get(node);
-										IMarker marker = resource.getMarker(id);
-										if (marker != null) {
-											marker.delete();
-										}
-									}
-								} catch (NullPointerException e) {
-									// FIXME avoid NPE
-									StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-											"Could not update marker", e)); //$NON-NLS-1$
-								}
-							}
-						}
-					};
-					resource.getWorkspace().run(runnable, null);
-				} catch (JavaModelException e) {
-					// ignore the Java Model errors
-				} catch (CoreException e) {
-					StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-							"Could not update landmark marker", e)); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/TypeHistoryManager.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/TypeHistoryManager.java
deleted file mode 100644
index 9d73757..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/TypeHistoryManager.java
+++ /dev/null
@@ -1,110 +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.java.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.TypeNameMatch;
-import org.eclipse.jdt.internal.core.search.JavaSearchTypeNameMatch;
-import org.eclipse.jdt.internal.corext.util.OpenTypeHistory;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- */
-public class TypeHistoryManager extends AbstractContextListener {
-
-	@Override
-	public void contextChanged(ContextChangeEvent event) {
-		switch (event.getEventKind()) {
-		case ACTIVATED:
-			clearTypeHistory();
-			for (IInteractionElement node : event.getContext().getInteresting()) {
-				updateTypeHistory(node, true);
-			}
-			break;
-		case DEACTIVATED:
-			clearTypeHistory();
-			break;
-		case CLEARED:
-			if (event.isActiveContext()) {
-				clearTypeHistory();
-			}
-			break;
-		case INTEREST_CHANGED:
-			for (IInteractionElement node : event.getElements()) {
-				updateTypeHistory(node, true);
-			}
-			break;
-		case ELEMENTS_DELETED:
-			for (IInteractionElement element : event.getElements()) {
-				updateTypeHistory(element, false);
-			}
-			break;
-		}
-	}
-
-	/**
-	 * Path has to be compatible with ITypeNameRequestor
-	 */
-	private void updateTypeHistory(IInteractionElement node, boolean add) {
-		IJavaElement element = JavaCore.create(node.getHandleIdentifier());
-		if (element instanceof IType) {
-			IType type = (IType) element;
-			try {
-				if (type.exists() && !type.isAnonymous() && !isAspectjType(type)) {
-					JavaSearchTypeNameMatch typeNameMatch = new JavaSearchTypeNameMatch(type, type.getFlags());
-
-					if (add && !OpenTypeHistory.getInstance().contains(typeNameMatch)) {
-						OpenTypeHistory.getInstance().accessed(typeNameMatch);
-					} else {
-						OpenTypeHistory.getInstance().remove(typeNameMatch);
-					}
-				}
-			} catch (JavaModelException e) {
-				StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-						"Failed to update history for a type", e)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * HACK: to avoid adding AspectJ types, for example:
-	 * 
-	 * class: =TJP Example/src<tjp{Demo.java[Demo aspect: =TJP Example/src<tjp*GetInfo.aj}GetInfo
-	 */
-	private boolean isAspectjType(IType type) {
-		if (type.getHandleIdentifier().indexOf('}') != -1) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Public for testing
-	 */
-	public void clearTypeHistory() {
-		TypeNameMatch[] typeInfos = OpenTypeHistory.getInstance().getTypeInfos();
-		for (TypeNameMatch typeInfo : typeInfos) {
-			OpenTypeHistory.getInstance().remove(typeInfo);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FilterMembersAction.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FilterMembersAction.java
deleted file mode 100644
index b8be66e..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FilterMembersAction.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.java.ui.actions;
-
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.mylyn.internal.java.ui.JavaDeclarationsFilter;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-
-/**
- * @author Mik Kersten
- */
-public class FilterMembersAction extends Action implements IViewActionDelegate {
-
-	public static final String PREF_ID = "org.eclipse.mylyn.java.ui.explorer.filter.members"; //$NON-NLS-1$
-
-	public FilterMembersAction() {
-		super();
-		// setChecked(true);
-		// try {
-		// boolean checked=
-		// ContextCore.getPreferenceStore().getBoolean(PREF_ID);
-		// valueChanged(true, true);
-		// } catch (Exception e) {
-		//            
-		// }
-	}
-
-	public void run(IAction action) {
-		valueChanged(isChecked(), true);
-
-	}
-
-	private void valueChanged(final boolean on, boolean store) {
-		if (store) {
-			JavaUiBridgePlugin.getDefault().getPreferenceStore().setValue(PREF_ID, on);
-		}
-
-		setChecked(true);
-		PackageExplorerPart packageExplorer = PackageExplorerPart.getFromActivePerspective();
-		ViewerFilter existingFilter = null;
-		for (int i = 0; i < packageExplorer.getTreeViewer().getFilters().length; i++) {
-			ViewerFilter filter = packageExplorer.getTreeViewer().getFilters()[i];
-			if (filter instanceof JavaDeclarationsFilter) {
-				existingFilter = filter;
-			}
-		}
-		if (existingFilter != null) {
-			packageExplorer.getTreeViewer().removeFilter(existingFilter);
-		} else {
-			packageExplorer.getTreeViewer().addFilter(new JavaDeclarationsFilter());
-		}
-	}
-
-	public void init(IViewPart view) {
-		// don't need to do anything on init
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// don't care when the selection changes
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBreakpointsViewAction.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBreakpointsViewAction.java
deleted file mode 100644
index 68e20be..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBreakpointsViewAction.java
+++ /dev/null
@@ -1,44 +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.java.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsView;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.mylyn.ide.ui.AbstractFocusMarkerViewAction;
-import org.eclipse.mylyn.internal.java.ui.BreakpointsInterestFilter;
-import org.eclipse.ui.IViewPart;
-
-/**
- * @author Mik Kersten
- */
-public class FocusBreakpointsViewAction extends AbstractFocusMarkerViewAction {
-
-	public FocusBreakpointsViewAction() {
-		super(new BreakpointsInterestFilter(), true, true, false);
-	}
-
-	@Override
-	public final List<StructuredViewer> getViewers() {
-		List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-		IViewPart viewPart = super.getPartForAction();
-		if (viewPart instanceof BreakpointsView) {
-			BreakpointsView view = (BreakpointsView) viewPart;
-			updateMarkerViewLabelProvider(view.getCheckboxViewer());
-			viewers.add(view.getCheckboxViewer());
-		}
-		return viewers;
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBrowsingPerspectiveAction.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBrowsingPerspectiveAction.java
deleted file mode 100644
index 7ed228f..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusBrowsingPerspectiveAction.java
+++ /dev/null
@@ -1,108 +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
- *     Remy Chi Jian Suen - Bug 256071 Reduce/remove reflection usage in Java bridge
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * This class is a bit weird since it doesn't obey the same contract as the other subclasses
- * 
- * @author Shawn Minto
- * @author Mik Kersten
- */
-public class FocusBrowsingPerspectiveAction extends AbstractFocusViewAction implements IWorkbenchWindowActionDelegate {
-
-	private final String[] viewNames = { "org.eclipse.jdt.ui.MembersView", "org.eclipse.jdt.ui.PackagesView", //$NON-NLS-1$ //$NON-NLS-2$
-			"org.eclipse.jdt.ui.TypesView" }; //$NON-NLS-1$
-
-	private final String[] classNames = { "org.eclipse.jdt.internal.ui.browsing.MembersView", //$NON-NLS-1$
-			"org.eclipse.jdt.internal.ui.browsing.PackagesView", "org.eclipse.jdt.internal.ui.browsing.TypesView" }; //$NON-NLS-1$ //$NON-NLS-2$
-
-	private IWorkbenchWindow initWindow;
-
-	public FocusBrowsingPerspectiveAction() {
-		super(new InterestFilter(), true, true, false);
-		globalPrefId = PREF_ID_PREFIX + "javaBrowsing"; //$NON-NLS-1$
-	}
-
-	public void init(IWorkbenchWindow window) {
-		initWindow = window;
-		IWorkbenchPage activePage = initWindow.getActivePage();
-		super.viewPart = activePage.findView(viewNames[0]);
-	}
-
-	@Override
-	public List<StructuredViewer> getViewers() {
-		List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-		for (int i = 0; i < viewNames.length; i++) {
-			StructuredViewer viewer = getBrowsingViewerFromActivePerspective(viewNames[i], classNames[i]);
-			if (viewer != null) {
-				viewers.add(viewer);
-			}
-		}
-		return viewers;
-	}
-
-	private StructuredViewer getBrowsingViewerFromActivePerspective(String id, String className) {
-		IWorkbenchPage activePage = initWindow.getActivePage();
-		if (activePage == null) {
-			return null;
-		}
-		try {
-			IViewPart viewPart = activePage.findView(id);
-			if (viewPart == null) {
-				// view is not open, just return null
-				return null;
-			}
-
-			IWorkbenchPartSite site = viewPart.getSite();
-			if (site == null) {
-				// no site found, view still being initialized, return null
-				return null;
-			}
-
-			ISelectionProvider provider = site.getSelectionProvider();
-			if (!(provider instanceof StructuredViewer)) {
-				// provider not a StructuredViewer, return null
-				return null;
-			}
-
-			return (StructuredViewer) provider;
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN, "Could not get \"" + id //$NON-NLS-1$
-					+ "\" view tree viewer", e)); //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	public void propertyChange(PropertyChangeEvent event) {
-		// TODO Auto-generated method stub
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusDebugViewAction.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusDebugViewAction.java
deleted file mode 100644
index 235b4fc..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusDebugViewAction.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.java.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.internal.ui.views.launch.LaunchView;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.ui.IViewPart;
-
-/**
- * @author Mik Kersten
- */
-public class FocusDebugViewAction extends AbstractFocusViewAction {
-
-	public FocusDebugViewAction() {
-		super(new InterestFilter(), true, true, false);
-	}
-
-	@Override
-	public List<StructuredViewer> getViewers() {
-		List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-		IViewPart view = super.getPartForAction();
-		if (view instanceof LaunchView) {
-			LaunchView launchView = (LaunchView) view;
-			viewers.add((StructuredViewer) launchView.getViewer());
-		}
-		return viewers;
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusPackageExplorerAction.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusPackageExplorerAction.java
deleted file mode 100644
index abf1f93..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/FocusPackageExplorerAction.java
+++ /dev/null
@@ -1,163 +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.java.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.internal.ui.actions.SelectionConverter;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jdt.internal.ui.packageview.ToggleLinkingAction;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.mylyn.context.ui.AbstractAutoFocusViewAction;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.mylyn.internal.java.ui.JavaDeclarationsFilter;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-
-/**
- * @author Mik Kersten
- */
-public class FocusPackageExplorerAction extends AbstractAutoFocusViewAction {
-
-	public FocusPackageExplorerAction() {
-		super(new InterestFilter(), true, true, true);
-	}
-
-	@Override
-	protected ISelection resolveSelection(IEditorPart part, ITextSelection changedSelection, StructuredViewer viewer)
-			throws CoreException {
-		Object elementToSelect = null;
-		if (changedSelection instanceof TextSelection && part instanceof JavaEditor) {
-			TextSelection textSelection = (TextSelection) changedSelection;
-			IJavaElement javaElement = SelectionConverter.resolveEnclosingElement((JavaEditor) part, textSelection);
-			if (javaElement != null) {
-				elementToSelect = javaElement;
-			}
-		}
-
-		if (elementToSelect != null) {
-			StructuredSelection currentSelection = (StructuredSelection) viewer.getSelection();
-			if (currentSelection.size() <= 1) {
-				if (elementToSelect instanceof IMember) {
-					if (viewer.getContentProvider() instanceof StandardJavaElementContentProvider) {
-						if (!((StandardJavaElementContentProvider) viewer.getContentProvider()).getProvideMembers()) {
-							elementToSelect = ((IMember) elementToSelect).getCompilationUnit();
-							return new StructuredSelection(elementToSelect);
-						}
-					}
-
-					for (ViewerFilter filter : Arrays.asList(viewer.getFilters())) {
-						if (filter instanceof JavaDeclarationsFilter) {
-							elementToSelect = ((IMember) elementToSelect).getCompilationUnit();
-							return new StructuredSelection(elementToSelect);
-						}
-					}
-				}
-			}
-			return new StructuredSelection(elementToSelect);
-		} else {
-			return null;
-		}
-	}
-
-	// TODO: should have better way of doing this
-	@Override
-	protected void setManualFilteringAndLinkingEnabled(boolean enabled) {
-		IViewPart part = super.getPartForAction();
-		if (part instanceof PackageExplorerPart) {
-			for (IContributionItem item : ((PackageExplorerPart) part).getViewSite()
-					.getActionBars()
-					.getToolBarManager()
-					.getItems()) {
-				if (item instanceof ActionContributionItem) {
-					ActionContributionItem actionItem = (ActionContributionItem) item;
-					if (actionItem.getAction() instanceof ToggleLinkingAction) {
-						actionItem.getAction().setEnabled(enabled);
-					}
-				}
-			}
-			for (IContributionItem item : ((PackageExplorerPart) part).getViewSite()
-					.getActionBars()
-					.getMenuManager()
-					.getItems()) {
-				if (item instanceof ActionContributionItem) {
-					ActionContributionItem actionItem = (ActionContributionItem) item;
-					// TODO: file bug asking for extensibility
-					if (actionItem.getAction().getClass().getSimpleName().equals("ShowFilterDialogAction")) { //$NON-NLS-1$
-						actionItem.getAction().setEnabled(enabled);
-					}
-				}
-				// NOTE: turning off dynamically contributed filter items is not currently feasible
-//				else if (item instanceof ContributionItem) {
-//					ContributionItem contributionItem = (ContributionItem) item;
-//					
-//					if (contributionItem.getClass().getSimpleName().equals("FilterActionMenuContributionItem")) {
-//						try {
-//							Class<?> clazz = contributionItem.getClass();
-//							Field field = clazz.getDeclaredField("fActionGroup");
-//							field.setAccessible(true);
-//							Object object = field.get(contributionItem);
-//							if (object instanceof CustomFiltersActionGroup) {
-//								CustomFiltersActionGroup group = (CustomFiltersActionGroup) object;
-//								group.setFilters(new String[] { });
-//							}
-//						} catch (Exception e) {
-//							e.printStackTrace();
-//						}
-//					}
-//				}
-			}
-		}
-	}
-
-	@Override
-	protected void setDefaultLinkingEnabled(boolean on) {
-		IViewPart part = super.getPartForAction();
-		if (part instanceof PackageExplorerPart) {
-			((PackageExplorerPart) part).setLinkingEnabled(on);
-		}
-	}
-
-	@Override
-	protected boolean isDefaultLinkingEnabled() {
-		IViewPart part = super.getPartForAction();
-		if (part instanceof PackageExplorerPart) {
-			return ((PackageExplorerPart) part).isLinkingEnabled();
-		}
-		return false;
-	}
-
-	@Override
-	public List<StructuredViewer> getViewers() {
-		List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
-		// TODO: get from super
-		IViewPart part = super.getPartForAction();
-		if (part instanceof PackageExplorerPart) {
-			viewers.add(((PackageExplorerPart) part).getTreeViewer());
-		}
-		return viewers;
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/Messages.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/Messages.java
deleted file mode 100644
index 8bf91a5..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/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.java.ui.actions;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.java.ui.actions.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 ToggleActiveFoldingAction_Active_folding;
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/ShowFilteredChildrenAction.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/ShowFilteredChildrenAction.java
deleted file mode 100644
index 686b2b1..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/ShowFilteredChildrenAction.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.ui.actions;
-
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.internal.context.ui.BrowseFilteredListener;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-@Deprecated
-public class ShowFilteredChildrenAction extends Action implements IObjectActionDelegate, IViewActionDelegate {
-
-	private BrowseFilteredListener browseFilteredListener;
-
-	private TreeViewer treeViewer;
-
-	private IStructuredSelection selection;
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		if (targetPart instanceof PackageExplorerPart) {
-			treeViewer = ((PackageExplorerPart) targetPart).getTreeViewer();
-			browseFilteredListener = new BrowseFilteredListener(treeViewer);
-		}
-	}
-
-	public void init(IViewPart targetPart) {
-		if (targetPart instanceof PackageExplorerPart) {
-			treeViewer = ((PackageExplorerPart) targetPart).getTreeViewer();
-			browseFilteredListener = new BrowseFilteredListener(treeViewer);
-		}
-	}
-
-	public void run(IAction action) {
-		if (selection != null) {
-			browseFilteredListener.unfilterSelection(treeViewer, selection);
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			this.selection = (IStructuredSelection) selection;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/ToggleActiveFoldingAction.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/ToggleActiveFoldingAction.java
deleted file mode 100644
index 2a73499..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/ToggleActiveFoldingAction.java
+++ /dev/null
@@ -1,94 +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.java.ui.actions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * @author Mik Kersten
- */
-public class ToggleActiveFoldingAction extends Action implements IWorkbenchWindowActionDelegate, IActionDelegate2 {
-
-	private static ToggleActiveFoldingAction INSTANCE;
-
-	private IAction parentAction = null;
-
-	public ToggleActiveFoldingAction() {
-		super();
-		INSTANCE = this;
-		setText(Messages.ToggleActiveFoldingAction_Active_folding);
-		setImageDescriptor(TasksUiImages.CONTEXT_FOCUS);
-	}
-
-	public static void toggleFolding(boolean on) {
-		if (INSTANCE.parentAction != null) {
-			INSTANCE.valueChanged(INSTANCE.parentAction, on);
-		}
-	}
-
-	public void run(IAction action) {
-		valueChanged(action, action.isChecked());
-	}
-
-	private void valueChanged(IAction action, final boolean on) {
-		try {
-			if (on) {
-				JavaPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.EDITOR_FOLDING_ENABLED, true);
-			}
-			action.setChecked(on);
-			JavaUiBridgePlugin.getDefault().getPreferenceStore().setValue(JavaUiBridgePlugin.AUTO_FOLDING_ENABLED, on);
-		} catch (Throwable t) {
-			StatusHandler.fail(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-					"Could not enable editor management", t)); //$NON-NLS-1$
-		}
-	}
-
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		// don't care when the active editor changes
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// don't care when the selection changes
-	}
-
-	public void init(IAction action) {
-		this.parentAction = action;
-		valueChanged(action, JavaUiBridgePlugin.getDefault().getPreferenceStore().getBoolean(
-				JavaUiBridgePlugin.AUTO_FOLDING_ENABLED));
-	}
-
-	public void dispose() {
-		// don't need to do anything
-
-	}
-
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-
-	public void init(IWorkbenchWindow window) {
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/messages.properties b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/messages.properties
deleted file mode 100644
index 9d1daaa..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/actions/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-ToggleActiveFoldingAction_Active_folding=Active folding
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/AbstractEditorHyperlinkDetector.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/AbstractEditorHyperlinkDetector.java
deleted file mode 100644
index a27d428..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/AbstractEditorHyperlinkDetector.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.ui.editor;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * @author Mik Kersten
- */
-public abstract class AbstractEditorHyperlinkDetector implements IHyperlinkDetector {
-
-	private ITextEditor editor;
-
-	public abstract IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region,
-			boolean canShowMultipleHyperlinks);
-
-	public ITextEditor getEditor() {
-		return editor;
-	}
-
-	public void setEditor(ITextEditor editor) {
-		this.editor = editor;
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/ActiveFoldingListener.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/ActiveFoldingListener.java
deleted file mode 100644
index 05335c8..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/ActiveFoldingListener.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.ui.editor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IParent;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.text.folding.IJavaFoldingStructureProvider;
-import org.eclipse.jdt.ui.text.folding.IJavaFoldingStructureProviderExtension;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.ContextChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-
-/**
- * @author Mik Kersten
- */
-public class ActiveFoldingListener extends AbstractContextListener {
-
-	private final JavaEditor editor;
-
-	private IJavaFoldingStructureProviderExtension updater;
-
-	private static JavaStructureBridge bridge = (JavaStructureBridge) ContextCore.getStructureBridge(JavaStructureBridge.CONTENT_TYPE);
-
-	private boolean enabled = false;
-
-	private final IPropertyChangeListener PREFERENCE_LISTENER = new IPropertyChangeListener() {
-		public void propertyChange(PropertyChangeEvent event) {
-			if (event.getProperty().equals(JavaUiBridgePlugin.AUTO_FOLDING_ENABLED)) {
-				if (event.getNewValue().equals(Boolean.TRUE.toString())) {
-					enabled = true;
-				} else {
-					enabled = false;
-				}
-				updateFolding();
-			}
-		}
-	};
-
-	public ActiveFoldingListener(JavaEditor editor) {
-		this.editor = editor;
-		ContextCore.getContextManager().addListener(this);
-		JavaUiBridgePlugin.getDefault().getPluginPreferences().addPropertyChangeListener(PREFERENCE_LISTENER);
-
-		enabled = JavaUiBridgePlugin.getDefault().getPreferenceStore().getBoolean(
-				JavaUiBridgePlugin.AUTO_FOLDING_ENABLED);
-		try {
-			Object adapter = editor.getAdapter(IJavaFoldingStructureProvider.class);
-			if (adapter instanceof IJavaFoldingStructureProviderExtension) {
-				updater = (IJavaFoldingStructureProviderExtension) adapter;
-			} else {
-				StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-						"Could not install active folding on provider: " + adapter + ", must extend " //$NON-NLS-1$ //$NON-NLS-2$
-								+ IJavaFoldingStructureProviderExtension.class.getName()));
-			}
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-					"Could not install auto folding, reflection denied", e)); //$NON-NLS-1$
-		}
-		updateFolding();
-	}
-
-	public void dispose() {
-		ContextCore.getContextManager().removeListener(this);
-		JavaUiBridgePlugin.getDefault().getPluginPreferences().removePropertyChangeListener(PREFERENCE_LISTENER);
-	}
-
-	public static void resetProjection(JavaEditor javaEditor) {
-		// XXX 3.3 remove?
-	}
-
-	public void updateFolding() {
-		if (!enabled || !ContextCore.getContextManager().isContextActive()) {
-			editor.resetProjection();
-		} else if (editor.getEditorInput() == null) {
-			return;
-		} else {
-			try {
-				List<IJavaElement> toExpand = new ArrayList<IJavaElement>();
-				List<IJavaElement> toCollapse = new ArrayList<IJavaElement>();
-
-				IJavaElement element = JavaUI.getEditorInputJavaElement(editor.getEditorInput());
-				if (element instanceof ICompilationUnit) {
-					ICompilationUnit compilationUnit = (ICompilationUnit) element;
-					List<IJavaElement> allChildren = getAllChildren(compilationUnit);
-					for (IJavaElement child : allChildren) {
-						IInteractionElement interactionElement = ContextCore.getContextManager().getElement(
-								bridge.getHandleIdentifier(child));
-						if (interactionElement != null && interactionElement.getInterest().isInteresting()) {
-							toExpand.add(child);
-						} else {
-							toCollapse.add(child);
-						}
-					}
-				}
-				if (updater != null) {
-					updater.collapseComments();
-					updater.collapseMembers();
-					updater.expandElements(toExpand.toArray(new IJavaElement[toExpand.size()]));
-				}
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN, "Could not update folding", e)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	private static List<IJavaElement> getAllChildren(IParent parentElement) {
-		List<IJavaElement> allChildren = new ArrayList<IJavaElement>();
-		try {
-			for (IJavaElement child : parentElement.getChildren()) {
-				allChildren.add(child);
-				if (child instanceof IParent) {
-					allChildren.addAll(getAllChildren((IParent) child));
-				}
-			}
-		} catch (JavaModelException e) {
-			// ignore failures
-		}
-		return allChildren;
-	}
-
-	public void updateFolding(List<IInteractionElement> elements) {
-		for (IInteractionElement element : elements) {
-			if (updater == null || !enabled) {
-				return;
-			} else {
-				Object object = bridge.getObjectForHandle(element.getHandleIdentifier());
-				if (object instanceof IMember) {
-					IMember member = (IMember) object;
-					if (element.getInterest().isInteresting()) {
-						updater.expandElements(new IJavaElement[] { member });
-						// expand the next 2 children down (e.g. anonymous types)
-						try {
-							IJavaElement[] children = ((IParent) member).getChildren();
-							if (children.length == 1) {
-								updater.expandElements(new IJavaElement[] { children[0] });
-								if (children[0] instanceof IParent) {
-									IJavaElement[] childsChildren = ((IParent) children[0]).getChildren();
-									if (childsChildren.length == 1) {
-										updater.expandElements(new IJavaElement[] { childsChildren[0] });
-									}
-								}
-							}
-						} catch (JavaModelException e) {
-							// ignore
-						}
-					} else {
-						updater.collapseElements(new IJavaElement[] { member });
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public void contextChanged(ContextChangeEvent event) {
-		switch (event.getEventKind()) {
-		case ACTIVATED:
-		case DEACTIVATED:
-			if (JavaUiBridgePlugin.getDefault()
-					.getPreferenceStore()
-					.getBoolean(JavaUiBridgePlugin.AUTO_FOLDING_ENABLED)) {
-				updateFolding();
-			}
-			break;
-		case CLEARED:
-			if (event.isActiveContext()) {
-				if (JavaUiBridgePlugin.getDefault().getPreferenceStore().getBoolean(
-						JavaUiBridgePlugin.AUTO_FOLDING_ENABLED)) {
-					updateFolding();
-				}
-			}
-			break;
-		case INTEREST_CHANGED:
-			updateFolding(event.getElements());
-			break;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/AutoFoldPreferenceBlock.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/AutoFoldPreferenceBlock.java
deleted file mode 100644
index 2385d48..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/AutoFoldPreferenceBlock.java
+++ /dev/null
@@ -1,146 +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.java.ui.editor;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.ui.text.folding.IJavaFoldingPreferenceBlock;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * @author Mik Kersten
- */
-public class AutoFoldPreferenceBlock implements IJavaFoldingPreferenceBlock {
-
-	// XXX never read
-	// private IPreferenceStore preferences;
-	// private Map checkBoxes = new HashMap();
-	// private Text minimumLines;
-
-	public AutoFoldPreferenceBlock() {
-		// preferences = ContextCore.getPreferenceStore(); XXX
-		// never used
-	}
-
-	public Control createControl(Composite parent) {
-		try {
-			Composite inner = new Composite(parent, SWT.NONE);
-			GridLayout layout = new GridLayout(1, true);
-			layout.verticalSpacing = 3;
-			layout.marginWidth = 0;
-			inner.setLayout(layout);
-
-			Label label = new Label(inner, SWT.LEFT);
-			label.setText(Messages.AutoFoldPreferenceBlock_Elements_of_low_interest_will_be_automatically_folded);
-
-			// Label label= new Label(inner, SWT.LEFT);
-			// label.setText( "collapse.title"); //$NON-NLS-1$
-
-			// addCheckBox(inner, "collapse.header", "collapse.header", 0);
-			// //$NON-NLS-1$
-			// addCheckBox(inner, "collapse.imports",
-			// FoldingKeys.COLLAPSE_IMPORTS, 0); //$NON-NLS-1$
-			// addCheckBox(inner, "collapse.inner_type",
-			// FoldingKeys.COLLAPSE_INNER_TYPES, 0); //$NON-NLS-1$
-			// addCheckBox(inner, "collapse.static_initializers",
-			// FoldingKeys.COLLAPSE_STATICS, 0); //$NON-NLS-1$
-			//				
-			// addCheckBox(inner, "collapse.comment_blocks",
-			// FoldingKeys.COLLAPSE_COMMENT_BLOCKS, 0); //$NON-NLS-1$
-			// addCheckBox(inner, "collapse.javadocs",
-			// FoldingKeys.COLLAPSE_JAVADOCS, 0); //$NON-NLS-1$
-
-			// Label label2 = new Label(inner, SWT.LEFT);
-			// label2.setText( "minSize.title");
-			//		
-			// minimumLines = new Text(inner, SWT.BORDER | SWT.SINGLE);
-			// GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-			// gd.horizontalSpan= 1;
-			// gd.grabExcessVerticalSpace= false;
-			// minimumLines.setLayoutData(gd);
-
-			return inner;
-		} catch (Throwable t) {
-			StatusHandler.fail(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-					"Could not create folding preferences page", t)); //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.text.folding.IJavaFoldingPreferenceBlock#initialize()
-	 */
-	public void initialize() {
-
-		// Iterator it= checkBoxes.keySet().iterator();
-		// while (it.hasNext()) {
-		// Button b= (Button) it.next();
-		// String key= (String) checkBoxes.get(b);
-		// b.setSelection(preferences.getBoolean(key));
-		// }
-
-		// minimumLines.setText(String.valueOf(preferences.getInt(FoldingKeys.MINIMUM_SIZE)));
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.text.folding.IJavaFoldingPreferenceBlock#performOk()
-	 */
-	public void performOk() {
-		// Iterator it = checkBoxes.keySet().iterator();
-		// while(it.hasNext()) {
-		// Button b = (Button) it.next();
-		// String key = (String) checkBoxes.get(b);
-		// preferences.setValue(key, b.getSelection());
-		// }
-		//		
-		// int minLines = Integer.parseInt(minimumLines.getText());
-		// preferences.setValue(FoldingKeys.MINIMUM_SIZE, minLines);
-
-	}
-
-	// private Button addCheckBox(Composite parent, String label, String key,
-	// int indentation) {
-	// Button checkBox= new Button(parent, SWT.CHECK);
-	// checkBox.setText(label);
-	//		
-	// GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-	// gd.horizontalIndent= indentation;
-	// gd.horizontalSpan= 1;
-	// gd.grabExcessVerticalSpace= false;
-	// checkBox.setLayoutData(gd);
-	//				
-	// checkBoxes.put(checkBox, key);
-	//		
-	// return checkBox;
-	// }
-
-	public void performDefaults() {
-		initialize();
-	}
-
-	public void dispose() {
-		// don't care if we are disposed
-
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaAllProposalComputer.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaAllProposalComputer.java
deleted file mode 100644
index ee0cbf9..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaAllProposalComputer.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 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
- *     Tasktop Technologies - changes for bug 219692
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.ui.editor;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.CompletionProposal;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner;
-import org.eclipse.jdt.internal.ui.text.Symbols;
-import org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposalComputer;
-import org.eclipse.jdt.ui.text.java.CompletionProposalCollector;
-import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
-import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.mylyn.internal.java.ui.JavaUiUtil;
-
-/**
- * Based on org.eclipse.jdt.internal.ui.text.java.JavaAllCompletionProposalComputer.
- * 
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-// TODO e3.5 extend org.eclipse.jdt.internal.ui.text.java.JavaAllCompletionProposalComputer
-public class FocusedJavaAllProposalComputer extends JavaCompletionProposalComputer {
-
-	/**
-	 * @see CompletionProposal#METHOD_REF_WITH_CASTED_RECEIVER
-	 */
-	// TODO e3.4 replace by CompletionProposal.METHOD_REF_WITH_CASTED_RECEIVER
-	public static final int METHOD_REF_WITH_CASTED_RECEIVER = 24;
-
-	/**
-	 * @see CompletionProposal#METHOD_REF_WITH_CASTED_RECEIVER
-	 */
-	// TODO e3.4 replace by CompletionProposal.METHOD_REF_WITH_CASTED_RECEIVER
-	public static final int FIELD_REF_WITH_CASTED_RECEIVER = 25;
-
-	/**
-	 * @see CompletionProposal#CONSTRUCTOR_INVOCATION
-	 */
-	// TODO e3.5 replace by CompletionProposal.CONSTRUCTOR_INVOCATION
-	public static final int CONSTRUCTOR_INVOCATION = 26;
-
-	/**
-	 * @see CompletionProposal#ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION
-	 */
-	// TODO e3.5 replace by CompletionProposal.ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION
-	public static final int ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION = 27;
-
-	public FocusedJavaAllProposalComputer() {
-		FocusedJavaProposalProcessor.getDefault().addMonitoredComputer(this);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public List computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) {
-		if (shouldReturnResults()) {
-			List proposals = super.computeCompletionProposals(context, monitor);
-			return FocusedJavaProposalProcessor.getDefault().projectInterestModel(this, proposals);
-		} else {
-			return Collections.emptyList();
-		}
-	}
-
-	private boolean shouldReturnResults() {
-		if (JavaUiUtil.isDefaultAssistActive(JavaUiUtil.ASSIST_JDT_ALL)) {
-			// do not return duplicates if the default JDT processor is already enabled on Eclipse 3.5
-			return false;
-		}
-		Set<String> disabledIds = JavaUiUtil.getDisabledIds(JavaPlugin.getDefault().getPreferenceStore());
-		if (!disabledIds.contains(JavaUiUtil.ASSIST_JDT_NOTYPE) && !disabledIds.contains(JavaUiUtil.ASSIST_JDT_TYPE)) {
-			// do not return duplicates if the default JDT processors are already enabled on on Eclipse 3.3 and 3.4
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.jdt.internal.ui.text.java.JavaAllCompletionProposalComputer#createCollector(JavaContentAssistInvocationContext)
-	 */
-	@Override
-	protected CompletionProposalCollector createCollector(JavaContentAssistInvocationContext context) {
-		CompletionProposalCollector collector = super.createCollector(context);
-		collector.setIgnored(CompletionProposal.ANNOTATION_ATTRIBUTE_REF, false);
-		collector.setIgnored(CompletionProposal.ANONYMOUS_CLASS_DECLARATION, false);
-		try {
-			collector.setIgnored(ANONYMOUS_CLASS_CONSTRUCTOR_INVOCATION, false);
-		} catch (IllegalArgumentException e) {
-			// ignore
-		}
-		collector.setIgnored(CompletionProposal.FIELD_REF, false);
-		try {
-			collector.setIgnored(FIELD_REF_WITH_CASTED_RECEIVER, false);
-		} catch (IllegalArgumentException e) {
-			// ignore
-		}
-		collector.setIgnored(CompletionProposal.KEYWORD, false);
-		collector.setIgnored(CompletionProposal.LABEL_REF, false);
-		collector.setIgnored(CompletionProposal.LOCAL_VARIABLE_REF, false);
-		collector.setIgnored(CompletionProposal.METHOD_DECLARATION, false);
-		collector.setIgnored(CompletionProposal.METHOD_NAME_REFERENCE, false);
-		collector.setIgnored(CompletionProposal.METHOD_REF, false);
-		try {
-			collector.setIgnored(CONSTRUCTOR_INVOCATION, false);
-		} catch (IllegalArgumentException e) {
-			// ignore
-		}
-		try {
-			collector.setIgnored(METHOD_REF_WITH_CASTED_RECEIVER, false);
-		} catch (IllegalArgumentException e) {
-			// ignore
-		}
-		collector.setIgnored(CompletionProposal.PACKAGE_REF, false);
-		collector.setIgnored(CompletionProposal.POTENTIAL_METHOD_DECLARATION, false);
-		collector.setIgnored(CompletionProposal.VARIABLE_DECLARATION, false);
-		collector.setIgnored(CompletionProposal.TYPE_REF, false);
-		return collector;
-	}
-
-	/**
-	 * @see org.eclipse.jdt.internal.ui.text.java.JavaAllCompletionProposalComputer#guessContextInformationPosition(ContentAssistInvocationContext)
-	 */
-	@Override
-	protected int guessContextInformationPosition(ContentAssistInvocationContext context) {
-		int invocationOffset = context.getInvocationOffset();
-		int typeContext = super.guessContextInformationPosition(context);
-		int methodContext = guessMethodContextInformationPosition2(context);
-		if (typeContext != invocationOffset && typeContext > methodContext) {
-			return typeContext;
-		} else if (methodContext != invocationOffset) {
-			return methodContext;
-		} else {
-			return invocationOffset;
-		}
-	}
-
-	// renamed, since guessMethodContextInformationPosition(ContentAssistInvocationContext) is final
-	protected final int guessMethodContextInformationPosition2(ContentAssistInvocationContext context) {
-		final int contextPosition = context.getInvocationOffset();
-
-		IDocument document = context.getDocument();
-		JavaHeuristicScanner scanner = new JavaHeuristicScanner(document);
-		int bound = Math.max(-1, contextPosition - 200);
-
-		// try the innermost scope of parentheses that looks like a method call
-		int pos = contextPosition - 1;
-		do {
-			int paren = scanner.findOpeningPeer(pos, bound, '(', ')');
-			if (paren == JavaHeuristicScanner.NOT_FOUND) {
-				break;
-			}
-			int token = scanner.previousToken(paren - 1, bound);
-			// next token must be a method name (identifier) or the closing angle of a
-			// constructor call of a parameterized type.
-			if (token == Symbols.TokenIDENT || token == Symbols.TokenGREATERTHAN) {
-				return paren + 1;
-			}
-			pos = paren - 1;
-		} while (true);
-
-		return contextPosition;
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaNoTypeProposalComputer.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaNoTypeProposalComputer.java
deleted file mode 100644
index fd0ff96..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaNoTypeProposalComputer.java
+++ /dev/null
@@ -1,48 +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.java.ui.editor;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.internal.ui.text.java.JavaNoTypeCompletionProposalComputer;
-import org.eclipse.jdt.ui.text.java.CompletionProposalCollector;
-import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
-import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;
-import org.eclipse.mylyn.internal.java.ui.JavaUiUtil;
-
-/**
- * @author Mik Kersten
- */
-public class FocusedJavaNoTypeProposalComputer extends JavaNoTypeCompletionProposalComputer {
-
-	public FocusedJavaNoTypeProposalComputer() {
-		FocusedJavaProposalProcessor.getDefault().addMonitoredComputer(this);
-	}
-
-	@Override
-	protected CompletionProposalCollector createCollector(JavaContentAssistInvocationContext context) {
-		return super.createCollector(context);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public List computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) {
-		if (!JavaUiUtil.isDefaultAssistActive(JavaUiUtil.ASSIST_JDT_NOTYPE)) {
-			List proposals = super.computeCompletionProposals(context, monitor);
-			return FocusedJavaProposalProcessor.getDefault().projectInterestModel(this, proposals);
-		} else {
-			return Collections.emptyList();
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaProposalProcessor.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaProposalProcessor.java
deleted file mode 100644
index d31b64d..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaProposalProcessor.java
+++ /dev/null
@@ -1,162 +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.java.ui.editor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.internal.ui.text.java.AbstractJavaCompletionProposal;
-import org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
-
-/**
- * TODO: parametrize relevance levels (requires JDT changes, bug 119063)
- * 
- * @author Mik Kersten
- */
-public class FocusedJavaProposalProcessor {
-
-	/**
-	 * Range above which elements are part of the context.
-	 */
-	private static final int THRESHOLD_INTEREST = 10000;
-
-	/**
-	 * Range for implicitly interesting element, such as method parameters.
-	 */
-	private static final int THRESHOLD_IMPLICIT_INTEREST = THRESHOLD_INTEREST * 2;
-
-	/**
-	 * Threshold for determining which JDT proposals should be implicitly interesting.
-	 */
-	private static final int RELEVANCE_IMPLICIT_INTEREST_JAVA = 600;
-
-	/**
-	 * Threshold for implicit interest of IJavaElement proposals.
-	 */
-	private static final int RELEVANCE_IMPLICIT_INTEREST_MISC = 300;
-
-	private static final String IDENTIFIER_THIS = "this"; //$NON-NLS-1$
-
-	public static final String LABEL_SEPARATOR = " -------------------------------------------- "; //$NON-NLS-1$
-
-	public static final FocusedProposalSeparator PROPOSAL_SEPARATOR = new FocusedProposalSeparator();
-
-	private final List<IJavaCompletionProposalComputer> monitoredProposalComputers = new ArrayList<IJavaCompletionProposalComputer>();
-
-	private final List<IJavaCompletionProposalComputer> alreadyComputedProposals = new ArrayList<IJavaCompletionProposalComputer>();
-
-	private final List<IJavaCompletionProposalComputer> alreadyContainSeparator = new ArrayList<IJavaCompletionProposalComputer>();
-
-	private final List<IJavaCompletionProposalComputer> containsSingleInterestingProposal = new ArrayList<IJavaCompletionProposalComputer>();
-
-	private static FocusedJavaProposalProcessor INSTANCE = new FocusedJavaProposalProcessor();
-
-	private FocusedJavaProposalProcessor() {
-	}
-
-	public static FocusedJavaProposalProcessor getDefault() {
-		return INSTANCE;
-	}
-
-	public void addMonitoredComputer(IJavaCompletionProposalComputer proposalComputer) {
-		monitoredProposalComputers.add(proposalComputer);
-	}
-
-	@SuppressWarnings("unchecked")
-	public List projectInterestModel(IJavaCompletionProposalComputer proposalComputer, List proposals) {
-		try {
-			if (!ContextCore.getContextManager().isContextActive()) {
-				return proposals;
-			} else {
-				boolean hasInterestingProposals = false;
-				for (Object object : proposals) {
-					if (object instanceof AbstractJavaCompletionProposal) {
-						boolean foundInteresting = boostRelevanceWithInterest((AbstractJavaCompletionProposal) object);
-						if (!hasInterestingProposals && foundInteresting) {
-							hasInterestingProposals = true;
-						}
-					}
-				}
-
-				// NOTE: this annoying state needs to be maintainted to ensure
-				// the
-				// separator is added only once, and not added for single
-				// proposals
-				if (containsSingleInterestingProposal.size() > 0 && proposals.size() > 0) {
-					proposals.add(FocusedJavaProposalProcessor.PROPOSAL_SEPARATOR);
-				} else if (hasInterestingProposals && alreadyContainSeparator.isEmpty()) {
-					if (proposals.size() == 1) {
-						containsSingleInterestingProposal.add(proposalComputer);
-					} else {
-						proposals.add(FocusedJavaProposalProcessor.PROPOSAL_SEPARATOR);
-						alreadyContainSeparator.add(proposalComputer);
-					}
-				}
-
-				alreadyComputedProposals.add(proposalComputer);
-				if (alreadyComputedProposals.size() == monitoredProposalComputers.size()) {
-					alreadyComputedProposals.clear();
-					alreadyContainSeparator.clear();
-					containsSingleInterestingProposal.clear();
-				}
-
-				return proposals;
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN,
-					"Failed to project interest onto propsals", t)); //$NON-NLS-1$
-			return proposals;
-		}
-	}
-
-	private boolean boostRelevanceWithInterest(AbstractJavaCompletionProposal proposal) {
-		boolean hasInteresting = false;
-		IJavaElement javaElement = proposal.getJavaElement();
-		if (javaElement != null) {
-			IInteractionElement interactionElement = ContextCore.getContextManager().getElement(
-					javaElement.getHandleIdentifier());
-			float interest = interactionElement.getInterest().getValue();
-			if (interest > ContextCore.getCommonContextScaling().getInteresting()) {
-				// TODO: losing precision here, only going to one decimal place
-				proposal.setRelevance(THRESHOLD_INTEREST + (int) (interest * 10));
-				hasInteresting = true;
-			} else if (proposal.getRelevance() > RELEVANCE_IMPLICIT_INTEREST_JAVA) {
-				proposal.setRelevance(THRESHOLD_IMPLICIT_INTEREST + proposal.getRelevance());
-			}
-		} else if (isImplicitlyInteresting(proposal)) {
-			proposal.setRelevance(THRESHOLD_IMPLICIT_INTEREST + proposal.getRelevance());
-			hasInteresting = true;
-		}
-		return hasInteresting;
-	}
-
-	public boolean isImplicitlyInteresting(AbstractJavaCompletionProposal proposal) {
-		return proposal.getRelevance() > RELEVANCE_IMPLICIT_INTEREST_MISC
-				&& !IDENTIFIER_THIS.equals(proposal.getDisplayString());
-	}
-
-	static class FocusedProposalSeparator extends JavaCompletionProposal {
-		public FocusedProposalSeparator() {
-			super("", 0, 0, CommonImages.getImage(CommonImages.SEPARATOR_LIST), LABEL_SEPARATOR, //$NON-NLS-1$
-					FocusedJavaProposalProcessor.THRESHOLD_INTEREST);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaSourceViewerConfiguration.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaSourceViewerConfiguration.java
deleted file mode 100644
index cdecc7e..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaSourceViewerConfiguration.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.internal.java.ui.editor;
-
-import org.eclipse.jdt.ui.text.IColorManager;
-import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Installs Mylyn content assist and hyperlink detection
- * 
- * @author Mik Kersten
- */
-public class FocusedJavaSourceViewerConfiguration extends JavaSourceViewerConfiguration {
-
-	public FocusedJavaSourceViewerConfiguration(IColorManager colorManager, IPreferenceStore preferenceStore,
-			ITextEditor editor, String partitioning) {
-		super(colorManager, preferenceStore, editor, partitioning);
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaTypeProposalComputer.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaTypeProposalComputer.java
deleted file mode 100644
index 3a5f24f..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/FocusedJavaTypeProposalComputer.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.java.ui.editor;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.internal.ui.text.java.JavaTypeCompletionProposalComputer;
-import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
-import org.eclipse.mylyn.internal.java.ui.JavaUiUtil;
-
-/**
- * @author Mik Kersten
- */
-public class FocusedJavaTypeProposalComputer extends JavaTypeCompletionProposalComputer {
-
-	public FocusedJavaTypeProposalComputer() {
-		FocusedJavaProposalProcessor.getDefault().addMonitoredComputer(this);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public List computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) {
-		if (!JavaUiUtil.isDefaultAssistActive(JavaUiUtil.ASSIST_JDT_TYPE)) {
-			List proposals = super.computeCompletionProposals(context, monitor);
-			return FocusedJavaProposalProcessor.getDefault().projectInterestModel(this, proposals);
-		} else {
-			return Collections.emptyList();
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/Messages.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/Messages.java
deleted file mode 100644
index 670e65c..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/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.java.ui.editor;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.java.ui.editor.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 AutoFoldPreferenceBlock_Elements_of_low_interest_will_be_automatically_folded;
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/messages.properties b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/messages.properties
deleted file mode 100644
index 0095740..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/editor/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-AutoFoldPreferenceBlock_Elements_of_low_interest_will_be_automatically_folded=Elements of low interest will be automatically folded.
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/InteractionContextTestUtil.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/InteractionContextTestUtil.java
deleted file mode 100644
index a598631..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/InteractionContextTestUtil.java
+++ /dev/null
@@ -1,132 +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.java.ui.junit;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProjectNature;
-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.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.launcher.JUnitLaunchConfigurationConstants;
-import org.eclipse.jdt.internal.junit.launcher.TestKindRegistry;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-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.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.mylyn.internal.java.ui.search.JUnitReferencesProvider;
-
-/**
- * @author Mik Kersten
- */
-public class InteractionContextTestUtil {
-
-	public static void setupTestConfiguration(Set<IType> contextTestCases, ILaunchConfiguration configuration,
-			IProgressMonitor pm) throws CoreException {
-		String testKindId = TestKindRegistry.JUNIT3_TEST_KIND_ID;
-
-		IJavaProject javaProject = null;
-		for (IType type : contextTestCases) {
-			IProjectNature nature = type.getJavaProject().getProject().getNature("org.eclipse.pde.PluginNature"); //$NON-NLS-1$
-			if (nature != null) {
-				// HACK: might want another project
-				javaProject = type.getJavaProject();
-			}
-		}
-
-		ILaunchConfigurationWorkingCopy workingCopy = configuration.getWorkingCopy();
-		if (javaProject != null) {
-			workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, javaProject.getElementName());
-		}
-
-		// HACK: only checks first type
-		if (contextTestCases.size() > 0) {
-			testKindId = TestKindRegistry.getContainerTestKindId(contextTestCases.iterator().next());
-			workingCopy.setAttribute(JUnitLaunchConfigurationConstants.ATTR_TEST_RUNNER_KIND, testKindId);
-			//			testKind = TestKindRegistry.getDefault().getKind(configuration);// contextTestCases.iterator().next());
-		}
-		workingCopy.doSave();
-	}
-
-	public static Set<IType> getTestCasesInContext() {
-		Set<IType> testTypes = new HashSet<IType>();
-		List<IInteractionElement> interesting = ContextCore.getContextManager().getActiveContext().getInteresting();
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(JavaStructureBridge.CONTENT_TYPE);
-		try {
-			for (IInteractionElement element : interesting) {
-				if (element.getContentType().equals(JavaStructureBridge.CONTENT_TYPE)) {
-					Object javaElement = bridge.getObjectForHandle(element.getHandleIdentifier());
-					if (javaElement instanceof IType) {
-						IType type = (IType) javaElement;
-						if (isTestType(type)) {
-							testTypes.add(type);
-						}
-					}
-					for (IInteractionRelation relation : element.getRelations()) {
-						if (relation.getRelationshipHandle().equals(JUnitReferencesProvider.ID)) {
-							IInteractionElement target = relation.getTarget();
-							Object targetObject = bridge.getObjectForHandle(target.getHandleIdentifier());
-							if (targetObject instanceof IMethod) {
-								IMethod testMethod = (IMethod) targetObject;
-								if (isTestType((IType) testMethod.getParent())) {
-									testTypes.add((IType) testMethod.getParent());
-								}
-							}
-						}
-					}
-				}
-			}
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN, "Could not add all test types", e)); //$NON-NLS-1$
-		}
-		return testTypes;
-	}
-
-	public static boolean isTestType(IType type) {
-		ITypeHierarchy hierarchy;
-		try {
-			if (Flags.isAbstract(type.getFlags())) {
-				return false;
-			}
-		} catch (JavaModelException e) {
-			return false;
-		}
-		try {
-			hierarchy = type.newSupertypeHierarchy(null);
-			IType[] supertypes = hierarchy.getAllSuperclasses(type);
-			for (IType supertype : supertypes) {
-				if (supertype.getFullyQualifiedName().equals("junit.framework.TestCase")) { //$NON-NLS-1$
-					return true;
-				}
-			}
-		} catch (JavaModelException e) {
-			// ContextCorePlugin.log(e, "could not determine test type");
-			// ignore, hierarchy is probably inconsistent
-		}
-		return false;
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/Messages.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/Messages.java
deleted file mode 100644
index 9460c01..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/Messages.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.ui.junit;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.java.ui.junit.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 TaskContextJUnitLaunchConfiguration_Context_Test_Suite;
-
-	public static String TaskContextJUnitLaunchConfiguration_No_test_types_found_in_the_active_task_context;
-
-	public static String TaskContextJUnitMainTab_SUBCLASSES_OF_TESTCASE_AUTOMATICALLY_ADD_TO_SUITE;
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitLaunchConfiguration.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitLaunchConfiguration.java
deleted file mode 100644
index b8a9340..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitLaunchConfiguration.java
+++ /dev/null
@@ -1,47 +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.java.ui.junit;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.junit.launcher.JUnitLaunchConfigurationDelegate;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class TaskContextJUnitLaunchConfiguration extends JUnitLaunchConfigurationDelegate {
-
-	@Override
-	protected IMember[] evaluateTests(ILaunchConfiguration configuration, IProgressMonitor monitor)
-			throws CoreException {
-		Set<IType> contextTestCases = InteractionContextTestUtil.getTestCasesInContext();
-		InteractionContextTestUtil.setupTestConfiguration(contextTestCases, configuration, monitor);
-
-		if (contextTestCases.isEmpty()) {
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.TaskContextJUnitLaunchConfiguration_Context_Test_Suite,
-							Messages.TaskContextJUnitLaunchConfiguration_No_test_types_found_in_the_active_task_context);
-				}
-			});
-		}
-		return contextTestCases.toArray(new IMember[contextTestCases.size()]);
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitMainTab.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitMainTab.java
deleted file mode 100644
index 3d72db6..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitMainTab.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.java.ui.junit;
-
-import java.util.Set;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.junit.launcher.JUnitLaunchConfigurationTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * @author Mik Kersten
- */
-public class TaskContextJUnitMainTab extends JUnitLaunchConfigurationTab {
-
-	private boolean isPdeMode = false;
-
-	private final Image image;
-
-	public TaskContextJUnitMainTab(boolean isPdeMode) {
-		this.isPdeMode = isPdeMode;
-		image = JavaUiBridgePlugin.getImageDescriptor("icons/etool16/junit-tab.gif").createImage(); //$NON-NLS-1$
-	}
-
-	@Override
-	public boolean isValid(ILaunchConfiguration config) {
-		return true;
-	}
-
-	@Override
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 3;
-		comp.setLayout(topLayout);
-
-		new Label(comp, SWT.NONE);
-		Label label = new Label(comp, SWT.NONE);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 3;
-		label.setLayoutData(gd);
-
-		label.setText(Messages.TaskContextJUnitMainTab_SUBCLASSES_OF_TESTCASE_AUTOMATICALLY_ADD_TO_SUITE);
-	}
-
-	@Override
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		if (!isPdeMode) {
-			Set<IType> types = InteractionContextTestUtil.getTestCasesInContext();
-			if (!types.isEmpty()) {
-				IType firstType = types.iterator().next();
-				String projectName = firstType.getJavaProject().getElementName();
-				config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, projectName);
-			}
-		}
-	}
-
-	@Override
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		// ignore
-	}
-
-	@Override
-	public void initializeFrom(ILaunchConfiguration config) {
-		// ignore
-	}
-
-	@Override
-	public String getName() {
-		return "JUnit"; //$NON-NLS-1$
-	}
-
-	@Override
-	public Image getImage() {
-		// IMAGE
-		return image;
-	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-		if (image != null && !image.isDisposed()) {
-			image.dispose();
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitTabGroup.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitTabGroup.java
deleted file mode 100644
index 318ebb1..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/TaskContextJUnitTabGroup.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.java.ui.junit;
-
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.EnvironmentTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-
-/**
- * Derived from: JUnitTabGroup
- * 
- * @author Mik Kersten
- */
-public class TaskContextJUnitTabGroup extends AbstractLaunchConfigurationTabGroup {
-
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { new TaskContextJUnitMainTab(false),
-				new JavaArgumentsTab(), new JavaClasspathTab(), new JavaJRETab(), new SourceLookupTab(),
-				new EnvironmentTab(), new CommonTab() };
-		setTabs(tabs);
-	}
-
-	@Override
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		super.setDefaults(config);
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/messages.properties b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/messages.properties
deleted file mode 100644
index e18b093..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/junit/messages.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-TaskContextJUnitLaunchConfiguration_Context_Test_Suite=Context Test Suite
-TaskContextJUnitLaunchConfiguration_No_test_types_found_in_the_active_task_context=No test types found in the active task context.
-
-TaskContextJUnitMainTab_SUBCLASSES_OF_TESTCASE_AUTOMATICALLY_ADD_TO_SUITE=Subclasses of TestCase in the active task context automatically added to suite.
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/AbstractJavaRelationProvider.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/AbstractJavaRelationProvider.java
deleted file mode 100644
index c49b6b4..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/AbstractJavaRelationProvider.java
+++ /dev/null
@@ -1,431 +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.java.ui.search;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IInitializer;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.internal.core.JavaProject;
-import org.eclipse.jdt.internal.ui.search.JavaSearchQuery;
-import org.eclipse.jdt.internal.ui.search.JavaSearchResult;
-import org.eclipse.jdt.ui.search.ElementQuerySpecification;
-import org.eclipse.jdt.ui.search.QuerySpecification;
-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.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.AbstractRelationProvider;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.DegreeOfSeparation;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchListener;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchOperation;
-import org.eclipse.mylyn.internal.context.core.IDegreeOfSeparation;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-import org.eclipse.search.ui.ISearchResult;
-import org.eclipse.search2.internal.ui.InternalSearchUI;
-
-/**
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public abstract class AbstractJavaRelationProvider extends AbstractRelationProvider {
-
-	public static final String ID_GENERIC = "org.eclipse.mylyn.java.relation"; //$NON-NLS-1$
-
-	public static final String NAME = "Java relationships"; //$NON-NLS-1$
-
-	private static final int DEFAULT_DEGREE = 2;
-
-	private static final List<Job> runningJobs = new ArrayList<Job>();
-
-	@Override
-	public String getGenericId() {
-		return ID_GENERIC;
-	}
-
-	protected AbstractJavaRelationProvider(String structureKind, String id) {
-		super(structureKind, id);
-	}
-
-	@Override
-	public List<IDegreeOfSeparation> getDegreesOfSeparation() {
-		List<IDegreeOfSeparation> separations = new ArrayList<IDegreeOfSeparation>();
-		separations.add(new DegreeOfSeparation(DOS_0_LABEL, 0));
-		separations.add(new DegreeOfSeparation(DOS_1_LABEL, 1));
-		separations.add(new DegreeOfSeparation(DOS_2_LABEL, 2));
-		separations.add(new DegreeOfSeparation(DOS_3_LABEL, 3));
-		separations.add(new DegreeOfSeparation(DOS_4_LABEL, 4));
-		separations.add(new DegreeOfSeparation(DOS_5_LABEL, 5));
-		return separations;
-	}
-
-	@Override
-	protected void findRelated(final IInteractionElement node, int degreeOfSeparation) {
-		if (node == null) {
-			return;
-		}
-		if (node.getContentType() == null) {
-			StatusHandler.log(new Status(IStatus.WARNING, JavaUiBridgePlugin.ID_PLUGIN, "Null content type for: " //$NON-NLS-1$
-					+ node));
-			return;
-		}
-		if (!node.getContentType().equals(JavaStructureBridge.CONTENT_TYPE)) {
-			return;
-		}
-		IJavaElement javaElement = JavaCore.create(node.getHandleIdentifier());
-		if (!acceptElement(javaElement) || !javaElement.exists() || javaElement instanceof IInitializer) {
-			return;
-		}
-
-		IJavaSearchScope scope = createJavaSearchScope(javaElement, degreeOfSeparation);
-		if (scope != null) {
-			runJob(node, degreeOfSeparation, getId());
-		}
-	}
-
-	private IJavaSearchScope createJavaSearchScope(IJavaElement element, int degreeOfSeparation) {
-		Set<IInteractionElement> landmarks = ContextCore.getContextManager().getActiveLandmarks();
-		List<IInteractionElement> interestingElements = ContextCore.getContextManager()
-				.getActiveContext()
-				.getInteresting();
-
-		Set<IJavaElement> searchElements = new HashSet<IJavaElement>();
-		int includeMask = IJavaSearchScope.SOURCES;
-		if (degreeOfSeparation == 1) {
-			for (IInteractionElement landmark : landmarks) {
-				AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(landmark.getContentType());
-				if (includeNodeInScope(landmark, bridge)) {
-					Object o = bridge.getObjectForHandle(landmark.getHandleIdentifier());
-					if (o instanceof IJavaElement) {
-						IJavaElement landmarkElement = (IJavaElement) o;
-						if (landmarkElement.exists()) {
-							if (landmarkElement instanceof IMember && !landmark.getInterest().isPropagated()) {
-								searchElements.add(((IMember) landmarkElement).getCompilationUnit());
-							} else if (landmarkElement instanceof ICompilationUnit) {
-								searchElements.add(landmarkElement);
-							}
-						}
-					}
-				}
-			}
-		} else if (degreeOfSeparation == 2) {
-			for (IInteractionElement interesting : interestingElements) {
-				AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(interesting.getContentType());
-				if (includeNodeInScope(interesting, bridge)) {
-					Object object = bridge.getObjectForHandle(interesting.getHandleIdentifier());
-					if (object instanceof IJavaElement) {
-						IJavaElement interestingElement = (IJavaElement) object;
-						if (interestingElement.exists()) {
-							if (interestingElement instanceof IMember && !interesting.getInterest().isPropagated()) {
-								searchElements.add(((IMember) interestingElement).getCompilationUnit());
-							} else if (interestingElement instanceof ICompilationUnit) {
-								searchElements.add(interestingElement);
-							}
-						}
-					}
-				}
-			}
-		} else if (degreeOfSeparation == 3 || degreeOfSeparation == 4) {
-			for (IInteractionElement interesting : interestingElements) {
-				AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(interesting.getContentType());
-				if (includeNodeInScope(interesting, bridge)) {
-					// TODO what to do when the element is not a java element,
-					// how determine if a javaProject?
-					IResource resource = ResourcesUiBridgePlugin.getDefault().getResourceForElement(interesting, true);
-					if (resource != null) {
-						IProject project = resource.getProject();
-						if (project != null && JavaProject.hasJavaNature(project) && project.exists()) {
-							IJavaProject javaProject = JavaCore.create(project);// ((IJavaElement)o).getJavaProject();
-							if (javaProject != null && javaProject.exists()) {
-								searchElements.add(javaProject);
-							}
-						}
-					}
-				}
-			}
-			if (degreeOfSeparation == 4) {
-
-				includeMask = IJavaSearchScope.SOURCES | IJavaSearchScope.APPLICATION_LIBRARIES
-						| IJavaSearchScope.SYSTEM_LIBRARIES;
-			}
-		} else if (degreeOfSeparation == 5) {
-			return SearchEngine.createWorkspaceScope();
-		}
-
-		if (searchElements.size() == 0) {
-			return null;
-		} else {
-			IJavaElement[] elements = new IJavaElement[searchElements.size()];
-			int j = 0;
-			for (IJavaElement searchElement : searchElements) {
-				elements[j] = searchElement;
-				j++;
-			}
-			return SearchEngine.createJavaSearchScope(elements, includeMask);
-		}
-	}
-
-	/**
-	 * Only include Java elements and files.
-	 */
-	private boolean includeNodeInScope(IInteractionElement interesting, AbstractContextStructureBridge bridge) {
-		if (interesting == null || bridge == null) {
-			return false;
-		} else {
-			if (interesting.getContentType() == null) {
-				// TODO: remove
-				StatusHandler.log(new Status(IStatus.WARNING, JavaUiBridgePlugin.ID_PLUGIN, "Null content type for: " //$NON-NLS-1$
-						+ interesting.getHandleIdentifier()));
-				return false;
-			} else {
-				return interesting.getContentType().equals(JavaStructureBridge.CONTENT_TYPE)
-						|| bridge.isDocument(interesting.getHandleIdentifier());
-			}
-		}
-	}
-
-	protected boolean acceptResultElement(IJavaElement element) {
-		return !(element instanceof IImportDeclaration);
-	}
-
-	protected boolean acceptElement(IJavaElement javaElement) {
-		return javaElement != null && (javaElement instanceof IMember || javaElement instanceof IType);
-	}
-
-	private void runJob(final IInteractionElement node, final int degreeOfSeparation, final String kind) {
-
-		int limitTo = 0;
-		if (kind.equals(JavaReferencesProvider.ID)) {
-			limitTo = IJavaSearchConstants.REFERENCES;
-		} else if (kind.equals(JavaImplementorsProvider.ID)) {
-			limitTo = IJavaSearchConstants.IMPLEMENTORS;
-		} else if (kind.equals(JUnitReferencesProvider.ID)) {
-			limitTo = IJavaSearchConstants.REFERENCES;
-		} else if (kind.equals(JavaReadAccessProvider.ID)) {
-			limitTo = IJavaSearchConstants.REFERENCES;
-		} else if (kind.equals(JavaWriteAccessProvider.ID)) {
-			limitTo = IJavaSearchConstants.REFERENCES;
-		}
-
-		final JavaSearchOperation query = (JavaSearchOperation) getSearchOperation(node, limitTo, degreeOfSeparation);
-		if (query == null) {
-			return;
-		}
-
-		JavaSearchJob job = new JavaSearchJob(query.getLabel(), query);
-		query.addListener(new IActiveSearchListener() {
-
-			private boolean gathered = false;
-
-			public boolean resultsGathered() {
-				return gathered;
-			}
-
-			@SuppressWarnings("unchecked")
-			public void searchCompleted(List l) {
-				if (l == null) {
-					return;
-				}
-				List<IJavaElement> relatedHandles = new ArrayList<IJavaElement>();
-				Object[] elements = l.toArray();
-				for (Object element : elements) {
-					if (element instanceof IJavaElement) {
-						relatedHandles.add((IJavaElement) element);
-					}
-				}
-
-				for (IJavaElement element : relatedHandles) {
-					if (!acceptResultElement(element)) {
-						continue;
-					}
-					incrementInterest(node, JavaStructureBridge.CONTENT_TYPE, element.getHandleIdentifier(),
-							degreeOfSeparation);
-				}
-				gathered = true;
-				AbstractJavaRelationProvider.this.searchCompleted(node);
-			}
-
-		});
-		InternalSearchUI.getInstance();
-
-		runningJobs.add(job);
-		job.setPriority(Job.DECORATE - 10);
-		job.schedule();
-	}
-
-	@Override
-	public IActiveSearchOperation getSearchOperation(IInteractionElement node, int limitTo, int degreeOfSeparation) {
-		IJavaElement javaElement = JavaCore.create(node.getHandleIdentifier());
-		if (javaElement == null || !javaElement.exists()) {
-			return null;
-		}
-
-		IJavaSearchScope scope = createJavaSearchScope(javaElement, degreeOfSeparation);
-
-		if (scope == null) {
-			return null;
-		}
-
-		QuerySpecification specs = new ElementQuerySpecification(javaElement, limitTo, scope,
-				Messages.AbstractJavaRelationProvider_Mylyn_degree_of_separation + degreeOfSeparation);
-
-		return new JavaSearchOperation(specs);
-	}
-
-	protected static class JavaSearchJob extends Job {
-
-		private final JavaSearchOperation op;
-
-		public JavaSearchJob(String name, JavaSearchOperation op) {
-			super(name);
-			this.op = op;
-		}
-
-		/**
-		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		@Override
-		protected IStatus run(IProgressMonitor monitor) {
-			return op.run(monitor);
-		}
-
-	}
-
-	protected static class JavaSearchOperation extends JavaSearchQuery implements IActiveSearchOperation {
-		private ISearchResult result = null;
-
-		@Override
-		public ISearchResult getSearchResult() {
-			if (result == null) {
-				result = new JavaSearchResult(this);
-			}
-			new JavaActiveSearchResultUpdater((JavaSearchResult) result);
-			return result;
-		}
-
-		@Override
-		public IStatus run(IProgressMonitor monitor) {
-			try {
-				IStatus runStatus = super.run(monitor);
-				ISearchResult result = getSearchResult();
-				if (result instanceof JavaSearchResult) {
-					// TODO make better
-					Object[] objs = ((JavaSearchResult) result).getElements();
-					if (objs == null) {
-						notifySearchCompleted(null);
-					} else {
-						List<Object> l = new ArrayList<Object>();
-						for (Object obj : objs) {
-							l.add(obj);
-						}
-						notifySearchCompleted(l);
-					}
-				}
-				return runStatus;
-			} catch (Throwable t) {
-				StatusHandler.log(new Status(IStatus.ERROR, JavaUiBridgePlugin.ID_PLUGIN, "Java search failed", t)); //$NON-NLS-1$
-			}
-
-			IStatus status = new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, IStatus.OK,
-					Messages.AbstractJavaRelationProvider_could_not_run_Java_search, null);
-			notifySearchCompleted(null);
-			return status;
-		}
-
-		/**
-		 * Constructor
-		 * 
-		 * @param data
-		 */
-		public JavaSearchOperation(QuerySpecification data) {
-			super(data);
-
-		}
-
-		/** List of listeners wanting to know about the searches */
-		private final List<IActiveSearchListener> listeners = new ArrayList<IActiveSearchListener>();
-
-		/**
-		 * Add a listener for when the bugzilla search is completed
-		 * 
-		 * @param l
-		 *            The listener to add
-		 */
-		public void addListener(IActiveSearchListener l) {
-			// add the listener to the list
-			listeners.add(l);
-		}
-
-		/**
-		 * Remove a listener for when the bugzilla search is completed
-		 * 
-		 * @param l
-		 *            The listener to remove
-		 */
-		public void removeListener(IActiveSearchListener l) {
-			// remove the listener from the list
-			listeners.remove(l);
-		}
-
-		/**
-		 * Notify all of the listeners that the bugzilla search is completed
-		 * 
-		 * @param doiList
-		 *            A list of BugzillaSearchHitDoiInfo
-		 * @param member
-		 *            The IMember that the search was performed on
-		 */
-		public void notifySearchCompleted(List<Object> l) {
-			// go through all of the listeners and call
-			// searchCompleted(colelctor,
-			// member)
-			for (IActiveSearchListener listener : listeners) {
-				listener.searchCompleted(l);
-			}
-		}
-
-	}
-
-	@Override
-	public void stopAllRunningJobs() {
-		for (Job j : runningJobs) {
-			j.cancel();
-		}
-		runningJobs.clear();
-	}
-
-	@Override
-	protected int getDefaultDegreeOfSeparation() {
-		return DEFAULT_DEGREE;
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JUnitReferencesProvider.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JUnitReferencesProvider.java
deleted file mode 100644
index 50dfeb6..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JUnitReferencesProvider.java
+++ /dev/null
@@ -1,62 +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.java.ui.search;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-import org.eclipse.mylyn.internal.java.ui.junit.InteractionContextTestUtil;
-
-/**
- * @author Mik Kersten
- */
-public class JUnitReferencesProvider extends AbstractJavaRelationProvider {
-
-	public static final String ID = ID_GENERIC + ".junitreferences"; //$NON-NLS-1$
-
-	public static final String NAME = "tested by"; //$NON-NLS-1$
-
-	public JUnitReferencesProvider() {
-		super(JavaStructureBridge.CONTENT_TYPE, ID);
-	}
-
-	@Override
-	protected boolean acceptResultElement(IJavaElement element) {
-		if (element instanceof IMethod) {
-			IMethod method = (IMethod) element;
-			boolean isTestMethod = false;
-			boolean isTestCase = false;
-			if (method.getElementName().startsWith("test")) { //$NON-NLS-1$
-				isTestMethod = true;
-			}
-
-			IJavaElement parent = method.getParent();
-			if (parent instanceof IType) {
-				IType type = (IType) parent;
-				isTestCase = InteractionContextTestUtil.isTestType(type);
-			}
-			return isTestMethod && isTestCase;
-		}
-		return false;
-	}
-
-	@Override
-	protected String getSourceId() {
-		return ID;
-	}
-
-	@Override
-	public String getName() {
-		return NAME;
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaActiveSearchResultUpdater.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaActiveSearchResultUpdater.java
deleted file mode 100644
index 81b794c..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaActiveSearchResultUpdater.java
+++ /dev/null
@@ -1,170 +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.java.ui.search;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.ui.search.JavaSearchResult;
-import org.eclipse.search.ui.IQueryListener;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.Match;
-
-/**
- * COPIED FROM: org.eclipse.jdt.internal.ui.search.SearchResultUpdater
- * 
- * @author Shawn Minto
- */
-@SuppressWarnings("unchecked")
-public class JavaActiveSearchResultUpdater implements IElementChangedListener, IQueryListener {
-
-	private final JavaSearchResult fResult;
-
-	private static final int REMOVED_FLAGS = IJavaElementDelta.F_MOVED_TO | IJavaElementDelta.F_REMOVED_FROM_CLASSPATH
-			| IJavaElementDelta.F_CLOSED | IJavaElementDelta.F_CONTENT;
-
-	public JavaActiveSearchResultUpdater(JavaSearchResult result) {
-		fResult = result;
-		NewSearchUI.addQueryListener(this);
-		JavaCore.addElementChangedListener(this);
-		// TODO make this work with resources
-	}
-
-	public void elementChanged(ElementChangedEvent event) {
-		// long t0= System.currentTimeMillis();
-		IJavaElementDelta delta = event.getDelta();
-		Set removedElements = new HashSet();
-		Set potentiallyRemovedElements = new HashSet();
-		collectRemoved(potentiallyRemovedElements, removedElements, delta);
-		if (removedElements.size() > 0) {
-			handleRemoved(removedElements);
-		}
-		if (potentiallyRemovedElements.size() > 0) {
-			handleRemoved(potentiallyRemovedElements);
-		}
-	}
-
-	private void handleRemoved(Set removedElements) {
-		Object[] elements = fResult.getElements();
-		for (Object element : elements) {
-			if (isContainedInRemoved(removedElements, element)) {
-				if (element instanceof IJavaElement) {
-					IJavaElement je = (IJavaElement) element;
-					if (!je.exists()) {
-						Match[] matches = fResult.getMatches(element);
-						for (Match matche : matches) {
-							fResult.removeMatch(matche);
-						}
-						// XXX remove edge and element
-					}
-				} else if (element instanceof IResource) {
-					IResource resource = (IResource) element;
-					if (!resource.exists()) {
-						Match[] matches = fResult.getMatches(element);
-						for (Match matche : matches) {
-							fResult.removeMatch(matche);
-						}
-						// XXX remove edge and element
-					}
-
-				}
-			}
-		}
-	}
-
-	private boolean isContainedInRemoved(Set removedElements, Object object) {
-		for (Iterator elements = removedElements.iterator(); elements.hasNext();) {
-			if (isParentOf(elements.next(), object)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private boolean isParentOf(Object ancestor, Object descendant) {
-		while (descendant != null && !ancestor.equals(descendant)) {
-			descendant = getParent(descendant);
-		}
-		return descendant != null;
-	}
-
-	private Object getParent(Object object) {
-		if (object instanceof IJavaElement) {
-			return ((IJavaElement) object).getParent();
-		} else if (object instanceof IResource) {
-			return ((IResource) object).getParent();
-		}
-		return null;
-	}
-
-	private void collectRemoved(Set potentiallyRemovedSet, Set removedElements, IJavaElementDelta delta) {
-		if (delta.getKind() == IJavaElementDelta.REMOVED) {
-			removedElements.add(delta.getElement());
-		} else if (delta.getKind() == IJavaElementDelta.CHANGED) {
-			int flags = delta.getFlags();
-			if ((flags & REMOVED_FLAGS) != 0) {
-				potentiallyRemovedSet.add(delta.getElement());
-			} else {
-				IJavaElementDelta[] childDeltas = delta.getAffectedChildren();
-				for (IJavaElementDelta childDelta : childDeltas) {
-					collectRemoved(potentiallyRemovedSet, removedElements, childDelta);
-				}
-			}
-		}
-		IResourceDelta[] resourceDeltas = delta.getResourceDeltas();
-		if (resourceDeltas != null) {
-			for (IResourceDelta resourceDelta : resourceDeltas) {
-				collectRemovals(removedElements, resourceDelta);
-			}
-		}
-	}
-
-	public void queryAdded(ISearchQuery query) {
-		// don't care
-	}
-
-	public void queryRemoved(ISearchQuery query) {
-		if (fResult.equals(query.getSearchResult())) {
-			JavaCore.removeElementChangedListener(this);
-			NewSearchUI.removeQueryListener(this);
-		}
-	}
-
-	private void collectRemovals(Set removals, IResourceDelta delta) {
-		if (delta.getKind() == IResourceDelta.REMOVED) {
-			removals.add(delta.getResource());
-		} else {
-			IResourceDelta[] children = delta.getAffectedChildren();
-			for (IResourceDelta element : children) {
-				collectRemovals(removals, element);
-			}
-		}
-	}
-
-	public void queryStarting(ISearchQuery query) {
-		// not interested
-	}
-
-	public void queryFinished(ISearchQuery query) {
-		// not interested
-	}
-
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaImplementorsProvider.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaImplementorsProvider.java
deleted file mode 100644
index 1c36b8c..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaImplementorsProvider.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.internal.java.ui.search;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-
-/**
- * @author Mik Kersten
- */
-public class JavaImplementorsProvider extends AbstractJavaRelationProvider {
-
-	public static final String ID = ID_GENERIC + ".implementors"; //$NON-NLS-1$
-
-	public static final String NAME = "implemented by"; //$NON-NLS-1$
-
-	public JavaImplementorsProvider() {
-		super(JavaStructureBridge.CONTENT_TYPE, ID);
-	}
-
-	@Override
-	protected boolean acceptElement(IJavaElement javaElement) {
-		return javaElement != null && javaElement instanceof IType;
-	}
-
-	@Override
-	protected String getSourceId() {
-		return ID;
-	}
-
-	@Override
-	public String getName() {
-		return NAME;
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaReadAccessProvider.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaReadAccessProvider.java
deleted file mode 100644
index 4fa4e65..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaReadAccessProvider.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.internal.java.ui.search;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-
-/**
- * @author Mik Kersten
- */
-public class JavaReadAccessProvider extends AbstractJavaRelationProvider {
-
-	public static final String ID = ID_GENERIC + ".readaccess"; //$NON-NLS-1$
-
-	public static final String NAME = "read by"; //$NON-NLS-1$
-
-	public JavaReadAccessProvider() {
-		super(JavaStructureBridge.CONTENT_TYPE, ID);
-	}
-
-	@Override
-	protected boolean acceptElement(IJavaElement javaElement) {
-		return javaElement instanceof IField;
-	}
-
-	@Override
-	protected String getSourceId() {
-		return ID;
-	}
-
-	@Override
-	public String getName() {
-		return NAME;
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaReferencesProvider.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaReferencesProvider.java
deleted file mode 100644
index f3bc754..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaReferencesProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.java.ui.search;
-
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-
-/**
- * @author Mik Kersten
- */
-public class JavaReferencesProvider extends AbstractJavaRelationProvider {
-
-	public static final String ID = ID_GENERIC + ".references"; //$NON-NLS-1$
-
-	public static final String NAME = "referenced by"; //$NON-NLS-1$
-
-	public JavaReferencesProvider() {
-		super(JavaStructureBridge.CONTENT_TYPE, ID);
-	}
-
-	@Override
-	protected boolean acceptResultElement(IJavaElement element) {
-		if (element instanceof IImportDeclaration) {
-			return false;
-		}
-		if (element instanceof IMethod) {
-			IMethod method = (IMethod) element;
-			if (method.getElementName().startsWith("test")) { //$NON-NLS-1$
-				return false; // HACK
-			} else {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	protected String getSourceId() {
-		return ID;
-	}
-
-	@Override
-	public String getName() {
-		return NAME;
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaWriteAccessProvider.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaWriteAccessProvider.java
deleted file mode 100644
index da45042..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/JavaWriteAccessProvider.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.internal.java.ui.search;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
-
-/**
- * @author Mik Kersten
- */
-public class JavaWriteAccessProvider extends AbstractJavaRelationProvider {
-
-	public static final String ID = ID_GENERIC + ".writeaccess"; //$NON-NLS-1$
-
-	public static final String NAME = "written by"; //$NON-NLS-1$
-
-	public JavaWriteAccessProvider() {
-		super(JavaStructureBridge.CONTENT_TYPE, ID);
-	}
-
-	@Override
-	protected boolean acceptElement(IJavaElement javaElement) {
-		return javaElement instanceof IField;
-	}
-
-	@Override
-	protected String getSourceId() {
-		return ID;
-	}
-
-	@Override
-	public String getName() {
-		return NAME;
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/Messages.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/Messages.java
deleted file mode 100644
index 8082528..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/Messages.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.java.ui.search;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.java.ui.search.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 AbstractJavaRelationProvider_could_not_run_Java_search;
-
-	public static String AbstractJavaRelationProvider_Mylyn_degree_of_separation;
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/XmlActiveSearchUpdater.java b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/XmlActiveSearchUpdater.java
deleted file mode 100644
index c8eef01..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/XmlActiveSearchUpdater.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.java.ui.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.search.internal.ui.text.FileSearchResult;
-import org.eclipse.search.ui.IQueryListener;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.Match;
-
-/**
- * COPIED FROM: org.eclipse.search.internal.ui.text.SearchResultUpdater
- * 
- * @author Shawn Minto
- * 
- */
-public class XmlActiveSearchUpdater implements IResourceChangeListener, IQueryListener {
-	private final FileSearchResult fResult;
-
-	public XmlActiveSearchUpdater(FileSearchResult result) {
-		fResult = result;
-		NewSearchUI.addQueryListener(this);
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
-	}
-
-	public void resourceChanged(IResourceChangeEvent event) {
-		IResourceDelta delta = event.getDelta();
-		if (delta != null) {
-			handleDelta(delta);
-		}
-	}
-
-	private void handleDelta(IResourceDelta d) {
-		try {
-			d.accept(new IResourceDeltaVisitor() {
-				public boolean visit(IResourceDelta delta) throws CoreException {
-					switch (delta.getKind()) {
-					case IResourceDelta.ADDED:
-						return false;
-					case IResourceDelta.REMOVED:
-						IResource res = delta.getResource();
-						if (res instanceof IFile) {
-							Match[] matches = fResult.getMatches(res);
-							fResult.removeMatches(matches);
-
-//							for (Match matche : matches) {
-//							 Match m = matches[j];
-//							 XmlNodeHelper xnode =
-//							 XmlJavaReferencesProvider.nodeMap.remove(m);
-//							 System.out.println("REMOVED RES: " +
-//							 xnode.getHandle());
-//							 System.out.println(XmlJavaReferencesProvider.nodeMap);
-//							}
-						}
-						break;
-					case IResourceDelta.CHANGED:
-						// TODO want to do something on chages to invalidate
-						// handle changed resource
-						break;
-					}
-					return true;
-				}
-			});
-		} catch (CoreException e) {
-			StatusHandler.log(e.getStatus());
-		}
-	}
-
-	public void queryAdded(ISearchQuery query) {
-		// don't care
-	}
-
-	public void queryRemoved(ISearchQuery query) {
-		if (fResult.equals(query.getSearchResult())) {
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-			NewSearchUI.removeQueryListener(this);
-		}
-	}
-
-	public void queryStarting(ISearchQuery query) {
-		// don't care
-	}
-
-	public void queryFinished(ISearchQuery query) {
-		// don't care
-	}
-}
diff --git a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/messages.properties b/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/messages.properties
deleted file mode 100644
index c26a60a..0000000
--- a/org.eclipse.mylyn.java.ui/src/org/eclipse/mylyn/internal/java/ui/search/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-AbstractJavaRelationProvider_could_not_run_Java_search=could not run Java search
-AbstractJavaRelationProvider_Mylyn_degree_of_separation=Mylyn degree of separation: 
diff --git a/org.eclipse.mylyn.pde-feature/.project b/org.eclipse.mylyn.pde-feature/.project
deleted file mode 100644
index 0eac22e..0000000
--- a/org.eclipse.mylyn.pde-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.pde-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.pde-feature/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.pde-feature/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1314ffa..0000000
--- a/org.eclipse.mylyn.pde-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.pde-feature/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.pde-feature/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.pde-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) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.pde-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.pde-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 4c9ebcf..0000000
--- a/org.eclipse.mylyn.pde-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:51 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.pde-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.pde-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 992908d..0000000
--- a/org.eclipse.mylyn.pde-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Dec 20 14:12:43 PST 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.pde-feature/about.html b/org.eclipse.mylyn.pde-feature/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.pde-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.pde-feature/build.properties b/org.eclipse.mylyn.pde-feature/build.properties
deleted file mode 100644
index dcaa2fa..0000000
--- a/org.eclipse.mylyn.pde-feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.properties,\
-               feature.xml,\
-               epl-v10.html,\
-               license.html,\
-               about.html
-src.includes = about.html
diff --git a/org.eclipse.mylyn.pde-feature/epl-v10.html b/org.eclipse.mylyn.pde-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.mylyn.pde-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.pde-feature/feature.properties b/org.eclipse.mylyn.pde-feature/feature.properties
deleted file mode 100644
index 1187583..0000000
--- a/org.eclipse.mylyn.pde-feature/feature.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-featureName=Mylyn Bridge: Plug-in Development
-description=Mylyn Task-Focused UI extensions for PDE, Ant, Team Support and CVS.
-providerName=Eclipse Mylyn
-copyright=Copyright (c) 2004, 2008 Tasktop Technologies and others. All rights reserved.
-updateSiteName=Mylyn for Eclipse 3.4
-license=\
-Eclipse Foundation Software User Agreement\n\
-\n\
-March 17, 2005\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). 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.\n\
-Applicable Licenses\n\
-\n\
-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 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS modules ("Modules") and made available as downloadable archives ("Downloads").\n\
-\n\
-    * Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
-    * Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java\u2122 ARchive) in a directory named "plugins".\n\
-    * 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 "features". Within a Feature, files named "feature.xml" may contain a list of the names and version 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 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 contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module 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 Eclipse Update Manager, you must agree to a license ("Feature Update License") 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 "license" property of files named "feature.properties" 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.\n\
-\n\
-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):\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\
-    * IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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 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.\n\
-Cryptography\n\
-\n\
-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&apos;s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
diff --git a/org.eclipse.mylyn.pde-feature/feature.xml b/org.eclipse.mylyn.pde-feature/feature.xml
deleted file mode 100644
index e2119b3..0000000
--- a/org.eclipse.mylyn.pde-feature/feature.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.mylyn.pde_feature"
-      label="%featureName"
-      version="3.2.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>
-
-   <requires>
-      <import plugin="org.eclipse.ui" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.pde.ui" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.pde.api.tools.ui"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.mylyn.java.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.junit"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.mylyn.context.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.context.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.ide.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.monitor.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.resources.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.monitor.core" version="3.0.0" match="compatible"/>
-      <import feature="org.eclipse.mylyn.java_feature" version="3.2.0.qualifier" match="perfect"/>
-      <import feature="org.eclipse.pde" version="3.4.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.mylyn.pde.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.mylyn.pde-feature/license.html b/org.eclipse.mylyn.pde-feature/license.html
deleted file mode 100644
index 15a10cf..0000000
--- a/org.eclipse.mylyn.pde-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">

-<title>Eclipse.org Software User Agreement</title>

-</head>

-

-<body lang="EN-US" link=blue vlink=purple>

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>March 17, 2005</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.org CVS repository (&quot;Repository&quot;) in CVS

-   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 Eclipse Update Manager, 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>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</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>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>

-   

-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   

-</body>

-</html>

diff --git a/org.eclipse.mylyn.pde.ui/.classpath b/org.eclipse.mylyn.pde.ui/.classpath
deleted file mode 100644
index 30862ad..0000000
--- a/org.eclipse.mylyn.pde.ui/.classpath
+++ /dev/null
@@ -1,14 +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">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/core/internal/resources/*"/>
-			<accessrule kind="accessible" pattern="org/eclipse/search/internal/ui/text/*"/>
-			<accessrule kind="accessible" pattern="org/eclipse/pde/internal/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/views/markers/internal/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.pde.ui/.cvsignore b/org.eclipse.mylyn.pde.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.pde.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.pde.ui/.project b/org.eclipse.mylyn.pde.ui/.project
deleted file mode 100644
index 3ae6195..0000000
--- a/org.eclipse.mylyn.pde.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.pde.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.pde.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.pde.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.pde.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.pde.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.pde.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.pde.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.pde.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.pde.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.pde.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.pde.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.pde.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.pde.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.pde.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.pde.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.pde.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.pde.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index a1b2769..0000000
--- a/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.pde.ui;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.forms,
- org.eclipse.jface.text,
- org.eclipse.ui.ide,
- org.eclipse.pde.ui;bundle-version="3.4.0",
- org.eclipse.pde.api.tools.ui,
- org.eclipse.debug.ui,
- org.eclipse.ui.editors,
- org.eclipse.search,
- org.eclipse.jdt.core,
- org.eclipse.mylyn.java.ui,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.junit,
- org.eclipse.jdt.debug.ui,
- org.eclipse.jdt.ui,
- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.ide.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.java.ui;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.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.resources.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)"
-Bundle-Activator: org.eclipse.mylyn.internal.pde.ui.PdeUiBridgePlugin
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Export-Package: org.eclipse.mylyn.internal.pde.ui;x-internal:=true,
- org.eclipse.mylyn.internal.pde.ui.junit;x-internal:=true
-Bundle-Localization: plugin
-
diff --git a/org.eclipse.mylyn.pde.ui/about.html b/org.eclipse.mylyn.pde.ui/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.pde.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.pde.ui/build.properties b/org.eclipse.mylyn.pde.ui/build.properties
deleted file mode 100644
index 96a5bea..0000000
--- a/org.eclipse.mylyn.pde.ui/build.properties
+++ /dev/null
@@ -1,18 +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/,\
-               .,\
-               src/,\
-               plugin.xml,\
-               icons/,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
diff --git a/org.eclipse.mylyn.pde.ui/icons/elcl16/edge-ref-xml.gif b/org.eclipse.mylyn.pde.ui/icons/elcl16/edge-ref-xml.gif
deleted file mode 100644
index 38bf351..0000000
--- a/org.eclipse.mylyn.pde.ui/icons/elcl16/edge-ref-xml.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.pde.ui/icons/elcl16/file-xml.gif b/org.eclipse.mylyn.pde.ui/icons/elcl16/file-xml.gif
deleted file mode 100644
index 8af38f9..0000000
--- a/org.eclipse.mylyn.pde.ui/icons/elcl16/file-xml.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.pde.ui/icons/elcl16/focus-disabled.gif b/org.eclipse.mylyn.pde.ui/icons/elcl16/focus-disabled.gif
deleted file mode 100644
index 24bbeae..0000000
--- a/org.eclipse.mylyn.pde.ui/icons/elcl16/focus-disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.pde.ui/icons/elcl16/focus.gif b/org.eclipse.mylyn.pde.ui/icons/elcl16/focus.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.pde.ui/icons/elcl16/focus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.pde.ui/icons/elcl16/interest-decrease.gif b/org.eclipse.mylyn.pde.ui/icons/elcl16/interest-decrease.gif
deleted file mode 100644
index 645a58f..0000000
--- a/org.eclipse.mylyn.pde.ui/icons/elcl16/interest-decrease.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.pde.ui/icons/elcl16/interest-increase.gif b/org.eclipse.mylyn.pde.ui/icons/elcl16/interest-increase.gif
deleted file mode 100644
index 98a2586..0000000
--- a/org.eclipse.mylyn.pde.ui/icons/elcl16/interest-increase.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.pde.ui/plugin.properties b/org.eclipse.mylyn.pde.ui/plugin.properties
deleted file mode 100644
index 6aeb550..0000000
--- a/org.eclipse.mylyn.pde.ui/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#Properties file for org.eclipse.mylyn.pde.ui
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn PDE Bridge
-
-javaCompletionProposalComputer.name = PDE API Tools Proposals (Focused)
-
-bridges.activeSearchLabel=XML Search
-PdeStructureBridge.name = PDE Structure Bridge
-
-TaskContextPdeJUnitLaunchConfiguration.name = Task Context Plug-in Test
-TaskContextPdeJUnitTabGroup.description = Test suite automatically populated by elements in the task context.
diff --git a/org.eclipse.mylyn.pde.ui/plugin.xml b/org.eclipse.mylyn.pde.ui/plugin.xml
deleted file mode 100644
index 891461f..0000000
--- a/org.eclipse.mylyn.pde.ui/plugin.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin> 
-
-   <extension point="org.eclipse.mylyn.context.ui.bridges">
-    <uiBridge
-          class="org.eclipse.mylyn.internal.pde.ui.PdeUiBridge"
-          contentType="plugin.xml"
-          activeSearchIcon="icons/elcl16/edge-ref-xml.gif"
-	      activeSearchLabel="%bridges.activeSearchLabel"/>
-  </extension>
-   <extension
-         point="org.eclipse.mylyn.context.ui.startup">
-      <startup
-            class="org.eclipse.mylyn.internal.pde.ui.PdeUiBridgePlugin$PdeUiBrideStartup">
-      </startup>
-   </extension>
-
-   	<extension point="org.eclipse.mylyn.context.core.bridges">
-		<structureBridge
-	        class="org.eclipse.mylyn.internal.pde.ui.PdeStructureBridge"
-	        name="%PdeStructureBridge.name"
-	        parentContentType="resource"/>
-	</extension>
-	
-	
-    <extension
-         id="apitools_javadoc_proposals"
-         name="%javaCompletionProposalComputer.name"
-         point="org.eclipse.jdt.ui.javaCompletionProposalComputer">
-      <javaCompletionProposalComputer
-            activate="true"
-            categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory"
-            class="org.eclipse.mylyn.internal.pde.ui.FocusedApiToolsJavadocCompletionProposalComputer">
-         <partition
-               type="__java_javadoc">
-         </partition>
-      </javaCompletionProposalComputer>
-   	</extension>
-	
-	
-	<extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-            name="%TaskContextPdeJUnitLaunchConfiguration.name"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer"
-            delegate="org.eclipse.mylyn.internal.pde.ui.junit.TaskContextPdeJUnitLaunchConfiguration"
-            modes="run, debug"
-            id="org.eclipse.mylyn.pde.junit.launchconfig">
-      </launchConfigurationType>
-    </extension>
-
-	<extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="org.eclipse.mylyn.pde.junit.launchconfig"
-            helpContextId="org.eclipse.jdt.junit.junit_tab_group"
-            class="org.eclipse.mylyn.internal.pde.ui.junit.TaskContextPdeJUnitTabGroup"
-            id="org.eclipse.mylyn.pde.junit.launchconfig.tabgroup">
-         <launchMode
-               perspective="org.eclipse.debug.ui.DebugPerspective"
-               description="%TaskContextPdeJUnitTabGroup.description"
-               mode="debug">
-         </launchMode>
-         <launchMode
-               description="%TaskContextPdeJUnitTabGroup.description"
-               mode="run">
-         </launchMode>
-      </launchConfigurationTabGroup>
-    </extension>	
-
-</plugin>
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/FocusedApiToolsJavadocCompletionProposalComputer.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/FocusedApiToolsJavadocCompletionProposalComputer.java
deleted file mode 100644
index 64e3e35..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/FocusedApiToolsJavadocCompletionProposalComputer.java
+++ /dev/null
@@ -1,46 +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.pde.ui;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
-import org.eclipse.mylyn.internal.java.ui.JavaUiUtil;
-import org.eclipse.pde.api.tools.ui.internal.completion.APIToolsJavadocCompletionProposalComputer;
-
-/**
- * Legacy computer that support API tooling content assist on Eclipse 3.4.
- * 
- * @author Steffen Pingel
- */
-// TODO e3.5 remove this class
-@SuppressWarnings("restriction")
-public class FocusedApiToolsJavadocCompletionProposalComputer extends APIToolsJavadocCompletionProposalComputer {
-
-	private static final String ASSIST_API_TOOLS = "org.eclipse.pde.api.tools.ui.apitools_proposal_category"; //$NON-NLS-1$
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public List computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) {
-		if (JavaUiUtil.getProposalCategory(ASSIST_API_TOOLS) == null
-				&& !JavaUiUtil.isDefaultAssistActive(JavaUiUtil.ASSIST_JDT_NOTYPE)) {
-			// on Eclipse 3.4 this was part of javaNoTypeProposalCategory, only return results if that is not enabled to avoid duplicates 
-			return super.computeCompletionProposals(context, monitor);
-		} else {
-			// on Eclipse 3.5 this is a separate computer contributed by API tooling, don't do anything in that case
-			return Collections.emptyList();
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/Messages.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/Messages.java
deleted file mode 100644
index 5dda055..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/Messages.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.pde.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.pde.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 PdeContextLabelProvider_referenced_by;
-
-	public static String XmlJavaRelationProvider_Skipped_XML_search;
-}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeContextLabelProvider.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeContextLabelProvider.java
deleted file mode 100644
index 5fa6977..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeContextLabelProvider.java
+++ /dev/null
@@ -1,62 +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.pde.ui;
-
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-import org.eclipse.mylyn.internal.context.ui.AbstractContextLabelProvider;
-import org.eclipse.mylyn.internal.context.ui.ContextUiImages;
-import org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public class PdeContextLabelProvider extends AbstractContextLabelProvider {
-
-	public static final String LABEL_RELATION = Messages.PdeContextLabelProvider_referenced_by;
-
-	@Override
-	protected Image getImage(IInteractionElement node) {
-		return ContextUiImages.getImage(ContextUiImages.FILE_XML);
-	}
-
-	@Override
-	protected Image getImage(IInteractionRelation edge) {
-		return ContextUiImages.getImage(IdeUiBridgePlugin.EDGE_REF_XML);
-	}
-
-	@Override
-	protected String getText(IInteractionElement node) {
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(PdeStructureBridge.CONTENT_TYPE);
-		return bridge.getLabel(bridge.getObjectForHandle(node.getHandleIdentifier()));
-	}
-
-	@Override
-	protected String getText(IInteractionRelation edge) {
-		return LABEL_RELATION;
-	}
-
-	@Override
-	protected Image getImageForObject(Object object) {
-		return ContextUiImages.getImage(ContextUiImages.FILE_XML);
-	}
-
-	@Override
-	protected String getTextForObject(Object object) {
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(PdeStructureBridge.CONTENT_TYPE);
-		return bridge.getLabel(object);
-	}
-}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java
deleted file mode 100644
index a6f79a9..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeEditingMonitor.java
+++ /dev/null
@@ -1,287 +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.pde.ui;
-
-import java.util.Locale;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.ide.ui.XmlNodeHelper;
-import org.eclipse.mylyn.monitor.ui.AbstractUserInteractionMonitor;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.internal.core.plugin.ImportObject;
-import org.eclipse.pde.internal.core.text.IDocumentAttributeNode;
-import org.eclipse.pde.internal.core.text.IDocumentElementNode;
-import org.eclipse.pde.internal.core.text.plugin.PluginModel;
-import org.eclipse.pde.internal.core.text.plugin.PluginObjectNode;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestSourcePage;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * @author Shawn Minto
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public class PdeEditingMonitor extends AbstractUserInteractionMonitor {
-
-	public PdeEditingMonitor() {
-		super();
-	}
-
-	@Override
-	protected void handleWorkbenchPartSelection(IWorkbenchPart part, ISelection selection, boolean contributeToContext) {
-		if (part instanceof ManifestEditor) {
-			TextSelection textSelection = null;
-			IEditorInput in = null;
-
-			// assume that we are editing an xml file due to the editor used
-			// this is the plugin.xml editor
-
-			ManifestEditor editor = (ManifestEditor) part;
-
-			// fix bug when user is looking in the cvs repository since the
-			// input
-			// is not a FileEditorInput
-			if (!(editor.getEditorInput() instanceof FileEditorInput)) {
-				return;
-			}
-
-			// make sure that the selection is a text selection
-			if (!(editor.getSelection() instanceof TextSelection || editor.getSelection() instanceof StructuredSelection)) {
-				return;
-			} else if (editor.getSelection() instanceof StructuredSelection) {
-				StructuredSelection s = (StructuredSelection) editor.getSelection();
-				if (s.getFirstElement() instanceof PluginObjectNode) {
-					PluginObjectNode n = (PluginObjectNode) s.getFirstElement();
-					textSelection = new TextSelection(n.getOffset(), n.getLength());
-				} else if (s.getFirstElement() instanceof ImportObject) {
-					ImportObject io = (ImportObject) s.getFirstElement();
-					if (io.getImport() instanceof PluginObjectNode) {
-						PluginObjectNode n = (PluginObjectNode) io.getImport();
-						textSelection = new TextSelection(n.getOffset(), n.getLength());
-					}
-				} else {
-					return;
-				}
-			} else {
-				// get the selection and the editor input
-				textSelection = (TextSelection) editor.getSelection();
-			}
-			in = editor.getEditorInput();
-
-			// check if we have a text selection
-			if (textSelection != null) {
-				try {
-
-					// get the node for the selection
-					int offset = textSelection.getOffset();
-					PluginObjectNode node = getNode(editor, offset, false);
-
-					if (node != null) {
-						FileEditorInput fei = (FileEditorInput) in;
-
-						// fix a bug when there is a selection and the editor
-						// input is the manifest.mf file
-						// not the plugin.xml
-						if (fei.getFile().getFullPath().toString().toLowerCase(Locale.ENGLISH).endsWith("/manifest.mf")) { //$NON-NLS-1$
-							return;
-						}
-
-						String nodeString = getStringOfNode(node);
-						if (nodeString == null) {
-							return;
-						}
-
-						// create the helper to get the handle for the node
-						XmlNodeHelper xnode = new XmlNodeHelper(fei.getFile().getFullPath().toString(),
-								nodeString.hashCode());
-
-						// get the name for the node
-//						String name = node.getXMLAttributeValue("name");
-//						if (name == null)
-//							name = node.getXMLTagName();
-						super.handleElementSelection(part, xnode, contributeToContext);
-					}
-				} catch (Exception e) {
-					StatusHandler.log(new Status(IStatus.ERROR, PdeUiBridgePlugin.ID_PLUGIN,
-							"Could not resolve selection", e)); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	public static String getStringOfNode(IDocumentElementNode node) {
-		if (node == null) {
-			return null;
-		}
-		String s = node.getXMLTagName();
-		for (IDocumentAttributeNode a : node.getNodeAttributes()) {
-			s += a.getAttributeName() + "=" + a.getAttributeValue(); //$NON-NLS-1$
-		}
-		return s;
-	}
-
-	/**
-	 * COPIED FROM ManifestSourcePage - from a getRangeElement body
-	 */
-	public static PluginObjectNode getNode(ManifestEditor editor, int offset, boolean hashCode) {
-		ManifestSourcePage page = (ManifestSourcePage) editor.findPage("plugin-context"); //$NON-NLS-1$
-		if (page != null) {
-			IPluginModelBase model = (IPluginModelBase) page.getInputContext().getModel();
-			PluginObjectNode node = (PluginObjectNode) PdeEditingMonitor.findNode(model.getPluginBase().getLibraries(),
-					offset, hashCode);
-			if (node == null) {
-				node = (PluginObjectNode) PdeEditingMonitor.findNode(model.getPluginBase().getImports(), offset,
-						hashCode);
-			}
-			if (node == null) {
-				node = (PluginObjectNode) PdeEditingMonitor.findNode(model.getPluginBase().getExtensionPoints(),
-						offset, hashCode);
-			}
-			if (node == null) {
-				node = (PluginObjectNode) PdeEditingMonitor.findNode(model.getPluginBase().getExtensions(), offset,
-						hashCode);
-			}
-			if (node == null) {
-				node = (PluginObjectNode) PdeEditingMonitor.findNode(new IPluginObject[] { model.getPluginBase() },
-						offset, hashCode);
-			}
-			return node;
-		}
-		return null;
-	}
-
-	public static PluginObjectNode getNode(IDocument d, IFile f, int num, boolean hashCode) throws CoreException {
-		PluginModel model = new PluginModel(d, true);
-		model.setUnderlyingResource(f);
-		if (!model.isLoaded()) {
-			model.load();
-			model.setEnabled(true);
-		}
-
-		PluginObjectNode node = (PluginObjectNode) PdeEditingMonitor.findNode(model.getPluginBase().getLibraries(),
-				num, hashCode);
-		if (node == null) {
-			node = (PluginObjectNode) PdeEditingMonitor.findNode(model.getPluginBase().getImports(), num, hashCode);
-		}
-		if (node == null) {
-			node = (PluginObjectNode) PdeEditingMonitor.findNode(model.getPluginBase().getExtensionPoints(), num,
-					hashCode);
-		}
-		if (node == null) {
-			node = (PluginObjectNode) PdeEditingMonitor.findNode(model.getPluginBase().getExtensions(), num, hashCode);
-		}
-		if (node == null) {
-			node = (PluginObjectNode) PdeEditingMonitor.findNode(new IPluginObject[] { model.getPluginBase() }, num,
-					hashCode);
-		}
-		return node;
-	}
-
-	/**
-	 * COPIED FROM ManifestSourcePage
-	 */
-	private static IDocumentElementNode findNode(IPluginObject[] nodes, int offset, boolean hashCode) {
-		for (IPluginObject node3 : nodes) {
-			IDocumentElementNode node = (IDocumentElementNode) node3;
-			IDocumentElementNode[] children = node.getChildNodes();
-
-			// changed region - added to check the children to make it work
-			// properly
-			IDocumentElementNode node2 = null;
-			if (children.length > 0) {
-				node2 = PdeEditingMonitor.findNode(children, offset, hashCode);
-				// end changed region
-			}
-
-			if (node2 != null && node2 instanceof IPluginObject) {
-				return node2;
-			}
-
-			if (!hashCode) {
-				if (offset >= node.getOffset() && offset < node.getOffset() + node.getLength()) {
-					return node;
-				}
-			} else {
-				if (getStringOfNode(node).hashCode() == offset) {
-					return node;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Copy of previous, taking different arguments
-	 */
-	private static IDocumentElementNode findNode(IDocumentElementNode[] nodes, int offset, boolean hashCode) {
-		for (IDocumentElementNode node : nodes) {
-			IDocumentElementNode[] children = node.getChildNodes();
-			IDocumentElementNode node2 = null;
-			if (children.length > 0) {
-				node2 = PdeEditingMonitor.findNode(children, offset, hashCode);
-			}
-			if (node2 != null) {
-				return node2;
-			}
-
-			if (!hashCode) {
-				if (offset >= node.getOffset() && offset < node.getOffset() + node.getLength()) {
-					return node;
-				}
-			} else {
-				if (getStringOfNode(node).hashCode() == offset) {
-					return node;
-				}
-			}
-		}
-		return null;
-	}
-}
-
-// XXX used if we support the xmen editor
-// if (part instanceof XMLTextEditor) {
-// XMLTextEditor editor = (XMLTextEditor)part;
-// TextSelection textSelection =
-// (TextSelection)editor.getSelectionProvider().getSelection();
-// if (textSelection != null) {
-//
-// try{
-// // get the model for the xml elements
-// XMLReconciler rec = editor.getModel();
-//                    
-// int start = textSelection.getStartLine();
-// int end = textSelection.getEndLine();
-//                    
-// // get the node that was selected
-// XMLNode node = rec.getNodeFromLine(start);
-//                    
-// ContextCorePlugin.getTaskscapeManager().handleElementSelected(
-// node.getHandle(), node.getCanName(),
-// IDegreeOfInterest.Value.Selections,
-// ITaskscapeNode.Kind.XML);
-//                              
-// }catch(Exception e){
-// //handle properly
-// }
-// }
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeStructureBridge.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeStructureBridge.java
deleted file mode 100644
index 21ce4bf..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeStructureBridge.java
+++ /dev/null
@@ -1,361 +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.pde.ui;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.internal.resources.File;
-import org.eclipse.core.internal.resources.Marker;
-import org.eclipse.core.internal.resources.Workspace;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-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.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.ide.ui.XmlNodeHelper;
-import org.eclipse.pde.internal.core.text.build.BuildEntry;
-import org.eclipse.pde.internal.core.text.plugin.PluginNode;
-import org.eclipse.pde.internal.core.text.plugin.PluginObjectNode;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.markers.internal.ConcreteMarker;
-
-/**
- * @author Mik Kersten
- * 
- */
-@SuppressWarnings("restriction")
-public class PdeStructureBridge extends AbstractContextStructureBridge {
-
-	public final static String CONTENT_TYPE = "plugin.xml"; //$NON-NLS-1$
-
-	@Override
-	public String getContentType() {
-		return CONTENT_TYPE;
-	}
-
-	@Override
-	public String getContentType(String elementHandle) {
-		if (elementHandle.endsWith(".xml")) { //$NON-NLS-1$
-			return parentContentType;
-		} else {
-			return CONTENT_TYPE;
-		}
-	}
-
-	@Override
-	public List<String> getChildHandles(String handle) {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public String getParentHandle(String handle) {
-		// we can only get the parent if we have a PluginObjectNode
-
-		Object object = getObjectForHandle(handle);
-		if (object instanceof PluginObjectNode) {
-			PluginObjectNode parent = (PluginObjectNode) ((PluginObjectNode) object).getParentNode();
-			if (parent != null) {
-				return getHandleIdentifier(parent);
-			} else {
-				// the parent is the plugin.xml file, so return that handle
-				int delimeterIndex = handle.indexOf(";"); //$NON-NLS-1$
-				if (delimeterIndex != -1) {
-					String parentHandle = handle.substring(0, delimeterIndex);
-					return parentHandle;
-				} else {
-					return null;
-				}
-			}
-		} else if (object instanceof PluginNode) {
-			PluginNode parent = (PluginNode) ((PluginNode) object).getParentNode();
-			if (parent != null) {
-				return getHandleIdentifier(parent);
-			} else {
-				// the parent is the plugin.xml file, so return that handle
-				int delimeterIndex = handle.indexOf(";"); //$NON-NLS-1$
-				if (delimeterIndex != -1) {
-					String parentHandle = handle.substring(0, delimeterIndex);
-					return parentHandle;
-				} else {
-					return null;
-				}
-			}
-		} else if (object instanceof IFile) {
-			// String fileHandle = parentBridge.getParentHandle(handle);
-			AbstractContextStructureBridge parentBridge = ContextCore.getStructureBridge(parentContentType);
-			return parentBridge.getParentHandle(handle);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.context.core.AbstractContextStructureBridge#getObjectForHandle(java.lang.String)
-	 */
-	@Override
-	public Object getObjectForHandle(String handle) {
-		if (handle == null) {
-			return null;
-		}
-		int first = handle.indexOf(";"); //$NON-NLS-1$
-		String filename = ""; //$NON-NLS-1$
-		if (first == -1) {
-			AbstractContextStructureBridge parentBridge = ContextCore.getStructureBridge(parentContentType);
-			return parentBridge.getObjectForHandle(handle);
-		} else {
-			// extract the filename from the handle since it represents a node
-			filename = handle.substring(0, first);
-		}
-
-		try {
-			// get the file and create a FileEditorInput
-			IPath path = new Path(filename);
-			IFile f = (IFile) ((Workspace) ResourcesPlugin.getWorkspace()).newResource(path, IResource.FILE);
-
-			// get the start line for the element
-			int start = Integer.parseInt(handle.substring(first + 1));
-
-			// // get the content and the document so that we can get the offset
-			// String content = XmlNodeHelper.getContents(f.getContents());
-			// IDocument d = new Document(content);
-
-			// get the offsets for the element
-			// make sure that we are on a character and not whitespace
-			// int offset = d.getLineOffset(start);
-			// while(d.getChar(offset) == ' ')
-			// offset++;
-
-			// get the current editor which should be the ManifestEditor so that
-			// we can get the element that we want
-			IEditorPart editorPart = null;
-			try {
-				editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-			} catch (NullPointerException e) {
-				// do nothing, this just means that there is no active page
-			}
-			if (editorPart != null && editorPart instanceof ManifestEditor) {
-				PluginObjectNode node = PdeEditingMonitor.getNode((ManifestEditor) editorPart, start, true);
-				// get the element based on the offset
-				return node;
-			} else {
-				String content = XmlNodeHelper.getContents(f.getContents());
-				IDocument d = new Document(content);
-				PluginObjectNode node = PdeEditingMonitor.getNode(d, f, start, true);
-				return node;
-			}
-		} catch (Exception e) {
-			// ignore, means file doesn't exist
-			// ContextCorePlugin.log(e, "handle failed");
-		}
-		return null;
-	}
-
-	/**
-	 * Handle is filename;hashcodeOfElementAndAttributes
-	 * 
-	 * @see org.eclipse.mylyn.context.core.AbstractContextStructureBridge#getHandleIdentifier(java.lang.Object)
-	 */
-	@Override
-	public String getHandleIdentifier(Object object) {
-		// we can only create handles for PluginObjectNodes and plugin.xml files
-		if (object instanceof XmlNodeHelper) {
-			return ((XmlNodeHelper) object).getHandle();
-		} else if (object instanceof PluginObjectNode) {
-			PluginObjectNode node = (PluginObjectNode) object;
-			try {
-				// get the handle for the PluginObjectNode
-				if (node.getModel() == null || node.getModel().getUnderlyingResource() == null
-						|| node.getModel().getUnderlyingResource().getFullPath() == null) {
-					// ContextCorePlugin.log("PDE xml node's resource or model is
-					// null: " + node.getName(), this);
-					return null;
-				}
-				IPath path = new Path(node.getModel().getUnderlyingResource().getFullPath().toString());
-				IFile file = (IFile) ((Workspace) ResourcesPlugin.getWorkspace()).newResource(path, IResource.FILE);
-				String handle = new XmlNodeHelper(file.getFullPath().toString(),
-						PdeEditingMonitor.getStringOfNode(node).hashCode()).getHandle();
-				return handle;
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, PdeUiBridgePlugin.ID_PLUGIN, "Could not get handle", e)); //$NON-NLS-1$
-			}
-		} else if (object instanceof PluginNode) {
-			PluginNode node = (PluginNode) object;
-			try {
-				if (node.getModel() == null || node.getModel().getUnderlyingResource() == null
-						|| node.getModel().getUnderlyingResource().getFullPath() == null) {
-					// ContextCorePlugin.log("PDE xml node's resource or model is
-					// null: " + node.getName(), this);
-					return null;
-				}
-				IPath path = new Path(node.getModel().getUnderlyingResource().getFullPath().toString());
-				IFile file = (IFile) ((Workspace) ResourcesPlugin.getWorkspace()).newResource(path, IResource.FILE);
-				String handle = new XmlNodeHelper(file.getFullPath().toString(),
-						PdeEditingMonitor.getStringOfNode(node).hashCode()).getHandle();
-				return handle;
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, PdeUiBridgePlugin.ID_PLUGIN, "Could not get handle", e)); //$NON-NLS-1$
-			}
-
-		} else if (object instanceof File) {
-			// get the handle for the file if it is plugin.xml
-			File file = (File) object;
-			if (file.getFullPath().toString().endsWith("plugin.xml")) { //$NON-NLS-1$
-				return file.getFullPath().toString();
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public String getLabel(Object object) {
-		if (object instanceof PluginObjectNode) {
-			PluginObjectNode node = (PluginObjectNode) object;
-			String name = node.getXMLAttributeValue("name"); //$NON-NLS-1$
-			if (name == null) {
-				name = node.getXMLTagName();
-			}
-			name = node.getModel().getUnderlyingResource().getName() + ": " + name; //$NON-NLS-1$
-			return name;
-		} else if (object instanceof File) {
-			File file = (File) object;
-			if (file.getFullPath().toString().endsWith("plugin.xml")) { //$NON-NLS-1$
-				return "plugin.xml"; //$NON-NLS-1$
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * TODO: make a non-handle based test
-	 */
-	@Override
-	public boolean canBeLandmark(String handle) {
-		if (handle == null) {
-			return false;
-		} else {
-			return handle.indexOf(';') == -1;
-		}
-	}
-
-	@Override
-	public boolean acceptsObject(Object object) {
-		// we only accept PluginObjectNodes and plugin.xml Files
-		if (object instanceof PluginNode || object instanceof PluginObjectNode || object instanceof BuildEntry
-				|| object instanceof PDEFormPage) {
-			return true;
-		} else if (object instanceof XmlNodeHelper) {
-			if (((XmlNodeHelper) object).getFilename().endsWith("plugin.xml")) { //$NON-NLS-1$
-				return true;
-			}
-		} else if (object instanceof File) {
-			File file = (File) object;
-			if (file.getFullPath().toString().endsWith("plugin.xml")) { //$NON-NLS-1$
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean canFilter(Object element) {
-		return true;
-	}
-
-	@Override
-	public boolean isDocument(String handle) {
-		return handle.indexOf(';') == -1;
-	}
-
-	@Override
-	public String getHandleForOffsetInObject(Object object, int offset) {
-		if (object == null) {
-			return null;
-		}
-
-		IResource markerResource = null;
-		try {
-			if (object instanceof ConcreteMarker) {
-				markerResource = ((ConcreteMarker) object).getMarker().getResource();
-			} else if (object instanceof Marker) {
-				markerResource = ((Marker) object).getResource();
-			}
-		} catch (Exception e) {
-			return null;
-		}
-
-		if (markerResource != null) {
-			// we can only get a handle for a marker with the resource
-			// plugin.xml
-			try {
-				if (markerResource instanceof IFile) {
-					IFile file = (IFile) markerResource;
-					if (file.getFullPath().toString().endsWith("plugin.xml")) { //$NON-NLS-1$
-						return file.getFullPath().toString();
-					} else {
-						return null;
-					}
-				}
-				return null;
-			} catch (Throwable t) {
-				StatusHandler.log(new Status(IStatus.WARNING, PdeUiBridgePlugin.ID_PLUGIN,
-						"Could not find element for: " + object)); //$NON-NLS-1$
-				return null;
-			}
-		} else if (object instanceof IFile) {
-			try {
-				IFile file = (IFile) object;
-				if (file.getFullPath().toString().endsWith("plugin.xml")) { //$NON-NLS-1$
-					String content = XmlNodeHelper.getContents(file.getContents());
-					IDocument d = new Document(content);
-					PluginObjectNode node = PdeEditingMonitor.getNode(d, file, offset, false);
-					String handle = new XmlNodeHelper(file.getFullPath().toString(), PdeEditingMonitor.getStringOfNode(
-							node).hashCode()).getHandle();
-					return handle;
-				}
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, PdeUiBridgePlugin.ID_PLUGIN,
-						"Unable to get handle for offset in object", e)); //$NON-NLS-1$
-			}
-		}
-		return null;
-	}
-
-//	public IProject getProjectForObject(Object object) {
-//		while (!(object instanceof IFile)) {
-//			String handle = getParentHandle(getHandleIdentifier(object));
-//			if (handle == null)
-//				break;
-//			object = getObjectForHandle(handle);
-//		}
-//		if (object instanceof IFile && acceptsObject(object)) {
-//			return ((IFile) object).getProject();
-//		}
-//		return null;
-//	}
-
-	public boolean containsProblem(IInteractionElement node) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeUiBridge.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeUiBridge.java
deleted file mode 100644
index 89fcd4b..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeUiBridge.java
+++ /dev/null
@@ -1,313 +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.pde.ui;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.internal.resources.Workspace;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ITreeViewerListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeExpansionEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.pde.internal.core.text.plugin.PluginObjectNode;
-import org.eclipse.pde.internal.ui.editor.FormOutlinePage;
-import org.eclipse.pde.internal.ui.editor.ISortableContentOutlinePage;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-import org.eclipse.pde.internal.ui.editor.SourceOutlinePage;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.pde.internal.ui.editor.plugin.PluginInputContext;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- */
-public class PdeUiBridge extends AbstractContextUiBridge {
-
-	private final TreeViewerListener treeSelectionChangedListener;
-
-	public PdeUiBridge() {
-		treeSelectionChangedListener = new TreeViewerListener();
-	}
-
-	/**
-	 * @see org.eclipse.mylyn.context.ui.AbstractContextUiBridge#open(org.eclipse.mylyn.context.core.IInteractionElement)
-	 */
-	@Override
-	public void open(IInteractionElement node) {
-		// get the handle of the node
-		String handle = node.getHandleIdentifier();
-
-		int first = handle.indexOf(";"); //$NON-NLS-1$
-		String filename = ""; //$NON-NLS-1$
-		if (first == -1) {
-			filename = handle;
-		} else {
-			filename = handle.substring(0, first);
-		}
-
-		try {
-			// get the file
-			IPath path = new Path(filename);
-			IFile f = (IFile) ((Workspace) ResourcesPlugin.getWorkspace()).newResource(path, IResource.FILE);
-
-			// open the xml file looking at the proper line
-			IEditorPart editor = openInEditor(f, true);
-
-			// if the editor is null, we had a problem and should return
-			if (editor == null) {
-				StatusHandler.log(new Status(IStatus.WARNING, PdeUiBridgePlugin.ID_PLUGIN,
-						"Unable to open editor for file: " + filename)); //$NON-NLS-1$
-				return;
-			}
-
-			// get the contents and create a new document so that we can get
-			// the offsets to highlight
-			// String content = XmlNodeHelper.getContents(f.getContents());
-			//            
-			// IDocument d = new Document(content);
-
-			// if(first != -1){
-			// int start = Integer.parseInt(handle.substring(first + 1));
-			//                
-			// // get the offsets for the element
-			// int startOffset = d.getLineOffset(start);
-			// int length = 0;
-			//                
-			// // set the selection if the selection provider is not null
-			// ISelectionProvider selectionProvider =
-			// editor.getEditorSite().getSelectionProvider();
-			// if(selectionProvider != null)
-			// selectionProvider.setSelection(new TextSelection(startOffset,
-			// length));
-			// }
-
-		} catch (Exception e) {
-			// ContextCorePlugin.log(e, "ERROR OPENING XML EDITOR\n" +
-			// e.getMessage());
-		}
-	}
-
-	/**
-	 * Open a file in the appropriate editor
-	 * 
-	 * @param file
-	 *            The IFile to open
-	 * @param activate
-	 *            Whether to activate the editor or not
-	 * @return The IEditorPart that the file opened in
-	 * @throws PartInitException
-	 */
-	private IEditorPart openInEditor(IFile file, boolean activate) throws PartInitException {
-		if (file != null) {
-			IWorkbenchPage p = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			if (p != null && file.exists()) {
-				IEditorPart editorPart = IDE.openEditor(p, file, activate);
-				// initializeHighlightRange(editorPart);
-				return editorPart;
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public void close(IInteractionElement node) {
-		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		if (page != null) {
-			IEditorReference[] references = page.getEditorReferences();
-			for (IEditorReference reference : references) {
-				IEditorPart part = reference.getEditor(false);
-				if (part != null) {
-					// HACK: find better way to get the filename other than the tooltip
-					if (("/" + part.getTitleToolTip()).equals(node.getHandleIdentifier())) { //$NON-NLS-1$
-						if (part instanceof FormEditor) {
-							((FormEditor) part).close(true);
-						} else if (part instanceof AbstractTextEditor) {
-							((AbstractTextEditor) part).close(true);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public boolean acceptsEditor(IEditorPart editorPart) {
-		return editorPart instanceof ManifestEditor;
-	}
-
-	/**
-	 * HACK: use a lot of reflection to get the TreeViewer
-	 */
-	@Override
-	public List<TreeViewer> getContentOutlineViewers(IEditorPart editor) {
-		if (editor instanceof PDEFormEditor) {
-			PDESourcePage sp = null;
-			List<TreeViewer> viewers = new ArrayList<TreeViewer>(2);
-			if ((sp = (PDESourcePage) ((PDEFormEditor) editor).findPage(PluginInputContext.CONTEXT_ID)) != null) {
-				ISortableContentOutlinePage page = sp.getContentOutline();
-				if (page != null && page.getControl() != null) {
-					try {
-						if (page instanceof SourceOutlinePage) {
-							// get the tree viewer for the outline
-							Class<?> clazz2 = page.getClass();
-							Field field2 = clazz2.getDeclaredField("viewer"); //$NON-NLS-1$
-							field2.setAccessible(true);
-							Object f2 = field2.get(page);
-							if (f2 != null && f2 instanceof TreeViewer) {
-								viewers.add((TreeViewer) f2);
-							}
-						}
-					} catch (Exception e) {
-						StatusHandler.log(new Status(IStatus.ERROR, PdeUiBridgePlugin.ID_PLUGIN,
-								"Failed to get tree viewers", e)); //$NON-NLS-1$
-						return null;
-					}
-				}
-			}
-
-			try {
-				// get the current page of the outline
-				Class<?> clazz = PDEFormEditor.class;
-				Field field = null;
-				try {
-					field = clazz.getDeclaredField("formOutline"); //$NON-NLS-1$
-				} catch (NoSuchFieldException e) {
-					field = clazz.getDeclaredField("fFormOutline"); //$NON-NLS-1$
-				}
-				field.setAccessible(true);
-				Object f = field.get(editor);
-				if (f != null && f instanceof FormOutlinePage) {
-					// get the tree viewer for the outline
-					Class<?> clazz2 = FormOutlinePage.class;
-					Field field2 = null;
-					try {
-						field2 = clazz2.getDeclaredField("treeViewer"); //$NON-NLS-1$
-					} catch (NoSuchFieldException e) {
-						field2 = clazz2.getDeclaredField("fTreeViewer"); //$NON-NLS-1$
-					}
-					field2.setAccessible(true);
-					Object f2 = field2.get(f);
-					if (f2 != null && f2 instanceof TreeViewer) {
-						TreeViewer treeViewer = (TreeViewer) f2;
-						viewers.add(treeViewer);
-					}
-				}
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, PdeUiBridgePlugin.ID_PLUGIN, "Could not get PDE outline", e)); //$NON-NLS-1$
-				return Collections.emptyList();
-			}
-
-			// add a listener so that when the selection changes, the view is
-			// refreshed to attempt to keep the ui model the same as the
-			// taskscape one
-			for (TreeViewer viewer : viewers) {
-				viewer.addSelectionChangedListener(treeSelectionChangedListener);
-				viewer.addTreeListener(treeSelectionChangedListener);
-			}
-
-			return viewers;
-		}
-		return Collections.emptyList();
-	}
-
-	public void refreshOutline(Object element, boolean updateLabels, boolean setSelection) {
-		IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		List<TreeViewer> treeViewers = getContentOutlineViewers(editorPart);
-		for (TreeViewer treeViewer : treeViewers) {
-			if (treeViewer != null) {
-				if (element == null) {
-					treeViewer.getControl().setRedraw(false);
-					treeViewer.refresh(true);
-					treeViewer.getControl().setRedraw(true);
-					treeViewer.expandAll();
-				} else if (element instanceof PluginObjectNode) {
-					treeViewer.getControl().setRedraw(false);
-					treeViewer.refresh(element, true);
-					treeViewer.getControl().setRedraw(true);
-					treeViewer.expandAll();
-				}
-			}
-		}
-
-	}
-
-	/**
-	 * Class to listen to the tree views to attempt to refresh them more frequently to keep the ui model consistant with
-	 * the user selections
-	 * 
-	 * @author Shawn Minto
-	 */
-	private class TreeViewerListener implements ISelectionChangedListener, ITreeViewerListener {
-		public void selectionChanged(SelectionChangedEvent event) {
-			Object o = event.getSource();
-			if (o instanceof TreeViewer) {
-				((TreeViewer) o).refresh();
-				((TreeViewer) o).expandAll();
-			}
-		}
-
-		public void treeCollapsed(TreeExpansionEvent event) {
-			Object o = event.getSource();
-			if (o instanceof TreeViewer) {
-				((TreeViewer) o).refresh();
-			}
-
-		}
-
-		public void treeExpanded(TreeExpansionEvent event) {
-			Object o = event.getSource();
-			if (o instanceof TreeViewer) {
-				((TreeViewer) o).refresh();
-			}
-		}
-	}
-
-	@Override
-	public Object getObjectForTextSelection(TextSelection selection, IEditorPart editor) {
-		return null;
-	}
-
-	@Override
-	public IInteractionElement getElement(IEditorInput input) {
-		return null;
-	}
-
-	@Override
-	public String getContentType() {
-		return PdeStructureBridge.CONTENT_TYPE;
-	}
-}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeUiBridgePlugin.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeUiBridgePlugin.java
deleted file mode 100644
index bce4002..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/PdeUiBridgePlugin.java
+++ /dev/null
@@ -1,71 +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.pde.ui;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.mylyn.context.ui.IContextUiStartup;
-import org.eclipse.mylyn.monitor.ui.MonitorUi;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class PdeUiBridgePlugin extends Plugin {
-
-	public static class PdeUiBrideStartup implements IContextUiStartup {
-
-		public void lazyStartup() {
-			PdeUiBridgePlugin.getDefault().lazyStart();
-		}
-
-	}
-
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.pde.ui"; //$NON-NLS-1$
-
-	private static PdeUiBridgePlugin INSTANCE;
-
-	public static PdeUiBridgePlugin getDefault() {
-		return INSTANCE;
-	}
-
-	private PdeEditingMonitor pdeEditingMonitor;
-
-	public PdeUiBridgePlugin() {
-	}
-
-	private void lazyStart() {
-		pdeEditingMonitor = new PdeEditingMonitor();
-		MonitorUi.getSelectionMonitors().add(pdeEditingMonitor);
-	}
-
-	private void lazyStop() {
-		if (pdeEditingMonitor != null) {
-			MonitorUi.getSelectionMonitors().remove(pdeEditingMonitor);
-		}
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		INSTANCE = this;
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		lazyStop();
-
-		super.stop(context);
-		INSTANCE = null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/XmlJavaRelationProvider.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/XmlJavaRelationProvider.java
deleted file mode 100644
index 2487917..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/XmlJavaRelationProvider.java
+++ /dev/null
@@ -1,443 +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.pde.ui;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.internal.resources.File;
-import org.eclipse.core.internal.resources.Workspace;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-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.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.AbstractRelationProvider;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.DegreeOfSeparation;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchListener;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchOperation;
-import org.eclipse.mylyn.internal.context.core.IDegreeOfSeparation;
-import org.eclipse.mylyn.internal.ide.ui.XmlNodeHelper;
-import org.eclipse.mylyn.internal.java.ui.search.XmlActiveSearchUpdater;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-import org.eclipse.search.core.text.TextSearchScope;
-import org.eclipse.search.internal.ui.text.FileSearchQuery;
-import org.eclipse.search.internal.ui.text.FileSearchResult;
-import org.eclipse.search.ui.ISearchResult;
-import org.eclipse.search.ui.text.FileTextSearchScope;
-import org.eclipse.search.ui.text.Match;
-
-/**
- * @author Shawn Minto
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public class XmlJavaRelationProvider extends AbstractRelationProvider {
-
-	public static final String SOURCE_ID = "org.eclipse.mylyn.xml.search.references"; //$NON-NLS-1$
-
-	public static final String NAME = "referenced by"; //$NON-NLS-1$
-
-	public static final int DEFAULT_DEGREE = 3;
-
-	public static final List<Job> runningJobs = new ArrayList<Job>();
-
-	public static final Map<Match, XmlNodeHelper> nodeMap = new HashMap<Match, XmlNodeHelper>();
-
-	public XmlJavaRelationProvider() {
-		// TODO: should this be a generic XML extension?
-		super(PdeStructureBridge.CONTENT_TYPE, SOURCE_ID);
-	}
-
-	@Override
-	public List<IDegreeOfSeparation> getDegreesOfSeparation() {
-		List<IDegreeOfSeparation> separations = new ArrayList<IDegreeOfSeparation>();
-		separations.add(new DegreeOfSeparation(DOS_0_LABEL, 0));
-		separations.add(new DegreeOfSeparation(DOS_1_LABEL, 1));
-		separations.add(new DegreeOfSeparation(DOS_2_LABEL, 2));
-		separations.add(new DegreeOfSeparation(DOS_3_LABEL, 3));
-		separations.add(new DegreeOfSeparation(DOS_4_LABEL, 4));
-		separations.add(new DegreeOfSeparation(DOS_5_LABEL, 5));
-		return separations;
-	}
-
-	@Override
-	protected void findRelated(final IInteractionElement node, int degreeOfSeparation) {
-		if (!node.getContentType().equals("java")) { //$NON-NLS-1$
-			return;
-		}
-		IJavaElement javaElement = JavaCore.create(node.getHandleIdentifier());
-		if (javaElement == null || javaElement instanceof ICompilationUnit || !javaElement.exists()) {
-			return;
-		}
-		if (!acceptElement(javaElement)) {
-			return;
-		}
-
-		TextSearchScope scope = createTextSearchScope(degreeOfSeparation);
-		if (scope != null) {
-			runJob(node, javaElement, degreeOfSeparation, getId());
-		}
-	}
-
-	protected TextSearchScope createTextSearchScope(int degreeOfSeparation) {
-		Set<IInteractionElement> landmarks = ContextCore.getContextManager().getActiveLandmarks();
-
-		switch (degreeOfSeparation) {
-		case 1:
-			// create a search scope for the projects of landmarks
-			Set<IResource> l = new HashSet<IResource>();
-			for (IInteractionElement landmark : landmarks) {
-				if (landmark.getContentType().equals(PdeStructureBridge.CONTENT_TYPE)) {
-					// ||
-					// landmark.getContentType().equals(AntStructureBridge.CONTENT_TYPE))
-					// {
-					String handle = landmark.getHandleIdentifier();
-					IResource element = null;
-					int first = handle.indexOf(";"); //$NON-NLS-1$
-					String filename = handle;
-					if (first != -1) {
-						filename = handle.substring(0, first);
-					}
-					try {
-						// change the file into a document
-						IPath path = new Path(filename);
-						element = ((Workspace) ResourcesPlugin.getWorkspace()).newResource(path, IResource.FILE);
-					} catch (Exception e) {
-						StatusHandler.log(new Status(IStatus.WARNING, PdeUiBridgePlugin.ID_PLUGIN,
-								"Scope creation failed", e)); //$NON-NLS-1$
-					}
-					l.add(element);
-				}
-			}
-
-			IResource[] res = new IResource[l.size()];
-			res = l.toArray(res);
-			TextSearchScope doiScope = FileTextSearchScope.newSearchScope(res,
-					new String[] { PdeStructureBridge.CONTENT_TYPE }, false);
-			return l.isEmpty() ? null : doiScope;
-		case 2:
-			// create a search scope for the projects of landmarks
-			Set<IProject> projectsToSearch = new HashSet<IProject>();
-			for (IInteractionElement landmark : landmarks) {
-				AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(landmark.getContentType());
-				IResource resource = ResourcesUiBridgePlugin.getDefault().getResourceForElement(landmark, true);
-				IProject project = null;
-				if (resource != null) {
-					project = resource.getProject();
-				} else {
-					Object object = bridge.getObjectForHandle(landmark.getHandleIdentifier());
-					if (object instanceof IJavaElement) {
-						project = ((IJavaElement) object).getJavaProject().getProject();
-					}
-				}
-				if (project != null) {
-					projectsToSearch.add(project);
-				}
-			}
-
-			res = new IProject[projectsToSearch.size()];
-			res = projectsToSearch.toArray(res);
-			TextSearchScope projScope = FileTextSearchScope.newSearchScope(res,
-					new String[] { PdeStructureBridge.CONTENT_TYPE }, false);
-
-			return projectsToSearch.isEmpty() ? null : projScope;
-		case 3:
-			// create a search scope for the workspace
-			return FileTextSearchScope.newSearchScope(new IResource[] { ResourcesPlugin.getWorkspace().getRoot() },
-					new String[] { PdeStructureBridge.CONTENT_TYPE }, false);
-		case 4:
-			// create a search scope for the workspace
-			return FileTextSearchScope.newSearchScope(new IResource[] { ResourcesPlugin.getWorkspace().getRoot() },
-					new String[] { PdeStructureBridge.CONTENT_TYPE }, false);
-		default:
-			return null;
-		}
-
-	}
-
-	protected boolean acceptElement(IJavaElement javaElement) {
-		return javaElement != null && (javaElement instanceof IMember || javaElement instanceof IType);
-	}
-
-	private void runJob(final IInteractionElement node, final IJavaElement javaElement, final int degreeOfSeparation,
-			final String kind) {
-
-		// get the fully qualified name and if it is null, don't search
-		String fullyQualifiedName = getFullyQualifiedName(javaElement);
-
-		if (fullyQualifiedName == null) {
-			return;
-		}
-
-		// Create the search query
-		final XMLSearchOperation query = (XMLSearchOperation) getSearchOperation(node, 0, degreeOfSeparation);
-		if (query != null) {
-			XMLSearchJob job = new XMLSearchJob(query.getLabel(), query);
-			query.addListener(new IActiveSearchListener() {
-
-				private boolean gathered = false;
-
-				public void searchCompleted(List<?> l) {
-					// deal with File
-					if (l.isEmpty()) {
-						return;
-					}
-
-					Map<String, String> nodes = new HashMap<String, String>();
-
-					if (l.get(0) instanceof FileSearchResult) {
-						FileSearchResult fsr = (FileSearchResult) l.get(0);
-
-						Object[] far = fsr.getElements();
-						for (Object element : far) {
-							Match[] mar = fsr.getMatches(element);
-
-							if (element instanceof File) {
-								File f = (File) element;
-
-								// change the file into a document
-								// FileEditorInput fei = new FileEditorInput(f);
-
-								for (Match m : mar) {
-									try {
-										AbstractContextStructureBridge bridge = ContextCorePlugin.getDefault()
-												.getStructureBridge(f.getName());
-										String handle = bridge.getHandleForOffsetInObject(f, m.getOffset());
-										if (handle != null) {
-											String second = handle.substring(handle.indexOf(";")); //$NON-NLS-1$
-
-											XmlNodeHelper xnode = new XmlNodeHelper(f.getFullPath().toString(), second);
-											nodeMap.put(m, xnode);
-											Object o = bridge.getObjectForHandle(handle);
-											String name = bridge.getLabel(o);
-											if (o != null) {
-												nodes.put(handle, name);
-											}
-										}
-									} catch (Exception e) {
-										StatusHandler.log(new Status(IStatus.ERROR, PdeUiBridgePlugin.ID_PLUGIN,
-												"Unable to create match", e)); //$NON-NLS-1$
-									}
-								}
-							}
-						}
-					}
-
-					for (String handle : nodes.keySet()) {
-
-						incrementInterest(node, PdeStructureBridge.CONTENT_TYPE, handle, degreeOfSeparation);
-					}
-					gathered = true;
-					XmlJavaRelationProvider.this.searchCompleted(node);
-				}
-
-				public boolean resultsGathered() {
-					return gathered;
-				}
-			});
-			runningJobs.add(job);
-			job.setPriority(Job.DECORATE - 10);
-			job.schedule();
-		}
-	}
-
-	@Override
-	public IActiveSearchOperation getSearchOperation(IInteractionElement node, int limitTo, int degreeOfSeparation) {
-		IJavaElement javaElement = JavaCore.create(node.getHandleIdentifier());
-		TextSearchScope scope = createTextSearchScope(degreeOfSeparation);
-		if (scope == null) {
-			return null;
-		}
-
-		String fullyQualifiedName = getFullyQualifiedName(javaElement);
-
-		return new XMLSearchOperation(scope, fullyQualifiedName);
-	}
-
-	private String getFullyQualifiedName(IJavaElement je) {
-		if (!(je instanceof IMember)) {
-			return null;
-		}
-
-		IMember m = (IMember) je;
-		if (m.getDeclaringType() == null) {
-			return ((IType) m).getFullyQualifiedName();
-		} else {
-			return m.getDeclaringType().getFullyQualifiedName() + "." + m.getElementName(); //$NON-NLS-1$
-		}
-	}
-
-	public static class XMLSearchJob extends Job {
-
-		private final XMLSearchOperation op;
-
-		/**
-		 * Constructor
-		 * 
-		 * @param name
-		 */
-		public XMLSearchJob(String name, XMLSearchOperation op) {
-			super(name);
-			this.op = op;
-		}
-
-		@Override
-		protected IStatus run(IProgressMonitor monitor) {
-			return op.run(monitor);
-		}
-
-	}
-
-	public static class XMLSearchOperation extends FileSearchQuery implements IActiveSearchOperation {
-
-		@Override
-		public ISearchResult getSearchResult() {
-			try {
-				// get the current page of the outline
-				Class<?> clazz = FileSearchQuery.class;
-				Field field = clazz.getDeclaredField("fResult"); //$NON-NLS-1$
-				field.setAccessible(true);
-				FileSearchResult fResult = (FileSearchResult) field.get(this);
-				if (fResult == null) {
-					fResult = new FileSearchResult(this);
-					field.set(this, fResult);
-					new XmlActiveSearchUpdater(fResult);
-				}
-				return fResult;
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.WARNING, PdeUiBridgePlugin.ID_PLUGIN,
-						"Failed to get search result: " + e.getMessage())); //$NON-NLS-1$
-			}
-			return super.getSearchResult();
-		}
-
-		@Override
-		public IStatus run(IProgressMonitor monitor) {
-			try {
-				super.run(monitor);
-				ISearchResult result = getSearchResult();
-				if (result instanceof FileSearchResult) {
-					List<Object> l = new ArrayList<Object>();
-					if (((FileSearchResult) result).getElements().length != 0) {
-						l.add(result);
-					}
-
-					notifySearchCompleted(l);
-				}
-				return Status.OK_STATUS;
-			} catch (Throwable t) {
-				return new Status(IStatus.WARNING, ContextCorePlugin.ID_PLUGIN, 0,
-						Messages.XmlJavaRelationProvider_Skipped_XML_search, null);
-			}
-		}
-
-		/**
-		 * Constructor
-		 * 
-		 * @param data
-		 */
-		public XMLSearchOperation(TextSearchScope scope, String searchString) {
-			super(searchString, false, true, (FileTextSearchScope) scope);
-		}
-
-		/** List of listeners wanting to know about the searches */
-		private final List<IActiveSearchListener> listeners = new ArrayList<IActiveSearchListener>();
-
-		/**
-		 * Add a listener for when the bugzilla search is completed
-		 * 
-		 * @param l
-		 *            The listener to add
-		 */
-		public void addListener(IActiveSearchListener l) {
-			// add the listener to the list
-			listeners.add(l);
-		}
-
-		/**
-		 * Remove a listener for when the bugzilla search is completed
-		 * 
-		 * @param l
-		 *            The listener to remove
-		 */
-		public void removeListener(IActiveSearchListener l) {
-			// remove the listener from the list
-			listeners.remove(l);
-		}
-
-		/**
-		 * Notify all of the listeners that the bugzilla search is completed
-		 * 
-		 * @param doiList
-		 *            A list of BugzillaSearchHitDoiInfo
-		 * @param member
-		 *            The IMember that the search was performed on
-		 */
-		public void notifySearchCompleted(List<Object> l) {
-			// go through all of the listeners and call
-			// searchCompleted(colelctor,
-			// member)
-			for (IActiveSearchListener listener : listeners) {
-				listener.searchCompleted(l);
-			}
-		}
-
-	}
-
-	@Override
-	public String getGenericId() {
-		return SOURCE_ID;
-	}
-
-	@Override
-	protected String getSourceId() {
-		return SOURCE_ID;
-	}
-
-	@Override
-	public String getName() {
-		return NAME;
-	}
-
-	@Override
-	public void stopAllRunningJobs() {
-		for (Job j : runningJobs) {
-			j.cancel();
-		}
-		runningJobs.clear();
-	}
-
-	@Override
-	protected int getDefaultDegreeOfSeparation() {
-		return DEFAULT_DEGREE;
-	}
-}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/Messages.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/Messages.java
deleted file mode 100644
index 70d18b4..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/Messages.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.pde.ui.junit;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.pde.ui.junit.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 TaskContextPdeJUnitLaunchConfiguration_Context_Test_Suite;
-
-	public static String TaskContextPdeJUnitLaunchConfiguration_No_test_types_found_in_the_active_task_context;
-}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitLaunchConfiguration.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitLaunchConfiguration.java
deleted file mode 100644
index de4b937..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitLaunchConfiguration.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.pde.ui.junit;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.internal.java.ui.junit.InteractionContextTestUtil;
-import org.eclipse.pde.ui.launcher.JUnitLaunchConfigurationDelegate;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public class TaskContextPdeJUnitLaunchConfiguration extends JUnitLaunchConfigurationDelegate {
-
-	@Override
-	protected IMember[] evaluateTests(ILaunchConfiguration configuration, IProgressMonitor monitor)
-			throws CoreException {
-		Set<IType> contextTestCases = InteractionContextTestUtil.getTestCasesInContext();
-		InteractionContextTestUtil.setupTestConfiguration(contextTestCases, configuration, monitor);
-
-		if (contextTestCases.isEmpty()) {
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.TaskContextPdeJUnitLaunchConfiguration_Context_Test_Suite,
-							Messages.TaskContextPdeJUnitLaunchConfiguration_No_test_types_found_in_the_active_task_context);
-				}
-			});
-		}
-		return contextTestCases.toArray(new IMember[contextTestCases.size()]);
-	}
-}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitTabGroup.java b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitTabGroup.java
deleted file mode 100644
index e150d27..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/TaskContextPdeJUnitTabGroup.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.internal.pde.ui.junit;
-
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.EnvironmentTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.mylyn.internal.java.ui.junit.TaskContextJUnitMainTab;
-import org.eclipse.pde.ui.launcher.ConfigurationTab;
-import org.eclipse.pde.ui.launcher.JUnitTabGroup;
-import org.eclipse.pde.ui.launcher.PluginJUnitMainTab;
-import org.eclipse.pde.ui.launcher.PluginsTab;
-import org.eclipse.pde.ui.launcher.TracingTab;
-
-/**
- * Copied from: JUnitTabGroup
- * 
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public class TaskContextPdeJUnitTabGroup extends JUnitTabGroup {
-
-	@Override
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-
-		ILaunchConfigurationTab[] tabs = null;
-		tabs = new ILaunchConfigurationTab[] { new TaskContextJUnitMainTab(true),
-//				new JUnitLaunchConfigurationTab(),
-				new PluginJUnitMainTab(), new JavaArgumentsTab(), new PluginsTab(false), new ConfigurationTab(true),
-				new TracingTab(), new EnvironmentTab(), new CommonTab() };
-		setTabs(tabs);
-	}
-
-}
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/messages.properties b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/messages.properties
deleted file mode 100644
index 80f98fb..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/junit/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-TaskContextPdeJUnitLaunchConfiguration_Context_Test_Suite=Context Test Suite
-TaskContextPdeJUnitLaunchConfiguration_No_test_types_found_in_the_active_task_context=No test types found in the active task context.
diff --git a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/messages.properties b/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/messages.properties
deleted file mode 100644
index a240f4c..0000000
--- a/org.eclipse.mylyn.pde.ui/src/org/eclipse/mylyn/internal/pde/ui/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-PdeContextLabelProvider_referenced_by=referenced by
-
-XmlJavaRelationProvider_Skipped_XML_search=Skipped XML search
diff --git a/org.eclipse.mylyn.resources.tests/.classpath b/org.eclipse.mylyn.resources.tests/.classpath
deleted file mode 100644
index a915bf7..0000000
--- a/org.eclipse.mylyn.resources.tests/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="**/internal/**"/>
-			<accessrule kind="accessible" pattern="**/tests/**"/>
-		</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.resources.tests/.cvsignore b/org.eclipse.mylyn.resources.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.resources.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.resources.tests/.project b/org.eclipse.mylyn.resources.tests/.project
deleted file mode 100644
index 3045a45..0000000
--- a/org.eclipse.mylyn.resources.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.resources.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.resources.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.resources.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4233beb..0000000
--- a/org.eclipse.mylyn.resources.tests/.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=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.resources.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.resources.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.resources.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.resources.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.resources.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.resources.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.resources.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.resources.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.resources.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.resources.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.resources.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.resources.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.resources.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.resources.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index fd64ed2..0000000
--- a/org.eclipse.mylyn.resources.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Resources Tests
-Bundle-SymbolicName: org.eclipse.mylyn.resources.tests
-Bundle-Version: 0.0.0
-Bundle-Vendor: Eclipse Mylyn
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.jface.text,
- org.eclipse.jdt,
- org.eclipse.jdt.core,
- org.junit,
- org.eclipse.mylyn.context.core,
- org.eclipse.mylyn.context.tests,
- org.eclipse.mylyn.java.ui,
- org.eclipse.mylyn.resources.ui,
- org.eclipse.mylyn.ide.ui,
- org.eclipse.mylyn.monitor.ui,
- org.eclipse.jface,
- org.eclipse.ui,
- org.eclipse.mylyn.context.ui
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: mylyn-xml-tests.jar
-Export-Package: org.eclipse.mylyn.resources.tests;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.resources.tests/about.html b/org.eclipse.mylyn.resources.tests/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.resources.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.resources.tests/build.properties b/org.eclipse.mylyn.resources.tests/build.properties
deleted file mode 100644
index d841904..0000000
--- a/org.eclipse.mylyn.resources.tests/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 Mylyn project committers and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-bin.includes = META-INF/,\
-               mylyn-xml-tests.jar,\
-               about.html
-jars.compile.order = mylyn-xml-tests.jar
-source.mylyn-xml-tests.jar = src/
-output.mylyn-xml-tests.jar = bin/
-src.includes = about.html
-jre.compilation.profile = J2SE-1.5
diff --git a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/AbstractResourceContextTest.java b/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/AbstractResourceContextTest.java
deleted file mode 100644
index 94911c1..0000000
--- a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/AbstractResourceContextTest.java
+++ /dev/null
@@ -1,71 +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.resources.tests;
-
-import org.eclipse.mylyn.context.tests.AbstractContextTest;
-import org.eclipse.mylyn.context.tests.support.TestUtil;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin;
-import org.eclipse.mylyn.internal.ide.ui.IdeUiUtil;
-import org.eclipse.mylyn.internal.resources.ui.ResourceInteractionMonitor;
-import org.eclipse.mylyn.internal.resources.ui.ResourceStructureBridge;
-import org.eclipse.ui.views.navigator.ResourceNavigator;
-
-/**
- * @author Mik Kersten
- */
-public abstract class AbstractResourceContextTest extends AbstractContextTest {
-
-	protected InteractionContextManager manager = ContextCorePlugin.getContextManager();
-
-	protected ResourceInteractionMonitor monitor = new ResourceInteractionMonitor();
-
-	protected ResourceStructureBridge structureBridge = new ResourceStructureBridge();
-
-	protected TestProject project;
-
-	protected InteractionContext context;
-
-	protected InteractionContextScaling scaling = new InteractionContextScaling();
-
-	protected String taskId = this.getClass().getName();
-
-	protected ResourceNavigator navigator;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		assertNotNull(IdeUiBridgePlugin.getDefault());
-		project = new TestProject(this.getClass().getName());
-		context = new InteractionContext(taskId, scaling);
-		context.reset();
-		manager.internalActivateContext(context);
-		ContextUiPlugin.getViewerManager().setSyncRefreshMode(true);
-		navigator = (ResourceNavigator) TestUtil.openView(IdeUiUtil.ID_NAVIGATOR);
-		assertNotNull(navigator);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		context.reset();
-		assertTrue(context.getInteresting().isEmpty());
-		manager.deactivateContext(taskId);
-		manager.deleteContext(taskId);
-		ContextCorePlugin.getContextStore().getFileForContext(taskId).delete();
-		ResourceTestUtil.deleteProject(project.getProject());
-		super.tearDown();
-	}
-}
diff --git a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/AllResourcesTests.java b/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/AllResourcesTests.java
deleted file mode 100644
index 9b5a667..0000000
--- a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/AllResourcesTests.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.resources.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.mylyn.context.tests.support.TestUtil;
-
-/**
- * @author Mik Kersten
- */
-public class AllResourcesTests {
-
-	public static Test suite() {
-		TestUtil.triggerContextUiLazyStart();
-
-		TestSuite suite = new TestSuite("Test for org.eclipse.mylyn.resources.tests");
-		suite.addTestSuite(ResourceChangeMonitorTest.class);
-		suite.addTestSuite(ResourceContextTest.class);
-		return suite;
-	}
-
-}
diff --git a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceChangeMonitorTest.java b/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceChangeMonitorTest.java
deleted file mode 100644
index ec596bc..0000000
--- a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceChangeMonitorTest.java
+++ /dev/null
@@ -1,246 +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.resources.tests;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.internal.events.ResourceChangeEvent;
-import org.eclipse.core.internal.events.ResourceDelta;
-import org.eclipse.core.internal.events.ResourceDeltaInfo;
-import org.eclipse.core.internal.resources.ResourceInfo;
-import org.eclipse.core.internal.resources.Workspace;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.resources.ui.ResourceChangeMonitor;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiPreferenceInitializer;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- * @author Steffen Pingel
- */
-public class ResourceChangeMonitorTest extends AbstractResourceContextTest {
-
-	private static class MockResourceDelta extends ResourceDelta {
-
-		protected MockResourceDelta(IPath path, ResourceDeltaInfo deltaInfo) {
-			super(path, deltaInfo);
-
-		}
-
-		static MockResourceDelta createMockDelta(String path, String[] childPaths, int status, int resourceType) {
-			// create the delta and fill it with information
-
-			ResourceDeltaInfo deltaInfo = new ResourceDeltaInfo((Workspace) ResourcesPlugin.getWorkspace(), null, null);
-			MockResourceDelta result = new MockResourceDelta(new Path(path), deltaInfo);
-
-			ResourceInfo info = new ResourceInfo();
-
-			info.setType(resourceType);
-
-			result.setNewInfo(info);
-			result.setOldInfo(info);
-
-			Set<MockResourceDelta> children = new HashSet<MockResourceDelta>();
-
-			if (childPaths != null) {
-				for (String childPath : childPaths) {
-					children.add(createMockDelta(path + childPath, null, status, IResource.FILE));
-				}
-			}
-
-			result.setChildren(children.toArray(new MockResourceDelta[0]));
-			result.setStatus(status);
-
-			return result;
-		}
-
-		@Override
-		public void setChildren(ResourceDelta[] children) {
-			super.setChildren(children);
-		}
-	}
-
-	private ResourceChangeMonitor changeMonitor;
-
-	private IFolder folder;
-
-	private IFile fileInFolder;
-
-	private IFile file;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		changeMonitor = new ResourceChangeMonitor();
-		ResourcesUiBridgePlugin.getInterestUpdater().setSyncExec(true);
-
-		ContextCore.getContextManager().setContextCapturePaused(true);
-
-		file = project.getProject().getFile("test.txt");
-		file.create(null, true, null);
-		assertTrue(file.exists());
-
-		folder = project.getProject().getFolder("testFolder");
-		folder.create(true, true, null);
-		assertTrue(folder.exists());
-
-		fileInFolder = folder.getFile("test.txt");
-		fileInFolder.create(null, true, null);
-		assertTrue(fileInFolder.exists());
-
-		ContextCore.getContextManager().setContextCapturePaused(false);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		ResourcesUiBridgePlugin.getInterestUpdater().setSyncExec(false);
-		super.tearDown();
-	}
-
-	public void testForcedExclusionPatterns() {
-		String pattern = "file:/foo";
-		try {
-			ResourcesUiPreferenceInitializer.addForcedExclusionPattern(pattern);
-			assertTrue(ResourcesUiPreferenceInitializer.getForcedExcludedResourcePatterns().contains(pattern));
-			assertFalse(ResourcesUiPreferenceInitializer.getExcludedResourcePatterns().contains(pattern));
-		} finally {
-			ResourcesUiPreferenceInitializer.removeForcedExclusionPattern(pattern);
-		}
-	}
-
-	public void testFileUriExclusionPattern() throws URISyntaxException {
-		URI uri = new URI("file:/C:");
-		assertTrue(ResourceChangeMonitor.isUriExcluded(uri.toString(),
-				ResourceChangeMonitor.createRegexFromPattern("file:/C:")));
-
-		uri = new URI("file:/C:/foo/bar");
-		assertTrue(ResourceChangeMonitor.isUriExcluded(uri.toString(),
-				ResourceChangeMonitor.createRegexFromPattern("file:/C:")));
-	}
-
-	public void testExclusionPattern() {
-		Set<String> patterns = new HashSet<String>();
-		patterns.add(ResourceChangeMonitor.createRegexFromPattern(".*"));
-		patterns.add(ResourceChangeMonitor.createRegexFromPattern("target"));
-
-		IPath path1 = new Path(".foo");
-		assertTrue(ResourceChangeMonitor.isExcluded(path1, null, patterns));
-
-		IPath path2 = new Path("target/bar");
-		assertTrue(ResourceChangeMonitor.isExcluded(path2, null, patterns));
-
-		IPath path3 = new Path("bar/target/bar");
-		assertTrue(ResourceChangeMonitor.isExcluded(path3, null, patterns));
-
-		IPath path4 = new Path("bla/bla");
-		assertFalse(ResourceChangeMonitor.isExcluded(path4, null, patterns));
-	}
-
-	public void testInclusion() {
-		IPath path4 = new Path("bla/bla");
-		assertFalse(ResourceChangeMonitor.isExcluded(path4, null, new HashSet<String>()));
-	}
-
-	public void testCreatedFile() throws CoreException {
-		MockResourceDelta delta = MockResourceDelta.createMockDelta("/" + project.getProject().getName(),
-				new String[] { "/test.txt" }, (IResourceDelta.ADDED | IResourceDelta.CONTENT), IResource.PROJECT);
-		IResourceChangeEvent event = new ResourceChangeEvent(delta, IResourceChangeEvent.POST_CHANGE, 0, delta);
-		changeMonitor.resourceChanged(event);
-		String handle = ContextCore.getStructureBridge(file).getHandleIdentifier(file);
-		assertNotNull(handle);
-		IInteractionElement element = context.get(handle);
-		assertNotNull(element);
-		assertTrue(element.getInterest().isPropagated());
-	}
-
-	public void testModifiedFile() throws CoreException {
-		MockResourceDelta delta = MockResourceDelta.createMockDelta("/" + project.getProject().getName(),
-				new String[] { "/test.txt" }, (IResourceDelta.CHANGED | IResourceDelta.CONTENT), IResource.PROJECT);
-		IResourceChangeEvent event = new ResourceChangeEvent(delta, IResourceChangeEvent.POST_CHANGE, 0, delta);
-		changeMonitor.resourceChanged(event);
-		String handle = ContextCore.getStructureBridge(file).getHandleIdentifier(file);
-		assertNotNull(handle);
-		IInteractionElement element = context.get(handle);
-		assertNotNull(element);
-		assertTrue(element.getInterest().isPredicted());
-	}
-
-	public void testDerrivedFileChanged() throws CoreException {
-		fileInFolder.setDerived(true);
-
-		MockResourceDelta delta = MockResourceDelta.createMockDelta("/" + project.getProject().getName(),
-				new String[] { "/test.txt" }, (IResourceDelta.CHANGED | IResourceDelta.CONTENT), IResource.PROJECT);
-		IResourceChangeEvent event = new ResourceChangeEvent(delta, IResourceChangeEvent.POST_CHANGE, 0, delta);
-		changeMonitor.resourceChanged(event);
-		String handle = ContextCore.getStructureBridge(fileInFolder).getHandleIdentifier(fileInFolder);
-		assertNotNull(handle);
-		IInteractionElement element = context.get(handle);
-		assertNull(element);
-	}
-
-	public void testDerrivedFolderChanged() throws CoreException {
-		folder.setDerived(true);
-		fileInFolder.setDerived(false);
-
-		MockResourceDelta delta = MockResourceDelta.createMockDelta("/" + project.getProject().getName(), null,
-				(IResourceDelta.CHANGED | IResourceDelta.CONTENT), IResource.PROJECT);
-
-		MockResourceDelta child = MockResourceDelta.createMockDelta("/" + project.getProject().getName() + "/"
-				+ folder.getName(), new String[] { "/" + folder.getName() + "/test.txt" },
-				(IResourceDelta.CHANGED | IResourceDelta.CONTENT), IResource.FOLDER);
-
-		delta.setChildren(new ResourceDelta[] { child });
-
-		IResourceChangeEvent event = new ResourceChangeEvent(delta, IResourceChangeEvent.POST_CHANGE, 0, delta);
-		changeMonitor.resourceChanged(event);
-		String handle = ContextCore.getStructureBridge(fileInFolder).getHandleIdentifier(folder);
-		assertNotNull(handle);
-		IInteractionElement element = context.get(handle);
-		assertNull(element);
-		handle = ContextCore.getStructureBridge(fileInFolder).getHandleIdentifier(fileInFolder);
-		assertNotNull(handle);
-		element = context.get(handle);
-		assertNull(element);
-	}
-
-	public void testExcluded() throws CoreException {
-		try {
-			ResourcesUiPreferenceInitializer.addForcedExclusionPattern("*.txt");
-
-			MockResourceDelta delta = MockResourceDelta.createMockDelta("/" + project.getProject().getName(),
-					new String[] { "/test.txt" }, (IResourceDelta.CHANGED | IResourceDelta.CONTENT), IResource.PROJECT);
-			IResourceChangeEvent event = new ResourceChangeEvent(delta, IResourceChangeEvent.POST_CHANGE, 0, delta);
-			changeMonitor.resourceChanged(event);
-			String handle = ContextCore.getStructureBridge(file).getHandleIdentifier(file);
-			assertNotNull(handle);
-			IInteractionElement element = context.get(handle);
-			assertNull(element);
-		} finally {
-			ResourcesUiPreferenceInitializer.removeForcedExclusionPattern("*.txt");
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceContextTest.java b/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceContextTest.java
deleted file mode 100644
index c7b3b7d..0000000
--- a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceContextTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.resources.tests;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.tests.support.TestUtil;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-
-/**
- * @author Mik Kersten
- */
-public class ResourceContextTest extends AbstractResourceContextTest {
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-//		ResourcesUiBridgePlugin.getDefault().setResourceMonitoringEnabled(true);
-		ResourcesUiBridgePlugin.getInterestUpdater().setSyncExec(true);
-
-		TestUtil.triggerContextUiLazyStart();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		ResourcesUiBridgePlugin.getInterestUpdater().setSyncExec(false);
-	}
-
-	public void testResourceSelect() throws CoreException {
-		ContextCore.getContextManager().setContextCapturePaused(true);
-		IFile file = project.getProject().getFile("file");
-		file.create(null, true, null);
-		assertTrue(file.exists());
-
-		IInteractionElement element = ContextCore.getContextManager().getElement(
-				structureBridge.getHandleIdentifier(file));
-		assertFalse(element.getInterest().isInteresting());
-		ContextCore.getContextManager().setContextCapturePaused(false);
-
-		monitor.selectionChanged(navigator, new StructuredSelection(file));
-		element = ContextCore.getContextManager().getElement(structureBridge.getHandleIdentifier(file));
-		assertTrue(element.getInterest().isInteresting());
-	}
-
-	public void testFileNotAddedIfExcluded() throws CoreException {
-		Set<String> previousExcludions = ResourcesUiBridgePlugin.getDefault().getExcludedResourcePatterns();
-		Set<String> exclude = new HashSet<String>();
-		exclude.add("boring");
-		ResourcesUiBridgePlugin.getDefault().setExcludedResourcePatterns(exclude);
-
-		IFile file = project.getProject().getFile("boring");
-		file.create(null, true, null);
-		assertTrue(file.exists());
-
-		IInteractionElement element = ContextCore.getContextManager().getElement(
-				structureBridge.getHandleIdentifier(file));
-		assertFalse(element.getInterest().isInteresting());
-		ResourcesUiBridgePlugin.getDefault().setExcludedResourcePatterns(previousExcludions);
-	}
-
-	public void testPatternNotAddedIfExcluded() throws CoreException {
-		Set<String> previousExcludions = ResourcesUiBridgePlugin.getDefault().getExcludedResourcePatterns();
-		Set<String> exclude = new HashSet<String>();
-		exclude.add("b*.txt");
-		ResourcesUiBridgePlugin.getDefault().setExcludedResourcePatterns(exclude);
-
-		IFile file = project.getProject().getFile("boring.txt");
-		file.create(null, true, null);
-		assertTrue(file.exists());
-
-		IInteractionElement element = ContextCore.getContextManager().getElement(
-				structureBridge.getHandleIdentifier(file));
-		assertFalse(element.getInterest().isInteresting());
-		ResourcesUiBridgePlugin.getDefault().setExcludedResourcePatterns(previousExcludions);
-	}
-
-	public void testPatternNotAddedMatching() throws CoreException {
-		Set<String> previousExcludions = ResourcesUiBridgePlugin.getDefault().getExcludedResourcePatterns();
-		Set<String> exclude = new HashSet<String>();
-		exclude.add(".*");
-		ResourcesUiBridgePlugin.getDefault().setExcludedResourcePatterns(exclude);
-
-		String pattern = ".*";
-		String segment = "boring";
-
-		String s = pattern.replaceAll("\\.", "\\\\.").replaceAll("\\*", ".*");
-		assertFalse(segment.matches(s));
-		assertTrue(".boring".matches(s));
-
-		IFile file = project.getProject().getFile(".boring");
-		file.create(null, true, null);
-		assertTrue(file.exists());
-		IInteractionElement element = ContextCore.getContextManager().getElement(
-				structureBridge.getHandleIdentifier(file));
-		assertFalse(element.getInterest().isInteresting());
-
-		file = project.getProject().getFile("boring");
-		file.create(null, true, null);
-		assertTrue(file.exists());
-		element = ContextCore.getContextManager().getElement(structureBridge.getHandleIdentifier(file));
-		assertTrue(element.getInterest().isInteresting());
-
-		ResourcesUiBridgePlugin.getDefault().setExcludedResourcePatterns(previousExcludions);
-	}
-
-	public void testFileAdded() throws CoreException {
-		IFile file = project.getProject().getFile("new-file.txt");
-		file.create(null, true, null);
-		assertTrue(file.exists());
-
-		IInteractionElement element = ContextCore.getContextManager().getElement(
-				structureBridge.getHandleIdentifier(file));
-		assertTrue(element.getInterest().isInteresting());
-	}
-
-	public void testFolderAddedOnCreation() throws CoreException {
-		IFolder folder = project.getProject().getFolder("folder");
-		folder.create(true, true, null);
-		assertTrue(folder.exists());
-
-		IInteractionElement element = ContextCore.getContextManager().getElement(
-				structureBridge.getHandleIdentifier(folder));
-		assertTrue(element.getInterest().isInteresting());
-	}
-
-	// XXX: Put back
-//	public void testDecrementOfFile() throws CoreException, InvocationTargetException, InterruptedException {
-//		IFolder folder = project.getProject().getFolder("folder");
-//		folder.create(true, true, null);
-//		IFile file = project.getProject().getFile(new Path("folder/foo.txt"));
-//		file.create(null, true, null);
-//
-//		monitor.selectionChanged(navigator, new StructuredSelection(file));
-//		monitor.selectionChanged(navigator, new StructuredSelection(folder));
-//
-//		IInteractionElement fileElement = ContextCorePlugin.getContextManager().getElement(
-//				structureBridge.getHandleIdentifier(file));
-//		IInteractionElement folderElement = ContextCorePlugin.getContextManager().getElement(
-//				structureBridge.getHandleIdentifier(folder));
-//
-//		assertTrue(fileElement.getInterest().isInteresting());
-//		assertTrue(folderElement.getInterest().isInteresting());
-//
-//		assertTrue(ContextCorePlugin.getContextManager().manipulateInterestForElement(folderElement, false, false,
-//				"test"));
-//
-//		assertFalse(folderElement.getInterest().isInteresting());
-//		assertFalse(fileElement.getInterest().isInteresting());
-//	}
-}
diff --git a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceTestUtil.java b/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceTestUtil.java
deleted file mode 100644
index b7152cc..0000000
--- a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/ResourceTestUtil.java
+++ /dev/null
@@ -1,71 +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.resources.tests;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author Mik Kersten
- */
-public class ResourceTestUtil {
-
-	public static void deleteProject(IProject project) throws CoreException {
-		if (project.exists() && !project.isOpen()) { // force opening so that
-			// project can be
-			// deleted without
-			// logging (see bug
-			// 23629)
-			project.open(null);
-		}
-		deleteResource(project);
-	}
-
-	public static void deleteResource(IResource resource) throws CoreException {
-		CoreException lastException = null;
-		try {
-			resource.delete(true, null);
-		} catch (CoreException e) {
-			lastException = e;
-			// just print for info
-			System.out.println("(CoreException): " + e.getMessage() + ", resource " + resource.getFullPath()); //$NON-NLS-1$ //$NON-NLS-2$
-		} catch (IllegalArgumentException iae) {
-			// just print for info
-			System.out.println("(IllegalArgumentException): " + iae.getMessage() + ", resource " + resource.getFullPath()); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		int retryCount = 60; // wait 1 minute at most
-		while (resource.isAccessible() && --retryCount >= 0) {
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-			try {
-				resource.delete(true, null);
-			} catch (CoreException e) {
-				lastException = e;
-				// just print for info
-				System.out.println("(CoreException) Retry " + retryCount + ": " + e.getMessage() + ", resource " + resource.getFullPath()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			} catch (IllegalArgumentException iae) {
-				// just print for info
-				System.out.println("(IllegalArgumentException) Retry " + retryCount + ": " + iae.getMessage() + ", resource " + resource.getFullPath()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-		}
-		if (!resource.isAccessible()) {
-			return;
-		}
-		System.err.println("Failed to delete " + resource.getFullPath()); //$NON-NLS-1$
-		if (lastException != null) {
-			throw lastException;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/TestProject.java b/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/TestProject.java
deleted file mode 100644
index 1d3a65f..0000000
--- a/org.eclipse.mylyn.resources.tests/src/org/eclipse/mylyn/resources/tests/TestProject.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.resources.tests;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author Mik Kersten
- */
-public class TestProject {
-
-	public IProject project;
-
-	public TestProject(final String name) throws CoreException, InvocationTargetException, InterruptedException {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		project = root.getProject(name);
-		project.create(null);
-		project.open(null);
-	}
-
-	public IProject getProject() {
-		return project;
-	}
-
-	public IFolder createFolder(String name) throws CoreException {
-		IFolder folder = project.getFolder(name);
-		folder.create(false, true, null);
-		return folder;
-	}
-}
diff --git a/org.eclipse.mylyn.resources.ui/.classpath b/org.eclipse.mylyn.resources.ui/.classpath
deleted file mode 100644
index 58e7b31..0000000
--- a/org.eclipse.mylyn.resources.ui/.classpath
+++ /dev/null
@@ -1,19 +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/markers/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/compare/internal/*"/>
-			<accessrule kind="accessible" pattern="org/eclipse/core/internal/resources/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/internal/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/views/markers/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">
-		<accessrules>
-			<accessrule kind="nonaccessible" pattern="com/sun/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.resources.ui/.cvsignore b/org.eclipse.mylyn.resources.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.resources.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.resources.ui/.project b/org.eclipse.mylyn.resources.ui/.project
deleted file mode 100644
index 58ce90e..0000000
--- a/org.eclipse.mylyn.resources.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.resources.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.resources.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.resources.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1314ffa..0000000
--- a/org.eclipse.mylyn.resources.ui/.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.resources.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.resources.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.resources.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.resources.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.resources.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.resources.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.resources.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.resources.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.resources.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.resources.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.resources.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.resources.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.resources.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 76e2265..0000000
--- a/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.resources.ui;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Activator: org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin
-Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.ui.navigator,
- org.eclipse.jface.text,
- org.eclipse.compare,
- org.eclipse.core.expressions,
- org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.ui;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.resources.ui;x-internal:=true,
- org.eclipse.mylyn.internal.resources.ui.preferences;x-internal:=true,
- org.eclipse.mylyn.resources.ui
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.resources.ui/about.html b/org.eclipse.mylyn.resources.ui/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.resources.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.resources.ui/build-user.xml b/org.eclipse.mylyn.resources.ui/build-user.xml
deleted file mode 100644
index 6097713..0000000
--- a/org.eclipse.mylyn.resources.ui/build-user.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<target name="help">
-    <echo message="Please run: $ ant -v -projecthelp"/>
-</target>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.resources.ui/build.properties b/org.eclipse.mylyn.resources.ui/build.properties
deleted file mode 100644
index 1c7c982..0000000
--- a/org.eclipse.mylyn.resources.ui/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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 = plugin.xml,\
-               icons/,\
-               META-INF/,\
-               about.html,\
-               doc/,\
-               .,\
-               plugin.properties
-src.includes = about.html,\
-               schema/
-jre.compilation.profile = J2SE-1.5
-source.. = src/
diff --git a/org.eclipse.mylyn.resources.ui/doc/ant.html b/org.eclipse.mylyn.resources.ui/doc/ant.html
deleted file mode 100644
index 1f17a2e..0000000
--- a/org.eclipse.mylyn.resources.ui/doc/ant.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="STYLESHEET" href="book.css" charset="ISO-8859-1"
-	type="text/css">
-<title>Mylar New & Noteworthy</title>
-</head>
-<body>
-<h2>Ant Editing</h2>Interest-based filtering is 
-			now supported in the Ant editor's Outline view by toggling the 
-			glasses.<p>
-			<img border="0" src="../../org.eclipse.mylar.doc/doc/images/0.3/filtering-ant.gif" width="464" height="113"></p>
-			
-</body>
-</html>
diff --git a/org.eclipse.mylyn.resources.ui/doc/book.css b/org.eclipse.mylyn.resources.ui/doc/book.css
deleted file mode 100644
index faa4199..0000000
--- a/org.eclipse.mylyn.resources.ui/doc/book.css
+++ /dev/null
@@ -1 +0,0 @@
-@import "../../PRODUCT_PLUGIN/book.css";
diff --git a/org.eclipse.mylyn.resources.ui/doc/pde.html b/org.eclipse.mylyn.resources.ui/doc/pde.html
deleted file mode 100644
index 53cd888..0000000
--- a/org.eclipse.mylyn.resources.ui/doc/pde.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="STYLESHEET" href="book.css" charset="ISO-8859-1"
-	type="text/css">
-<title>Mylar New & Noteworthy</title>
-</head>
-<body>
-<h2>Plug-in Development</h2>
-<p>...</p>
-
-</body>
-</html>
diff --git a/org.eclipse.mylyn.resources.ui/doc/toc.xml b/org.eclipse.mylyn.resources.ui/doc/toc.xml
deleted file mode 100644
index 924706c..0000000
--- a/org.eclipse.mylyn.resources.ui/doc/toc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc link_to="../org.eclipse.mylyn.doc/doc/toc.xml#xml" label="XML Support">
-	<topic label="XML Support" href="doc/xml.html">
-		<topic label="Ant Editing" href="doc/ant.html"/>
-	</topic>
-</toc>
-
-
-
diff --git a/org.eclipse.mylyn.resources.ui/doc/xml.html b/org.eclipse.mylyn.resources.ui/doc/xml.html
deleted file mode 100644
index c6bc86c..0000000
--- a/org.eclipse.mylyn.resources.ui/doc/xml.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="STYLESHEET" href="book.css" charset="ISO-8859-1"
-	type="text/css">
-<title>Mylar New & Noteworthy</title>
-</head>
-<body>
-<h2>XML Editing Support</h2>
-<p>&nbsp;</p>
-<p></p>
-
-</body>
-</html>
diff --git a/org.eclipse.mylyn.resources.ui/icons/elcl16/edge-ref-xml.gif b/org.eclipse.mylyn.resources.ui/icons/elcl16/edge-ref-xml.gif
deleted file mode 100644
index 38bf351..0000000
--- a/org.eclipse.mylyn.resources.ui/icons/elcl16/edge-ref-xml.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.resources.ui/icons/elcl16/focus-disabled.gif b/org.eclipse.mylyn.resources.ui/icons/elcl16/focus-disabled.gif
deleted file mode 100644
index 24bbeae..0000000
--- a/org.eclipse.mylyn.resources.ui/icons/elcl16/focus-disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.resources.ui/icons/elcl16/focus.gif b/org.eclipse.mylyn.resources.ui/icons/elcl16/focus.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.resources.ui/icons/elcl16/focus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.resources.ui/icons/elcl16/interest-decrease.gif b/org.eclipse.mylyn.resources.ui/icons/elcl16/interest-decrease.gif
deleted file mode 100644
index 645a58f..0000000
--- a/org.eclipse.mylyn.resources.ui/icons/elcl16/interest-decrease.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.resources.ui/icons/elcl16/interest-increase.gif b/org.eclipse.mylyn.resources.ui/icons/elcl16/interest-increase.gif
deleted file mode 100644
index 98a2586..0000000
--- a/org.eclipse.mylyn.resources.ui/icons/elcl16/interest-increase.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.resources.ui/plugin.properties b/org.eclipse.mylyn.resources.ui/plugin.properties
deleted file mode 100644
index 49f0691..0000000
--- a/org.eclipse.mylyn.resources.ui/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#Properties file for org.eclipse.mylyn.resources.ui
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn Resources UI
-
-FocusedResourcesPreferencePage.name = Resources
-
-keywords.label = mylyn resources
-
-ResourceStructureBridge.name = Resource Structure Bridge
-
-InterestDecrementAction.label = Remove from Context
-InterestDecrementAction.tooltip = Mark selected element as uninteresting
-InterestIncrementAction.label = Mark as Landmark
-InterestIncrementAction.tooltip = Make selected element a landmark
diff --git a/org.eclipse.mylyn.resources.ui/plugin.xml b/org.eclipse.mylyn.resources.ui/plugin.xml
deleted file mode 100644
index 44c43b7..0000000
--- a/org.eclipse.mylyn.resources.ui/plugin.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- 
-   <extension-point id="changeMonitoring" name="Resource Change Monitorin" schema="schema/changeMonitoring.exsd"/>
- 
-   <extension point="org.eclipse.ui.preferencePages">
-      <page 
-         name="%FocusedResourcesPreferencePage.name"
-         class="org.eclipse.mylyn.internal.resources.ui.preferences.FocusedResourcesPreferencePage"
-         id="org.eclipse.mylyn.resources.ui.preferences.resources"
-         category="org.eclipse.mylyn.tasks.ui.preferences">
-         <keywordReference id="org.eclipse.mylyn.resources.ui.keywords"/>
-      </page> 
-   </extension>
-   
-   <extension
-   		point="org.eclipse.ui.keywords">
-      <keyword
-            label="%keywords.label"
-            id="org.eclipse.mylyn.resources.ui.keywords"/>
-   </extension>
-  
-    <extension
-         point="org.eclipse.mylyn.resources.ui.changeMonitoring">
-		<exclude
-         	pattern=".*"/>
-   </extension>
- 
-   <extension
-         point="org.eclipse.mylyn.context.core.bridges">
-      <structureBridge
-            class="org.eclipse.mylyn.internal.resources.ui.ResourceStructureBridge"
-            name="%ResourceStructureBridge.name"/> 
-   </extension>
-   
-   <extension
-         point="org.eclipse.mylyn.context.ui.bridges">
-      <uiBridge
-            class="org.eclipse.mylyn.internal.resources.ui.ResourceUiBridge"
-            contentType="resource"/>
-   </extension>
-   <extension
-         point="org.eclipse.mylyn.context.ui.startup">
-      <startup
-            class="org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin$ResourcesUiBridgeStartup">
-      </startup>
-   </extension>
-
-   <extension point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.eclipse.mylyn.internal.resources.ui.ResourcesUiPreferenceInitializer"/>
-   </extension>
-   
-   
-   <!--
-   <extension
-         point="org.eclipse.ui.navigator.viewer">
-       <dragAssistant
-             class="org.eclipse.ui.navigator.resources.ResourceDragAdapterAssistant"
-             viewerId="org.eclipse.mylyn.context.ui.navigator.context"/>
-   </extension>
-   -->
-   
-   <extension point = "org.eclipse.ui.popupMenus">
-     <objectContribution
-           adaptable="true"
-           id="org.eclipse.mylyn.ui.interest"
-           objectClass="org.eclipse.core.resources.IResource">
-        <action
-              class="org.eclipse.mylyn.internal.context.ui.actions.InterestDecrementAction"
-              definitionId="org.eclipse.mylyn.context.ui.commands.interest.decrement"
-              enablesFor="*"
-              icon="icons/elcl16/interest-decrease.gif"
-              id="org.eclipse.mylyn.resources.ui.ui.interest.remove.element"
-              label="%InterestDecrementAction.label"
-              menubarPath="group.reorganize"
-              tooltip="%InterestDecrementAction.tooltip">
-           <enablement>
-              <systemProperty
-                    name="org.eclipse.mylyn.context.core.context.active"
-                    value="true">
-              </systemProperty>
-           </enablement>
-        </action>
-     </objectContribution>
-     <objectContribution
-     	adaptable="false"
-        id="org.eclipse.mylyn.ui.interest"
-        objectClass="org.eclipse.core.resources.IFile">
-	    <action
-           class="org.eclipse.mylyn.internal.context.ui.actions.InterestIncrementAction"
-           definitionId="org.eclipse.mylyn.context.ui.commands.interest.increment"
-           enablesFor="*"
-           icon="icons/elcl16/interest-increase.gif"
-           id="org.eclipse.mylyn.resources.ui.ui.interest.increase.element"
-           label="%InterestIncrementAction.label"
-           menubarPath="group.reorganize"
-           tooltip="%InterestIncrementAction.tooltip">
-        <enablement>
-           <systemProperty
-                 name="org.eclipse.mylyn.context.core.context.active"
-                 value="true">
-           </systemProperty>
-        </enablement>
-     </action>
-	 </objectContribution>
-   </extension>
-</plugin>
diff --git a/org.eclipse.mylyn.resources.ui/schema/changeMonitoring.exsd b/org.eclipse.mylyn.resources.ui/schema/changeMonitoring.exsd
deleted file mode 100644
index f1c80d7..0000000
--- a/org.eclipse.mylyn.resources.ui/schema/changeMonitoring.exsd
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.resources.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.mylyn.resources.ui" id="changeMonitoring" name="changeMonitoring"/>
-      </appInfo>
-      <documentation>
-         This extension point is used so that plugins may contribute extensions that should be ignored by default (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=178931 for details)
-      </documentation>
-   </annotation>
-
-   <element name="changeMonitoring">
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="exclude" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-      </complexType>
-   </element>
-
-   <element name="exclude">
-      <complexType>
-         <attribute name="pattern" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Pattern can include URI syntax su
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Use example:
-
-   &lt;extension point=&quot;org.eclipse.mylyn.resources.ui.mylyn_resources_to_ignore&quot;&gt;
-     &lt;resource_to_ignore pattern=&quot;*.pyc&quot;/&gt;
-     &lt;resource_to_ignore pattern=&quot;*.pyo&quot;/&gt;
-   &lt;/extension&gt;
-      </documentation>
-   </annotation>
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         In the preferences initializer it will search for plugins that supply this extension point and add those as defaults.
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/EditorInteractionMonitor.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/EditorInteractionMonitor.java
deleted file mode 100644
index f1b0af7..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/EditorInteractionMonitor.java
+++ /dev/null
@@ -1,170 +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.resources.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.compare.internal.CompareEditor;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.commons.core.CoreUtil;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.mylyn.context.ui.ContextUi;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.ui.AbstractEditorTracker;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class EditorInteractionMonitor extends AbstractEditorTracker {
-
-	public static final String SOURCE_ID = "org.eclipse.mylyn.resources.ui.editor.tracker.interest"; //$NON-NLS-1$
-
-	@Override
-	protected void editorBroughtToTop(IEditorPart part) {
-		Object object = part.getEditorInput().getAdapter(IResource.class);
-		if (object instanceof IResource) {
-			IResource resource = (IResource) object;
-			AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(resource);
-			InteractionEvent selectionEvent = new InteractionEvent(InteractionEvent.Kind.SELECTION,
-					bridge.getContentType(), bridge.getHandleIdentifier(resource), part.getSite().getId());
-			ContextCore.getContextManager().processInteractionEvent(selectionEvent);
-		}
-	}
-
-	@Override
-	public void editorOpened(IEditorPart editorPartOpened) {
-		if (!ContextUi.isEditorAutoManageEnabled() || ContextCore.getContextManager().isContextCapturePaused()) {
-			return;
-		}
-		IWorkbenchPage page = editorPartOpened.getSite().getPage();
-		List<IEditorReference> toClose = new ArrayList<IEditorReference>();
-		for (IEditorReference editorReference : page.getEditorReferences()) {
-			try {
-				IInteractionElement element = null;
-				Object adapter;
-				adapter = editorReference.getEditorInput().getAdapter(IResource.class);
-				if (adapter instanceof IFile) {
-					String handle = ContextCore.getStructureBridge(adapter).getHandleIdentifier(adapter);
-					element = ContextCore.getContextManager().getElement(handle);
-				}
-				if (element != null && !element.getInterest().isInteresting()
-						&& !isSameEditor(editorPartOpened, editorReference)) {
-					toClose.add(editorReference);
-				}
-			} catch (PartInitException e) {
-				// ignore
-			}
-		}
-		if (toClose.size() > 0) {
-			page.closeEditors(toClose.toArray(new IEditorReference[toClose.size()]), true);
-		}
-	}
-
-	private boolean isSameEditor(IEditorPart editorPart1, IEditorReference editorReference2) throws PartInitException {
-		if (editorPart1 == null || editorReference2 == null) {
-			return false;
-		} else {
-			return editorPart1.getEditorInput().equals(editorReference2.getEditorInput());
-		}
-	}
-
-	/**
-	 * Decrement interest if an editor for a resource is closed.
-	 */
-	@SuppressWarnings("restriction")
-	@Override
-	public void editorClosed(IEditorPart editorPart) {
-		if (PlatformUI.getWorkbench().isClosing()) {
-			return;
-		} else if (ContextUi.isEditorAutoCloseEnabled() && !otherEditorsOpenForResource(editorPart)
-				&& !(editorPart instanceof CompareEditor)) {
-
-			IInteractionElement element = null;
-			AbstractContextUiBridge uiBridge = ContextUi.getUiBridgeForEditor(editorPart);
-			Object object = uiBridge.getObjectForTextSelection(null, editorPart);
-			if (object != null) {
-				AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(object);
-				element = ContextCore.getContextManager().getElement(bridge.getHandleIdentifier(object));
-			}
-			// TODO: probably should be refactored into delegation
-			if (element == null) {
-				Object adapter = editorPart.getEditorInput().getAdapter(IResource.class);
-				if (adapter instanceof IResource) {
-					IResource resource = (IResource) adapter;
-					AbstractContextStructureBridge resourceBridge = ContextCore.getStructureBridge(resource);
-					element = ContextCore.getContextManager().getElement(resourceBridge.getHandleIdentifier(resource));
-				}
-			}
-			if (element != null) {
-				showEditorCloseWarning();
-				ContextCorePlugin.getContextManager().manipulateInterestForElement(element, false, false, false,
-						SOURCE_ID);
-			}
-		}
-	}
-
-	private void showEditorCloseWarning() {
-		if (ContextCore.getContextManager().isContextActive()
-				&& org.eclipse.mylyn.internal.context.ui.ContextUiPlugin.getDefault()
-						.getPreferenceStore()
-						.getBoolean(
-								org.eclipse.mylyn.internal.context.ui.IContextUiPreferenceContstants.AUTO_MANAGE_EDITOR_CLOSE_WARNING)) {
-			try {
-				if (!CoreUtil.TEST_MODE) {
-					MessageDialog.openInformation(
-							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-							"Mylyn", //$NON-NLS-1$
-							Messages.EditorInteractionMonitor_Closing_a_file_automatically_removes_it_from_the_Task_Context);
-				}
-			} finally {
-				org.eclipse.mylyn.internal.context.ui.ContextUiPlugin.getDefault()
-						.getPreferenceStore()
-						.setValue(
-								org.eclipse.mylyn.internal.context.ui.IContextUiPreferenceContstants.AUTO_MANAGE_EDITOR_CLOSE_WARNING,
-								false);
-			}
-		}
-	}
-
-	private boolean otherEditorsOpenForResource(IEditorPart editorPart) {
-		Object adapter = editorPart.getEditorInput().getAdapter(IResource.class);
-		if (adapter instanceof IResource) {
-			IResource resource = (IResource) adapter;
-			IWorkbenchPage page = editorPart.getSite().getPage();
-			for (IEditorReference editorReference : page.getEditorReferences()) {
-				try {
-					Object otherAdapter;
-					otherAdapter = editorReference.getEditorInput().getAdapter(IResource.class);
-					if (otherAdapter instanceof IResource && otherAdapter.equals(resource)) {
-						return true;
-					}
-				} catch (PartInitException e) {
-					// ignore
-				}
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/Messages.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/Messages.java
deleted file mode 100644
index edd09ca..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/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.resources.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.resources.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 EditorInteractionMonitor_Closing_a_file_automatically_removes_it_from_the_Task_Context;
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceChangeMonitor.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceChangeMonitor.java
deleted file mode 100644
index d5543fd..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceChangeMonitor.java
+++ /dev/null
@@ -1,210 +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.resources.ui;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.resources.ui.ResourcesUi;
-
-/**
- * @author Mik Kersten
- */
-public class ResourceChangeMonitor implements IResourceChangeListener {
-
-	private class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-
-		private final Set<IResource> addedResources;
-
-		private final Set<IResource> changedResources;
-
-		private final Set<String> excludedPatterns;
-
-		private boolean haveTeamPrivateMember;
-
-		public ResourceDeltaVisitor() {
-			Set<String> excludedResourcePatterns = ResourcesUiPreferenceInitializer.getExcludedResourcePatterns();
-			excludedResourcePatterns.addAll(ResourcesUiPreferenceInitializer.getForcedExcludedResourcePatterns());
-			this.excludedPatterns = new HashSet<String>();
-			for (String pattern : excludedResourcePatterns) {
-				if (pattern != null && pattern.length() > 0) {
-					pattern = createRegexFromPattern(pattern);
-					this.excludedPatterns.add(pattern);
-				}
-			}
-			this.addedResources = new HashSet<IResource>();
-			this.changedResources = new HashSet<IResource>();
-		}
-
-		public boolean hasValidResult() {
-			return !haveTeamPrivateMember;
-		}
-
-		public boolean visit(IResourceDelta delta) {
-			if (haveTeamPrivateMember) {
-				return false;
-			}
-			if (delta.getResource().isTeamPrivateMember()) {
-				haveTeamPrivateMember = true;
-				return false;
-			}
-			if (isExcluded(delta.getResource().getProjectRelativePath(), delta.getResource(), excludedPatterns)) {
-				return false;
-			}
-
-			IResourceDelta[] added = delta.getAffectedChildren(IResourceDelta.ADDED);
-			for (IResourceDelta element : added) {
-				IResource resource = element.getResource();
-				if ((resource instanceof IFile || resource instanceof IFolder)
-						&& !isExcluded(resource.getProjectRelativePath(), resource, excludedPatterns)) {
-					addedResources.add(resource);
-				}
-			}
-
-			IResourceDelta[] changed = delta.getAffectedChildren(IResourceDelta.CHANGED | IResourceDelta.REMOVED);
-			for (IResourceDelta element : changed) {
-				IResource resource = element.getResource();
-				// special rule for feature.xml files: bug 249856 
-				if (resource instanceof IFile
-						&& !isExcluded(resource.getProjectRelativePath(), resource, excludedPatterns)
-						&& !"feature.xml".equals(resource.getName())) { //$NON-NLS-1$
-					if (element.getKind() == IResourceDelta.CHANGED
-							&& (element.getFlags() & IResourceDelta.CONTENT) == 0) {
-						// make sure that there was a content change and not just a markers change
-						continue;
-					}
-					changedResources.add(resource);
-				}
-			}
-			return true;
-		}
-
-		public Set<IResource> getChangedResources() {
-			return changedResources;
-		}
-
-		public Set<IResource> getAddedResources() {
-			return addedResources;
-		}
-
-	};
-
-	// TODO e3.4 replace with IContainer.INCLUDE_HIDDEN
-	private static final int INCLUDE_HIDDEN = 8;
-
-	private boolean enabled;
-
-	public ResourceChangeMonitor() {
-		this.enabled = true;
-	}
-
-	public void resourceChanged(IResourceChangeEvent event) {
-		if (!enabled || !ContextCore.getContextManager().isContextActive()) {
-			return;
-		}
-		if (event.getType() != IResourceChangeEvent.POST_CHANGE) {
-			return;
-		}
-		IResourceDelta rootDelta = event.getDelta();
-		if (rootDelta != null) {
-			ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-			try {
-				rootDelta.accept(visitor, IContainer.INCLUDE_TEAM_PRIVATE_MEMBERS | INCLUDE_HIDDEN);
-				if (visitor.hasValidResult()) {
-					ResourcesUi.addResourceToContext(visitor.getChangedResources(), InteractionEvent.Kind.PREDICTION);
-					ResourcesUi.addResourceToContext(visitor.getAddedResources(), InteractionEvent.Kind.PROPAGATION);
-				}
-			} catch (CoreException e) {
-				StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
-						"Could not accept marker visitor", e)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * Public for testing.
-	 */
-	public static String createRegexFromPattern(String pattern) {
-		// prepare the pattern to be a regex
-		pattern = pattern.replaceAll("\\.", "\\\\."); //$NON-NLS-1$ //$NON-NLS-2$
-		pattern = pattern.replaceAll("\\*", ".*"); //$NON-NLS-1$ //$NON-NLS-2$
-		return pattern;
-	}
-
-	/**
-	 * Public for testing.
-	 * 
-	 * @param resource
-	 *            can be null
-	 */
-	public static boolean isExcluded(IPath path, IResource resource, Set<String> excludedPatterns) {
-		if (resource != null && resource.isDerived()) {
-			return true;
-		}
-		boolean excluded = false;
-		// NOTE: n^2 time complexity, but should not be a bottleneck
-		for (String pattern : excludedPatterns) {
-			if (resource != null && pattern.startsWith("file:/")) { //$NON-NLS-1$
-				excluded |= isUriExcluded(resource.getLocationURI().toString(), pattern);
-			} else {
-				for (String segment : path.segments()) {
-					excluded |= segment.matches(pattern);
-
-					// minor performance improvement
-					if (excluded) {
-						break;
-					}
-				}
-			}
-
-			if (excluded) {
-				break;
-			}
-		}
-		return excluded;
-	}
-
-	/**
-	 * Public for testing.
-	 */
-	public static boolean isUriExcluded(String uri, String pattern) {
-		if (uri != null && uri.startsWith(pattern)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceContextLabelProvider.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceContextLabelProvider.java
deleted file mode 100644
index e79c596..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceContextLabelProvider.java
+++ /dev/null
@@ -1,71 +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.resources.ui;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.core.IInteractionRelation;
-import org.eclipse.mylyn.internal.context.ui.AbstractContextLabelProvider;
-import org.eclipse.mylyn.internal.context.ui.ContextUiImages;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public class ResourceContextLabelProvider extends AbstractContextLabelProvider {
-
-	@Override
-	public Image getImage(IInteractionElement node) {
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(ResourceStructureBridge.CONTENT_TYPE);
-		Object object = bridge.getObjectForHandle(node.getHandleIdentifier());
-		return getImageForObject(object);
-	}
-
-	@Override
-	protected Image getImageForObject(Object object) {
-		if (object instanceof IFile) {
-			return ContextUiImages.getImage(ContextUiImages.FILE_GENERIC);
-		} else if (object instanceof IContainer) {
-			return ContextUiImages.getImage(ContextUiImages.FOLDER_GENERIC);
-		}
-		return null;
-	}
-
-	@Override
-	protected String getTextForObject(Object object) {
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(object);
-		return bridge.getLabel(object);
-	}
-
-	/**
-	 * TODO: slow?
-	 */
-	@Override
-	public String getText(IInteractionElement node) {
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(ResourceStructureBridge.CONTENT_TYPE);
-		return bridge.getLabel(bridge.getObjectForHandle(node.getHandleIdentifier()));
-	}
-
-	@Override
-	protected Image getImage(IInteractionRelation edge) {
-		return null;
-	}
-
-	@Override
-	protected String getText(IInteractionRelation edge) {
-		return null;
-	}
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceInteractionMonitor.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceInteractionMonitor.java
deleted file mode 100644
index 3be59ea..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceInteractionMonitor.java
+++ /dev/null
@@ -1,73 +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.resources.ui;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.monitor.ui.AbstractUserInteractionMonitor;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.part.EditorPart;
-
-/**
- * @author Mik Kersten
- */
-public class ResourceInteractionMonitor extends AbstractUserInteractionMonitor {
-
-	private static final String ID_SYNCHRONIZE_VIEW = "org.eclipse.team.sync.views.SynchronizeView"; //$NON-NLS-1$
-
-	@Override
-	protected void handleWorkbenchPartSelection(IWorkbenchPart part, ISelection selection, boolean contributeToContext) {
-		// ignore events from the synchronize view to avoid files jumping between change sets when selected
-		if (ID_SYNCHRONIZE_VIEW.equals(part.getSite().getId())) {
-			return;
-		}
-		if (selection instanceof StructuredSelection) {
-			StructuredSelection structuredSelection = (StructuredSelection) selection;
-
-//			Object selectedObject = structuredSelection.getFirstElement();
-			for (Iterator<?> iterator = structuredSelection.iterator(); iterator.hasNext();) {
-				Object selectedObject = iterator.next();
-				IResource resource;
-				if (selectedObject instanceof IResource) {
-					resource = (IResource) selectedObject;
-					super.handleElementSelection(part, resource, contributeToContext);
-				}
-
-			}
-		} else if (selection instanceof TextSelection) {
-			if (part instanceof EditorPart) {
-				try {
-					Object object = ((EditorPart) part).getEditorInput().getAdapter(IResource.class);
-					if (object instanceof IFile) {
-						IFile file = (IFile) object;
-						if (file.getFileExtension() != null
-								&& !ContextCore.getContentTypes().contains(file.getFileExtension())) {
-							super.handleElementEdit(part, object, contributeToContext);
-						}
-					}
-				} catch (Throwable t) {
-					StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
-							"Failed to resolve resource edit", t)); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceInterestUpdater.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceInterestUpdater.java
deleted file mode 100644
index be94c57..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceInterestUpdater.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.resources.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class ResourceInterestUpdater {
-
-	/**
-	 * In Mylyn 2.0 was: "org.eclipse.mylyn.ide.resource.interest.updater"
-	 */
-	public static final String SOURCE_ID = "org.eclipse.mylyn.resources.ui.interest.updater"; //$NON-NLS-1$
-
-	private boolean syncExec = false;
-
-	public void addResourceToContext(final Set<IResource> resources, final InteractionEvent.Kind interactionKind) {
-		try {
-			if (!resources.isEmpty()) {
-				if (syncExec) {
-					internalAddResourceToContext(resources, interactionKind);
-				} else {
-					final IWorkbench workbench = PlatformUI.getWorkbench();
-					if (!workbench.isClosing() && !workbench.getDisplay().isDisposed()) {
-						workbench.getDisplay().asyncExec(new Runnable() {
-							public void run() {
-								internalAddResourceToContext(resources, interactionKind);
-							}
-						});
-					}
-				}
-			}
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN, "" //$NON-NLS-1$
-					+ "Could not add resource to context: \"" + resources + "\"", t)); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	@SuppressWarnings("restriction")
-	private void internalAddResourceToContext(Set<IResource> resources, InteractionEvent.Kind interactionKind) {
-		List<InteractionEvent> interactionEvents = new ArrayList<InteractionEvent>();
-		for (IResource resource : resources) {
-			if (acceptResource(resource)) {
-				AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(resource);
-				String handle = bridge.getHandleIdentifier(resource);
-				if (handle != null) {
-					IInteractionElement element = ContextCore.getContextManager().getElement(handle);
-					if (element != null && !element.getInterest().isInteresting()) {
-						InteractionEvent interactionEvent = new InteractionEvent(interactionKind,
-								bridge.getContentType(), handle, SOURCE_ID);
-						interactionEvents.add(interactionEvent);
-					}
-				}
-			}
-		}
-		ContextCorePlugin.getContextManager().processInteractionEvents(interactionEvents, true);
-//		if (InteractionEvent.Kind.SELECTION.equals(interactionKind)) {
-//		ContextCorePlugin.getContextManager().processInteractionEvents(interactionEvents, true);
-//		} else {
-//			ContextCorePlugin.getContextManager().processInteractionEvents(interactionEvents, false);
-//		}
-	}
-
-	private boolean acceptResource(IResource resource) {
-		if (resource.isAccessible() && !resource.isDerived() && !resource.isPhantom()) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * For testing.
-	 */
-	public void setSyncExec(boolean syncExec) {
-		this.syncExec = syncExec;
-	}
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceStructureBridge.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceStructureBridge.java
deleted file mode 100644
index 2f44ac7..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceStructureBridge.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.resources.ui;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.internal.resources.Marker;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.ui.views.markers.internal.ConcreteMarker;
-
-/**
- * @author Mik Kersten
- */
-public class ResourceStructureBridge extends AbstractContextStructureBridge {
-
-	public final static String CONTENT_TYPE = ContextCore.CONTENT_TYPE_RESOURCE;
-
-	@Override
-	public String getContentType() {
-		return CONTENT_TYPE;
-	}
-
-	@Override
-	public String getParentHandle(String handle, boolean allowChildBridgeHandles) {
-		if (allowChildBridgeHandles) {
-			return getParentHandle(handle);
-		} else {
-			IResource resource = (IResource) getObjectForHandle(handle);
-			if (resource != null) {
-				IContainer parent = resource.getParent();
-				return getHandleIdentifier(parent);
-			}
-		}
-
-		return null;
-	}
-
-	@Override
-	public String getParentHandle(String handle) {
-
-		IResource resource = (IResource) getObjectForHandle(handle);
-		if (resource != null) {
-			IContainer parent = resource.getParent();
-			// try to adapt to the corresponding content type's parent
-			if (resource instanceof IFile) {
-				for (String contentType : ContextCore.getChildContentTypes(CONTENT_TYPE)) {
-					AbstractContextStructureBridge parentBridge = ContextCore.getStructureBridge(contentType);
-					Object adaptedParent = parentBridge.getAdaptedParent(resource);
-					// HACK: only returns first
-					if (adaptedParent != null) {
-						return parentBridge.getHandleIdentifier(adaptedParent);
-					}
-				}
-			}
-			return getHandleIdentifier(parent);
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public List<String> getChildHandles(String handle) {
-		Object object = getObjectForHandle(handle);
-		if (object instanceof IResource) {
-			IResource resource = (IResource) object;
-			if (resource instanceof IContainer) {
-				IContainer container = (IContainer) resource;
-				IResource[] children;
-				try {
-					// make sure that we dont try to get the children of a closed project as this can cause an exception
-					if (container.isAccessible()) {
-						children = container.members();
-						List<String> childHandles = new ArrayList<String>();
-						for (IResource element : children) {
-							String childHandle = getHandleIdentifier(element);
-							if (childHandle != null) {
-								childHandles.add(childHandle);
-							}
-						}
-						return childHandles;
-					}
-				} catch (Exception e) {
-					StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN, "" //$NON-NLS-1$
-							+ "Could not get child", e)); //$NON-NLS-1$
-				}
-			} else if (resource instanceof IFile) {
-				// delegate to child bridges
-			}
-		}
-		return Collections.emptyList();
-	}
-
-	/**
-	 * Uses java-style path for projects.
-	 */
-	@Override
-	public String getHandleIdentifier(Object object) {
-		if (object instanceof IProject) {
-			String path = ((IResource) object).getFullPath().toPortableString();
-			String javaCoreStylePath = "=" + path.substring(1); //$NON-NLS-1$
-			return javaCoreStylePath;
-		}
-		if (object instanceof IResource) {
-			return ((IResource) object).getFullPath().toPortableString();
-
-		} else if (object instanceof IAdaptable) {
-			IAdaptable adaptable = (IAdaptable) object;
-			Object adapter = adaptable.getAdapter(IResource.class);
-			if (adapter instanceof IResource) {
-				return ((IResource) adapter).getFullPath().toPortableString();
-			}
-
-		}
-		return null;
-	}
-
-	@Override
-	public Object getObjectForHandle(String handle) {
-		if (handle == null) {
-			return null;
-		}
-		IPath path = new Path(handle);
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		if (path.segmentCount() == 1) {
-			String projectName = handle.substring(1);
-			try {
-				return workspace.getRoot().getProject(projectName);
-			} catch (IllegalArgumentException e) {
-				return null;
-			}
-		} else if (path.segmentCount() > 1) {
-			return workspace.getRoot().findMember(path);
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public String getLabel(Object object) {
-		if (object instanceof IResource) {
-			return ((IResource) object).getName();
-		} else {
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	@Override
-	public boolean canBeLandmark(String handle) {
-		Object element = getObjectForHandle(handle);
-		return element instanceof IFile;
-	}
-
-	@Override
-	public boolean acceptsObject(Object object) {
-		if (object instanceof IResource) {
-			return true;
-		}
-		if (object instanceof IAdaptable) {
-			IAdaptable adaptable = (IAdaptable) object;
-			Object adapter = adaptable.getAdapter(IResource.class);
-			if (adapter instanceof IResource) {
-				return true;
-			}
-
-		}
-		return false;
-	}
-
-	@Override
-	public boolean canFilter(Object element) {
-		return true;
-	}
-
-	@Override
-	public boolean isDocument(String handle) {
-		return getObjectForHandle(handle) instanceof IFile;
-	}
-
-	@Override
-	public String getHandleForOffsetInObject(Object object, int offset) {
-		IResource markerResource = null;
-		try {
-			if (object instanceof ConcreteMarker) {
-				markerResource = ((ConcreteMarker) object).getMarker().getResource();
-			} else if (object instanceof Marker) {
-				markerResource = ((Marker) object).getResource();
-			} else {
-				return null;
-			}
-		} catch (Exception e) {
-			return null;
-		}
-
-		// we can only get a handle for a marker with the resource plugin.xml
-		try {
-			if (markerResource instanceof IFile) {
-				IFile file = (IFile) markerResource;
-				return getHandleIdentifier(file);
-			}
-			return null;
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
-					"Could not find element for: \"" + object + "\"", t)); //$NON-NLS-1$ //$NON-NLS-2$
-			return null;
-		}
-	}
-
-	@Override
-	public String getContentType(String elementHandle) {
-		return getContentType();
-	}
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceUiBridge.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceUiBridge.java
deleted file mode 100644
index 836ca35..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceUiBridge.java
+++ /dev/null
@@ -1,135 +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.resources.ui;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-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.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.AbstractContextUiBridge;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * @author Mik Kersten
- */
-public class ResourceUiBridge extends AbstractContextUiBridge {
-
-	@Override
-	public void open(IInteractionElement element) {
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(element.getContentType());
-		if (bridge == null) {
-			return;
-		} else {
-			IResource resource = (IResource) bridge.getObjectForHandle(element.getHandleIdentifier());
-			if (resource instanceof IFile && resource.exists()) {
-				internalOpenEditor((IFile) resource, true);
-			}
-		}
-	}
-
-	private void internalOpenEditor(IFile file, boolean activate) {
-		try {
-			IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			IEditorDescriptor editorDescriptor = IDE.getDefaultEditor(file);
-			if (editorDescriptor != null && editorDescriptor.isInternal() && !editorDescriptor.isOpenInPlace()
-					&& !isContextIgnoring(editorDescriptor)) {
-				IDE.openEditor(activePage, file, activate);
-			}
-		} catch (PartInitException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
-					"Failed to open editor for: \"" + file + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	private boolean isContextIgnoring(IEditorDescriptor editorDescriptor) {
-		// TODO: could find a better mechanism than tagging the ID
-		if (editorDescriptor.getId() != null && editorDescriptor.getId().endsWith(".contextIgnoring")) { //$NON-NLS-1$
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	@Override
-	public void close(IInteractionElement element) {
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(element.getContentType());
-		Object object = bridge.getObjectForHandle(element.getHandleIdentifier());
-		if (object instanceof IFile) {
-			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			if (page != null) {
-				List<IEditorReference> toClose = new ArrayList<IEditorReference>(0);
-				for (IEditorReference reference : page.getEditorReferences()) {
-					try {
-						IResource input = (IResource) reference.getEditorInput().getAdapter(IResource.class);
-						if (input instanceof IFile && ((IFile) input).equals(object)) {
-							toClose.add(reference);
-						}
-					} catch (PartInitException e) {
-						// ignore
-					}
-				}
-				if (toClose.size() > 0) {
-					page.closeEditors(toClose.toArray(new IEditorReference[toClose.size()]), true);
-				}
-			}
-		}
-	}
-
-	@Override
-	public boolean acceptsEditor(IEditorPart editorPart) {
-		return false;
-	}
-
-	@Override
-	public List<TreeViewer> getContentOutlineViewers(IEditorPart editor) {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public Object getObjectForTextSelection(TextSelection selection, IEditorPart editor) {
-		return null;
-	}
-
-	@Override
-	public IInteractionElement getElement(IEditorInput input) {
-		Object adapter = input.getAdapter(IResource.class);
-		if (adapter instanceof IFile) {
-			IFile javaElement = (IFile) adapter;
-			String handle = ContextCore.getStructureBridge(javaElement).getHandleIdentifier(javaElement);
-			return ContextCore.getContextManager().getElement(handle);
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public String getContentType() {
-		return ResourceStructureBridge.CONTENT_TYPE;
-	}
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiBridgePlugin.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiBridgePlugin.java
deleted file mode 100644
index 2c5617d..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiBridgePlugin.java
+++ /dev/null
@@ -1,208 +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.resources.ui;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.context.ui.IContextUiStartup;
-import org.eclipse.mylyn.monitor.ui.MonitorUi;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * Main entry point for the Resource Structure Bridge. Initialization order is very important.
- * 
- * @author Mik Kersten
- * @author Steffen Pingel
- * @since 3.0
- */
-public class ResourcesUiBridgePlugin extends AbstractUIPlugin {
-
-	/**
-	 * @since 3.0
-	 */
-	public static class ResourcesUiBridgeStartup implements IContextUiStartup {
-
-		public void lazyStartup() {
-			ResourcesUiBridgePlugin.getDefault().lazyStart();
-		}
-
-	}
-
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.resources.ui"; //$NON-NLS-1$
-
-	private static ResourcesUiBridgePlugin INSTANCE;
-
-	private ResourceChangeMonitor resourceChangeMonitor;
-
-	private ResourceInteractionMonitor resourceInteractionMonitor;
-
-	private EditorInteractionMonitor interestEditorTracker;
-
-	private ResourceInterestUpdater interestUpdater;
-
-	private static final String PREF_STORE_DELIM = ", "; //$NON-NLS-1$
-
-	public static final String PREF_RESOURCES_IGNORED = "org.eclipse.mylyn.ide.resources.ignored.pattern"; //$NON-NLS-1$
-
-	public static final String PREF_VAL_DEFAULT_RESOURCES_IGNORED = ".*" + PREF_STORE_DELIM; //$NON-NLS-1$
-
-	public ResourcesUiBridgePlugin() {
-		super();
-		INSTANCE = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		initPreferenceDefaults();
-		interestUpdater = new ResourceInterestUpdater();
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	protected void lazyStart() {
-		resourceChangeMonitor = new ResourceChangeMonitor();
-		resourceInteractionMonitor = new ResourceInteractionMonitor();
-		interestEditorTracker = new EditorInteractionMonitor();
-
-		MonitorUi.getSelectionMonitors().add(resourceInteractionMonitor);
-
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeMonitor,
-				IResourceChangeEvent.POST_CHANGE);
-
-		interestEditorTracker.install(PlatformUI.getWorkbench());
-	}
-
-	protected void lazyStop() {
-		if (resourceChangeMonitor != null) {
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeMonitor);
-		}
-		if (resourceInteractionMonitor != null) {
-			MonitorUi.getSelectionMonitors().remove(resourceInteractionMonitor);
-		}
-		if (interestEditorTracker != null) {
-			interestEditorTracker.dispose(PlatformUI.getWorkbench());
-		}
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		lazyStop();
-
-		super.stop(context);
-		INSTANCE = null;
-	}
-
-	private void initPreferenceDefaults() {
-		getPreferenceStore().setDefault(PREF_RESOURCES_IGNORED, PREF_VAL_DEFAULT_RESOURCES_IGNORED);
-	}
-
-	public List<IResource> getInterestingResources(IInteractionContext context) {
-		List<IResource> interestingResources = new ArrayList<IResource>();
-		Collection<IInteractionElement> resourceElements = ContextCore.getContextManager().getActiveDocuments(context);
-		for (IInteractionElement element : resourceElements) {
-			IResource resource = getResourceForElement(element, false);
-			if (resource != null) {
-				interestingResources.add(resource);
-			}
-		}
-		return interestingResources;
-	}
-
-	public void setExcludedResourcePatterns(Set<String> patterns) {
-		StringBuilder store = new StringBuilder();
-		for (String string : patterns) {
-			store.append(string);
-			store.append(PREF_STORE_DELIM);
-		}
-		getPreferenceStore().setValue(PREF_RESOURCES_IGNORED, store.toString());
-	}
-
-	public Set<String> getExcludedResourcePatterns() {
-		Set<String> ignored = new HashSet<String>();
-		String read = getPreferenceStore().getString(PREF_RESOURCES_IGNORED);
-		if (read != null) {
-			StringTokenizer st = new StringTokenizer(read, PREF_STORE_DELIM);
-			while (st.hasMoreTokens()) {
-				ignored.add(st.nextToken());
-			}
-		}
-		return ignored;
-	}
-
-	public static ResourceInterestUpdater getInterestUpdater() {
-		return INSTANCE.interestUpdater;
-	}
-
-	public IResource getResourceForElement(IInteractionElement element, boolean findContainingResource) {
-		if (element == null) {
-			return null;
-		}
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(element.getContentType());
-		Object object = bridge.getObjectForHandle(element.getHandleIdentifier());
-		if (object instanceof IResource) {
-			return (IResource) object;
-		} else if (object instanceof IAdaptable) {
-			Object adapted = ((IAdaptable) object).getAdapter(IResource.class);
-			if (adapted instanceof IResource) {
-				return (IResource) adapted;
-			}
-		}
-		if (findContainingResource) { // recurse if not found
-			String parentHandle = bridge.getParentHandle(element.getHandleIdentifier());
-			if (element.getHandleIdentifier().equals(parentHandle)) {
-				return null;
-			} else {
-				return getResourceForElement(ContextCore.getContextManager().getElement(parentHandle), true);
-			}
-		} else {
-			return null;
-		}
-	}
-
-	public void setResourceMonitoringEnabled(boolean enabled) {
-		resourceChangeMonitor.setEnabled(enabled);
-	}
-
-	public static ResourcesUiBridgePlugin getDefault() {
-		return INSTANCE;
-	}
-
-	@Deprecated
-	public ResourceBundle getResourceBundle() {
-		return null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiExtensionPointReader.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiExtensionPointReader.java
deleted file mode 100644
index eb7403c..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiExtensionPointReader.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:
- *     Fabio Zadrozny - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.resources.ui;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * Helper to get extension point contributors
- * 
- * @author Fabio Zadrozny
- */
-public class ResourcesUiExtensionPointReader {
-
-	public final static String EXTENSION_CHANGE_MONITORING = "changeMonitoring"; //$NON-NLS-1$
-
-	public final static String ELEMENT_EXCLUDE = "exclude"; //$NON-NLS-1$
-
-	public final static String ATTR_PATTERN = "pattern"; //$NON-NLS-1$
-
-	private static Set<String> resourceExclusionPatterns = new HashSet<String>();
-
-	private static boolean extensionsRead = false;
-
-	public static Set<String> getDefaultResourceExclusions() {
-		if (!extensionsRead) {
-			readExtensions();
-		}
-		return resourceExclusionPatterns;
-	}
-
-	private static void readExtensions() {
-		IExtensionPoint teamProvider = Platform.getExtensionRegistry().getExtensionPoint(
-				ResourcesUiBridgePlugin.ID_PLUGIN + '.' + EXTENSION_CHANGE_MONITORING);
-		IExtension[] extensions = teamProvider.getExtensions();
-		for (IExtension extension : extensions) {
-			IConfigurationElement[] elements = extension.getConfigurationElements();
-
-			for (IConfigurationElement element : elements) {
-				if (ELEMENT_EXCLUDE.equals(element.getName())) {
-					readLinkProvider(element);
-				}
-			}
-		}
-		extensionsRead = true;
-	}
-
-	private static void readLinkProvider(IConfigurationElement element) {
-		String exclude = element.getAttribute(ATTR_PATTERN);
-		if (exclude != null) {
-			resourceExclusionPatterns.add(exclude);
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiPreferenceInitializer.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiPreferenceInitializer.java
deleted file mode 100644
index 11426bd..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourcesUiPreferenceInitializer.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:
- *     Fabio Zadrozny - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.resources.ui;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-
-/**
- * This class is responsible for creating, storing and retrieving the values for the default context in the preference
- * store. It is registered as an initializer class for the 'org.eclipse.core.runtime.preferences' extension point.
- * 
- * @author Fabio (bug 178931)
- * @author Mik Kersten
- */
-public class ResourcesUiPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	// XXX these constants are duplicated in ResourcesUiBridgePlugin
-	public static final String PREF_DEFAULT_SCOPE = "org.eclipse.mylyn.ide.resources"; //$NON-NLS-1$
-
-	private static final String PREF_STORE_DELIM = ", "; //$NON-NLS-1$
-
-	public static final String PREF_RESOURCES_IGNORED = PREF_DEFAULT_SCOPE + ".ignored.pattern"; //$NON-NLS-1$
-
-	public static Set<String> forcedExclusionPatterns = new HashSet<String>();
-
-	@Override
-	public void initializeDefaultPreferences() {
-		// ignore, default comes from extension point
-	}
-
-	/**
-	 * Restores the default values for the patterns to ignore.
-	 */
-	public static void restoreDefaultExcludedResourcePatterns() {
-		setExcludedResourcePatterns(ResourcesUiExtensionPointReader.getDefaultResourceExclusions());
-	}
-
-	public static void setExcludedResourcePatterns(Set<String> patterns) {
-		StringBuilder store = new StringBuilder();
-		for (String string : patterns) {
-			store.append(string);
-			store.append(PREF_STORE_DELIM);
-		}
-		ResourcesUiBridgePlugin.getDefault().getPreferenceStore().setValue(PREF_RESOURCES_IGNORED, store.toString());
-	}
-
-	public static Set<String> getExcludedResourcePatterns() {
-		Set<String> exclusions = new HashSet<String>();
-		String read = ResourcesUiBridgePlugin.getDefault().getPreferenceStore().getString(PREF_RESOURCES_IGNORED);
-		if (read != null) {
-			StringTokenizer st = new StringTokenizer(read, PREF_STORE_DELIM);
-			while (st.hasMoreTokens()) {
-				exclusions.add(st.nextToken());
-			}
-		}
-		return exclusions;
-	}
-
-	public static Set<String> getForcedExcludedResourcePatterns() {
-		return forcedExclusionPatterns;
-	}
-
-	/**
-	 * TODO: move and consider for API
-	 */
-	public static void addForcedExclusionPattern(String pattern) {
-		forcedExclusionPatterns.add(pattern);
-	}
-
-	public static void removeForcedExclusionPattern(String pattern) {
-		forcedExclusionPatterns.remove(pattern);
-	}
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/messages.properties b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/messages.properties
deleted file mode 100644
index eb27f95..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-EditorInteractionMonitor_Closing_a_file_automatically_removes_it_from_the_Task_Context=Closing a file automatically removes it from the Task Context. This is recommended in order to make the open editors match the focused views. It can be disabled via Preferences -> Mylyn -> Context.\n\
-\n\
-This dialog will not show again.
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/FocusedResourcesPreferencePage.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/FocusedResourcesPreferencePage.java
deleted file mode 100644
index 3f72398..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/FocusedResourcesPreferencePage.java
+++ /dev/null
@@ -1,198 +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.resources.ui.preferences;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiPreferenceInitializer;
-import org.eclipse.swt.SWT;
-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.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * @author Mik Kersten
- */
-public class FocusedResourcesPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	public static final Color GRAY = new Color(Display.getDefault(), 100, 100, 100);
-
-	private static final String LABEL_AUTOMATIC = Messages.FocusedResourcesPreferencePage__automatic_;
-
-	private Table ignoreTable;
-
-	private Button addButton;
-
-	private Button removeButton;
-
-	public void init(IWorkbench workbench) {
-		// ignore
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		createExcludesTable(parent);
-
-		return parent;
-	}
-
-	private void createExcludesTable(Composite parent) {
-		Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
-		group.setText(Messages.FocusedResourcesPreferencePage_Resource_Monitoring_Exclusions);
-		GridLayout layout = new GridLayout(1, false);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		group.setLayout(layout);
-
-		Composite composite = new Composite(group, SWT.NULL);
-		layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label l1 = new Label(composite, SWT.NULL);
-		l1.setText(Messages.FocusedResourcesPreferencePage_Matching_file_or_directory_names_will_not_be_added_automatically_to_the_context);
-		GridData data = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-		data.horizontalSpan = 2;
-		l1.setLayoutData(data);
-
-		ignoreTable = new Table(composite, SWT.BORDER);
-		data = new GridData(GridData.FILL_BOTH);
-		// gd.widthHint = convertWidthInCharsToPixels(30);
-		data.heightHint = 60;
-		ignoreTable.setLayoutData(data);
-		ignoreTable.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				handleSelection();
-			}
-		});
-
-		Composite buttons = new Composite(composite, SWT.NULL);
-		buttons.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttons.setLayout(layout);
-
-		addButton = new Button(buttons, SWT.PUSH);
-		addButton.setText(Messages.FocusedResourcesPreferencePage_Add_);
-		addButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				addIgnore();
-			}
-		});
-
-		removeButton = new Button(buttons, SWT.PUSH);
-		removeButton.setText(Messages.FocusedResourcesPreferencePage_Remove);
-		removeButton.setEnabled(false);
-		removeButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				removeIgnore();
-			}
-		});
-		fillTable(ResourcesUiPreferenceInitializer.getExcludedResourcePatterns(),
-				ResourcesUiPreferenceInitializer.getForcedExcludedResourcePatterns());
-		Dialog.applyDialogFont(group);
-		setButtonLayoutData(addButton);
-		setButtonLayoutData(removeButton);
-	}
-
-	/**
-	 * Do anything necessary because the OK button has been pressed.
-	 * 
-	 * @return whether it is okay to close the preference page
-	 */
-	@Override
-	public boolean performOk() {
-		Set<String> patterns = new HashSet<String>();
-		TableItem[] items = ignoreTable.getItems();
-		for (int i = 0; i < items.length; i++) {
-			if (!items[i].getText().endsWith(LABEL_AUTOMATIC)) {
-				patterns.add(items[i].getText());
-			}
-		}
-		ResourcesUiPreferenceInitializer.setExcludedResourcePatterns(patterns);
-		return true;
-	}
-
-	@Override
-	protected void performDefaults() {
-		super.performDefaults();
-		ignoreTable.removeAll();
-		ResourcesUiPreferenceInitializer.restoreDefaultExcludedResourcePatterns();
-		fillTable(ResourcesUiPreferenceInitializer.getExcludedResourcePatterns(),
-				ResourcesUiPreferenceInitializer.getForcedExcludedResourcePatterns());
-	}
-
-	/**
-	 * @param ignore
-	 */
-	private void fillTable(Set<String> ignored, Set<String> forced) {
-		for (String pattern : ignored) {
-			TableItem item = new TableItem(ignoreTable, SWT.NONE);
-			item.setText(pattern);
-		}
-		for (String pattern : forced) {
-			TableItem item = new TableItem(ignoreTable, SWT.NONE);
-			item.setText(pattern + " " + LABEL_AUTOMATIC); //$NON-NLS-1$
-			item.setForeground(GRAY);
-		}
-	}
-
-	private void addIgnore() {
-		InputDialog dialog = new InputDialog(getShell(), Messages.FocusedResourcesPreferencePage_Add__IGNORED_RESOURCE, Messages.FocusedResourcesPreferencePage_Enter_pattern_____any_string_,
-				null, null); // 
-		dialog.open();
-		if (dialog.getReturnCode() != Window.OK) {
-			return;
-		}
-		String pattern = dialog.getValue();
-		if (pattern.equals("")) { //$NON-NLS-1$
-			return;
-		}
-		TableItem item = new TableItem(ignoreTable, SWT.NONE);
-		item.setText(pattern);
-		item.setChecked(true);
-	}
-
-	private void removeIgnore() {
-		int[] selection = ignoreTable.getSelectionIndices();
-		ignoreTable.remove(selection);
-	}
-
-	private void handleSelection() {
-		if (ignoreTable.getSelectionCount() > 0) {
-			removeButton.setEnabled(true);
-		} else {
-			removeButton.setEnabled(false);
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/Messages.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/Messages.java
deleted file mode 100644
index dc05f9f..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/Messages.java
+++ /dev/null
@@ -1,35 +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.resources.ui.preferences;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.resources.ui.preferences.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 FocusedResourcesPreferencePage_Add_;
-	public static String FocusedResourcesPreferencePage_Add__IGNORED_RESOURCE;
-	public static String FocusedResourcesPreferencePage__automatic_;
-	public static String FocusedResourcesPreferencePage_Enter_pattern_____any_string_;
-	public static String FocusedResourcesPreferencePage_Matching_file_or_directory_names_will_not_be_added_automatically_to_the_context;
-	public static String FocusedResourcesPreferencePage_Remove;
-	public static String FocusedResourcesPreferencePage_Resource_Monitoring_Exclusions;
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/messages.properties b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/messages.properties
deleted file mode 100644
index aa42689..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/preferences/messages.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-FocusedResourcesPreferencePage_Add_=Add...
-FocusedResourcesPreferencePage_Add__IGNORED_RESOURCE=Add Ignored Resource
-FocusedResourcesPreferencePage__automatic_=[automatic]
-FocusedResourcesPreferencePage_Enter_pattern_____any_string_=Enter pattern (* = any string)
-FocusedResourcesPreferencePage_Matching_file_or_directory_names_will_not_be_added_automatically_to_the_context=Matching file or directory names will not be added automatically to the context
-FocusedResourcesPreferencePage_Remove=Remove
-FocusedResourcesPreferencePage_Resource_Monitoring_Exclusions=Resource Monitoring Exclusions
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/resources/ui/FocusCommonNavigatorAction.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/resources/ui/FocusCommonNavigatorAction.java
deleted file mode 100644
index 8ad6e50..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/resources/ui/FocusCommonNavigatorAction.java
+++ /dev/null
@@ -1,259 +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.resources.ui;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.expressions.Expression;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.ui.AbstractAutoFocusViewAction;
-import org.eclipse.mylyn.context.ui.InterestFilter;
-import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.internal.navigator.NavigatorContentService;
-import org.eclipse.ui.internal.navigator.actions.LinkEditorAction;
-import org.eclipse.ui.internal.navigator.filters.CommonFilterDescriptor;
-import org.eclipse.ui.internal.navigator.filters.CommonFilterDescriptorManager;
-import org.eclipse.ui.internal.navigator.filters.CoreExpressionFilter;
-import org.eclipse.ui.internal.navigator.filters.SelectFiltersAction;
-import org.eclipse.ui.navigator.CommonNavigator;
-import org.eclipse.ui.navigator.ILinkHelper;
-
-/**
- * @author Mik Kersten
- * @since 3.0
- */
-public abstract class FocusCommonNavigatorAction extends AbstractAutoFocusViewAction {
-
-	private Object linkService;
-
-	private Method linkServiceMethod;
-
-	private boolean resolveFailed;
-
-	private CommonNavigator commonNavigator;
-
-	private CommonFilterDescriptor[] filterDescriptors;
-
-	private Field filterExpressionField1;
-
-	private Field filterExpressionField2;
-
-	public FocusCommonNavigatorAction(InterestFilter interestFilter, boolean manageViewer, boolean manageFilters,
-			boolean manageLinking) {
-		super(interestFilter, manageViewer, manageFilters, manageLinking);
-	}
-
-	@Override
-	protected boolean installInterestFilter(StructuredViewer viewer) {
-		if (commonNavigator == null) {
-			commonNavigator = (CommonNavigator) super.getPartForAction();
-		}
-
-		try {
-			// XXX: reflection
-			Class<?> clazz2 = CoreExpressionFilter.class;
-			filterExpressionField1 = clazz2.getDeclaredField("filterExpression"); //$NON-NLS-1$
-			filterExpressionField1.setAccessible(true);
-
-			Class<?> clazz1 = CommonFilterDescriptor.class;
-			filterExpressionField2 = clazz1.getDeclaredField("filterExpression"); //$NON-NLS-1$
-			filterExpressionField2.setAccessible(true);
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
-					"Could not determine filter", e)); //$NON-NLS-1$
-		}
-
-		filterDescriptors = CommonFilterDescriptorManager.getInstance().findVisibleFilters(
-				commonNavigator.getNavigatorContentService());
-
-		return super.installInterestFilter(viewer);
-	}
-
-	@Override
-	protected ISelection resolveSelection(IEditorPart editor, ITextSelection changedSelection, StructuredViewer viewer)
-			throws CoreException {
-		if (resolveFailed) {
-			return null;
-		}
-		if (linkServiceMethod == null) {
-			// TODO e3.5 replace with call to CommonNavigator.getLinkHelperService()
-			try {
-				try {
-					// e3.5: get helper from common navigator
-					Method method = CommonNavigator.class.getDeclaredMethod("getLinkHelperService"); //$NON-NLS-1$
-					method.setAccessible(true);
-					linkService = method.invoke(commonNavigator);
-				} catch (NoSuchMethodException e) {
-					// e3.3, e3.4: instantiate helper
-					Class<?> clazz = Class.forName("org.eclipse.ui.internal.navigator.extensions.LinkHelperService"); //$NON-NLS-1$
-					Constructor<?> constructor = clazz.getConstructor(NavigatorContentService.class);
-					linkService = constructor.newInstance((NavigatorContentService) commonNavigator.getCommonViewer()
-							.getNavigatorContentService());
-				}
-				linkServiceMethod = linkService.getClass().getDeclaredMethod("getLinkHelpersFor", IEditorInput.class); //$NON-NLS-1$
-			} catch (Throwable e) {
-				resolveFailed = true;
-				StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
-						"Initialization of LinkHelperService failed", e)); //$NON-NLS-1$
-			}
-		}
-
-		IEditorInput input = editor.getEditorInput();
-		// TODO e3.5 replace with call to linkService.getLinkHelpersFor(editor.getEditorInput());
-		ILinkHelper[] helpers;
-		try {
-			helpers = (ILinkHelper[]) linkServiceMethod.invoke(linkService, editor.getEditorInput());
-		} catch (Exception e) {
-			return null;
-		}
-
-		IStructuredSelection selection = StructuredSelection.EMPTY;
-		IStructuredSelection newSelection = StructuredSelection.EMPTY;
-
-		for (ILinkHelper helper : helpers) {
-			selection = helper.findSelection(input);
-			if (selection != null && !selection.isEmpty()) {
-				newSelection = mergeSelection(newSelection, selection);
-			}
-		}
-		if (!newSelection.isEmpty()) {
-			return newSelection;
-		}
-		return null;
-	}
-
-	@Override
-	protected void select(StructuredViewer viewer, ISelection toSelect) {
-		if (commonNavigator == null) {
-			commonNavigator = (CommonNavigator) super.getPartForAction();
-		}
-		if (commonNavigator != null) {
-			commonNavigator.selectReveal(toSelect);
-		}
-	}
-
-	// TODO: should have better way of doing this
-	@Override
-	protected void setManualFilteringAndLinkingEnabled(boolean on) {
-		IViewPart part = super.getPartForAction();
-		if (part instanceof CommonNavigator) {
-			for (IContributionItem item : ((CommonNavigator) part).getViewSite()
-					.getActionBars()
-					.getToolBarManager()
-					.getItems()) {
-				if (item instanceof ActionContributionItem) {
-					ActionContributionItem actionItem = (ActionContributionItem) item;
-					if (actionItem.getAction() instanceof LinkEditorAction) {
-						actionItem.getAction().setEnabled(on);
-					}
-				}
-			}
-			for (IContributionItem item : ((CommonNavigator) part).getViewSite()
-					.getActionBars()
-					.getMenuManager()
-					.getItems()) {
-				if (item instanceof ActionContributionItem) {
-					ActionContributionItem actionItem = (ActionContributionItem) item;
-					if (actionItem.getAction() instanceof SelectFiltersAction) {
-						actionItem.getAction().setEnabled(on);
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	protected void setDefaultLinkingEnabled(boolean on) {
-		IViewPart part = super.getPartForAction();
-		if (part instanceof CommonNavigator) {
-			((CommonNavigator) part).setLinkingEnabled(on);
-		}
-	}
-
-	@Override
-	protected boolean isDefaultLinkingEnabled() {
-		IViewPart part = super.getPartForAction();
-		if (part instanceof CommonNavigator) {
-			return ((CommonNavigator) part).isLinkingEnabled();
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean isPreservedFilter(ViewerFilter filter) {
-		if (filter instanceof CoreExpressionFilter) {
-			CoreExpressionFilter expressionFilter = (CoreExpressionFilter) filter;
-
-			Set<String> preservedIds = ContextUiPlugin.getDefault().getPreservedFilterIds(viewPart.getSite().getId());
-			if (!preservedIds.isEmpty()) {
-				try {
-					Expression expression2 = (Expression) filterExpressionField1.get(expressionFilter);
-
-					for (CommonFilterDescriptor commonFilterDescriptor : filterDescriptors) {
-						if (preservedIds.contains(commonFilterDescriptor.getId())) {
-							Expression expression1 = (Expression) filterExpressionField2.get(commonFilterDescriptor);
-							if (expression1 != null && expression1.equals(expression2)) {
-								return true;
-							}
-						}
-					}
-				} catch (IllegalArgumentException e) {
-					StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
-							"Could not determine filter", e)); //$NON-NLS-1$
-				} catch (IllegalAccessException e) {
-					StatusHandler.log(new Status(IStatus.ERROR, ResourcesUiBridgePlugin.ID_PLUGIN,
-							"Could not determine filter", e)); //$NON-NLS-1$
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Copied from
-	 * 
-	 * @{link LinkEditorAction}
-	 */
-	@SuppressWarnings("unchecked")
-	private IStructuredSelection mergeSelection(IStructuredSelection aBase, IStructuredSelection aSelectionToAppend) {
-		if (aBase == null || aBase.isEmpty()) {
-			return (aSelectionToAppend != null) ? aSelectionToAppend : StructuredSelection.EMPTY;
-		} else if (aSelectionToAppend == null || aSelectionToAppend.isEmpty()) {
-			return aBase;
-		} else {
-			List newItems = new ArrayList(aBase.toList());
-			newItems.addAll(aSelectionToAppend.toList());
-			return new StructuredSelection(newItems);
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/resources/ui/ResourcesUi.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/resources/ui/ResourcesUi.java
deleted file mode 100644
index 344e40b..0000000
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/resources/ui/ResourcesUi.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.resources.ui;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- * @since 3.0
- */
-public final class ResourcesUi {
-
-	public static void addResourceToContext(final Set<IResource> resources, final InteractionEvent.Kind interactionKind) {
-		ResourcesUiBridgePlugin.getInterestUpdater().addResourceToContext(resources, interactionKind);
-	}
-
-}
diff --git a/org.eclipse.mylyn.team-feature/.project b/org.eclipse.mylyn.team-feature/.project
deleted file mode 100644
index 2b3ec91..0000000
--- a/org.eclipse.mylyn.team-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.team-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.team-feature/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.team-feature/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7b6172c..0000000
--- a/org.eclipse.mylyn.team-feature/.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.team-feature/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.team-feature/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.team-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) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.team-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.team-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 4c9ebcf..0000000
--- a/org.eclipse.mylyn.team-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:51 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.team-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.team-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 992908d..0000000
--- a/org.eclipse.mylyn.team-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Dec 20 14:12:43 PST 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.team-feature/about.html b/org.eclipse.mylyn.team-feature/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.team-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.team-feature/build.properties b/org.eclipse.mylyn.team-feature/build.properties
deleted file mode 100644
index dcaa2fa..0000000
--- a/org.eclipse.mylyn.team-feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.properties,\
-               feature.xml,\
-               epl-v10.html,\
-               license.html,\
-               about.html
-src.includes = about.html
diff --git a/org.eclipse.mylyn.team-feature/epl-v10.html b/org.eclipse.mylyn.team-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.mylyn.team-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.team-feature/feature.properties b/org.eclipse.mylyn.team-feature/feature.properties
deleted file mode 100644
index a6ea878..0000000
--- a/org.eclipse.mylyn.team-feature/feature.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-featureName=Mylyn Bridge: Team Support
-description=Mylyn Task-Focused UI extensions for Team version control.
-providerName=Eclipse Mylyn
-copyright=Copyright (c) 2004, 2008 Tasktop Technologies and others. All rights reserved.
-updateSiteName=Mylyn for Eclipse 3.4
-license=\
-Eclipse Foundation Software User Agreement\n\
-\n\
-March 17, 2005\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). 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.\n\
-Applicable Licenses\n\
-\n\
-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 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS modules ("Modules") and made available as downloadable archives ("Downloads").\n\
-\n\
-    * Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
-    * Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java\u2122 ARchive) in a directory named "plugins".\n\
-    * 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 "features". Within a Feature, files named "feature.xml" may contain a list of the names and version 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 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 contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module 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 Eclipse Update Manager, you must agree to a license ("Feature Update License") 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 "license" property of files named "feature.properties" 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.\n\
-\n\
-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):\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\
-    * IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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 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.\n\
-Cryptography\n\
-\n\
-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&apos;s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
diff --git a/org.eclipse.mylyn.team-feature/feature.xml b/org.eclipse.mylyn.team-feature/feature.xml
deleted file mode 100644
index ee9a933..0000000
--- a/org.eclipse.mylyn.team-feature/feature.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.mylyn.team_feature"
-      label="%featureName"
-      version="3.2.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>
-
-   <requires>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.team.core"/>
-      <import plugin="org.eclipse.team.ui"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.navigator"/>
-      <import plugin="org.eclipse.ui.navigator.resources"/>
-      <import plugin="org.eclipse.mylyn.context.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.context.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.resources.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.tasks.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.tasks.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.monitor.core" version="3.0.0" match="compatible"/>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.2.0.qualifier" match="perfect"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.mylyn.team.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.mylyn.team-feature/license.html b/org.eclipse.mylyn.team-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/org.eclipse.mylyn.team-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</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.org CVS repository (&quot;Repository&quot;) in CVS
-   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 Eclipse Update Manager, 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>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</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>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>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/org.eclipse.mylyn.team.cvs/.classpath b/org.eclipse.mylyn.team.cvs/.classpath
deleted file mode 100644
index 8728b53..0000000
--- a/org.eclipse.mylyn.team.cvs/.classpath
+++ /dev/null
@@ -1,12 +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">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/team/internal/ccvs/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/team/internal/core/subscribers/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.team.cvs/.project b/org.eclipse.mylyn.team.cvs/.project
deleted file mode 100644
index bd3d968..0000000
--- a/org.eclipse.mylyn.team.cvs/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.team.cvs</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.team.cvs/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.team.cvs/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7b6172c..0000000
--- a/org.eclipse.mylyn.team.cvs/.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.team.cvs/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.team.cvs/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.team.cvs/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.team.cvs/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.team.cvs/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.team.cvs/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.team.cvs/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.team.cvs/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.team.cvs/.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.team.cvs/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.team.cvs/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.team.cvs/.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.team.cvs/META-INF/MANIFEST.MF b/org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF
deleted file mode 100644
index 374b851..0000000
--- a/org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.team.cvs;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.team.core,
- org.eclipse.team.cvs.ui,
- org.eclipse.team.cvs.core,
- org.eclipse.jface,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.ui.navigator.resources,
- org.eclipse.ui.workbench,
- org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.team.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.resources.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .
-Export-Package: org.eclipse.mylyn.internal.team.ccvs;x-internal:=true
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.team.cvs/about.html b/org.eclipse.mylyn.team.cvs/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.team.cvs/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.team.cvs/build.properties b/org.eclipse.mylyn.team.cvs/build.properties
deleted file mode 100644
index 7e8cb54..0000000
--- a/org.eclipse.mylyn.team.cvs/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/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
diff --git a/org.eclipse.mylyn.team.cvs/plugin.properties b/org.eclipse.mylyn.team.cvs/plugin.properties
deleted file mode 100644
index d801a79..0000000
--- a/org.eclipse.mylyn.team.cvs/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.mylyn.team.cvs
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn CVS Extensions
diff --git a/org.eclipse.mylyn.team.cvs/plugin.xml b/org.eclipse.mylyn.team.cvs/plugin.xml
deleted file mode 100644
index b067b42..0000000
--- a/org.eclipse.mylyn.team.cvs/plugin.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.mylyn.team.ui.changeSets">
-      <activeChangeSetProvider 
-      	class="org.eclipse.mylyn.internal.team.ccvs.CvsActiveChangeSetProvider"/>
-   </extension>
-
-   <extension point="org.eclipse.core.runtime.adapters">
-    <factory adaptableType="org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry"
-             class="org.eclipse.mylyn.internal.team.ccvs.CvsLinkedTaskInfoAdapterFactory">
-       <adapter type="org.eclipse.mylyn.team.ui.AbstractTaskReference"/>
-    </factory>
-    
-	<!--
-	<factory adaptableType="org.eclipse.mylyn.internal.team.ui.ContextChangeSet"
-             class="org.eclipse.mylyn.internal.team.ccvs.CvsChangeSetResourceMappingAdapterFactory">
-       <adapter type="org.eclipse.core.resources.mapping.ResourceMapping"/>
-    </factory>
-    -->
-    </extension>
- 
-  
-    <extension
-         point="org.eclipse.core.runtime.adapters">
-      <factory
-            adaptableType="org.eclipse.mylyn.internal.team.ccvs.CvsContextChangeSet"
-            class="org.eclipse.mylyn.internal.team.ccvs.CvsChangeSetAdapterFactory">
-         <adapter type="org.eclipse.core.resources.mapping.ResourceMapping"/>
-      </factory>
-    </extension>
-       
-   	<extension point="org.eclipse.ui.navigator.viewer">
-	   <viewerActionBinding
-	      viewerId="org.eclipse.team.cvs.ui.workspaceSynchronization">
-	        <includes>
-	           <actionExtension
-			       pattern="org.eclipse.mylyn.ide.ui.actions.TaskResourceMappingActionProvider"/>
-	        </includes>
-	   </viewerActionBinding>
-	</extension>
- 
-    <!-- ================= NAVIGATOR CONTENT =================== 
- 
-    NOTE: the approach below could be used if we created our own change set model,
-    but the current implementation below discards the CVS implementaion that we still rely on.
- 
- 	<extension
-         point="org.eclipse.ui.navigator.navigatorContent">
-      <navigatorContent
-            activeByDefault="true"
-            contentProvider="org.eclipse.team.internal.ccvs.ui.mappings.ChangeSetContentProvider"
-            id="org.eclipse.mylyn.team.cvs.changeSetContent"
-            labelProvider="org.eclipse.team.internal.ccvs.ui.mappings.ChangeSetLabelProvider"
-            name="Task Context Change Sets"
-            priority="normal">
-         <enablement>
-           <or>         
-           		<instanceof value="org.eclipse.mylyn.internal.team.ui.ContextChangeSet"/>
-           </or>
-         </enablement>
-         <commonSorter
-               class="org.eclipse.team.internal.ccvs.ui.mappings.ChangeSetSorter"
-               id="org.eclipse.team.cvs.ui.changeSetSorter"/>
-         <actionProvider
-               class="org.eclipse.team.internal.ccvs.ui.mappings.ChangeSetActionProvider"
-               id="org.eclipse.team.cvs.ui.changeSetActions"/>
-       </navigatorContent>
-   </extension>
-   
-   <extension
-         point="org.eclipse.team.ui.teamContentProviders">
-      <teamContentProvider
-            contentExtensionId="org.eclipse.mylyn.team.cvs.changeSetContent"
-            modelProviderId="org.eclipse.team.cvs.core.changeSetModel"/>
-   </extension>
- 
-   -->
- 
-</plugin>
diff --git a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CommitContextWizard.java b/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CommitContextWizard.java
deleted file mode 100644
index 424b18c..0000000
--- a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CommitContextWizard.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ccvs;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.team.internal.ccvs.core.CVSException;
-import org.eclipse.team.internal.ccvs.ui.wizards.CommitWizard;
-
-/**
- * @author Mik Kersten
- */
-public class CommitContextWizard extends CommitWizard {
-
-	public CommitContextWizard(IResource[] resources, ITask task) throws CVSException {
-		super(resources);
-	}
-
-	@Override
-	public void dispose() {
-		try {
-			super.dispose();
-		} catch (Exception e) {
-			// ignore, see bug 132888
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsActiveChangeSetProvider.java b/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsActiveChangeSetProvider.java
deleted file mode 100644
index 47c4360..0000000
--- a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsActiveChangeSetProvider.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ccvs;
-
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.team.ui.AbstractActiveChangeSetProvider;
-import org.eclipse.mylyn.team.ui.IContextChangeSet;
-import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager;
-
-/**
- * CVS change set integration for Mylyn.
- * 
- * @author Mik Kersten
- */
-public class CvsActiveChangeSetProvider extends AbstractActiveChangeSetProvider {
-
-	@Override
-	public ActiveChangeSetManager getActiveChangeSetManager() {
-		return CVSUIPlugin.getPlugin().getChangeSetManager();
-	}
-
-	@Override
-	public IContextChangeSet createChangeSet(ITask task) {
-		return new CvsContextChangeSet(task, getActiveChangeSetManager());
-	}
-}
diff --git a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsChangeSetAdapterFactory.java b/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsChangeSetAdapterFactory.java
deleted file mode 100644
index fdf5bbb..0000000
--- a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsChangeSetAdapterFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.mylyn.internal.team.ccvs;
-
-import org.eclipse.core.resources.mapping.ResourceMapping;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.team.internal.ccvs.core.mapping.ChangeSetResourceMapping;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSet;
-
-/**
- * @since 3.0
- */
-public class CvsChangeSetAdapterFactory implements IAdapterFactory {
-
-	@SuppressWarnings("unchecked")
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adaptableObject instanceof ActiveChangeSet && adapterType == ResourceMapping.class) {
-			ActiveChangeSet cs = (ActiveChangeSet) adaptableObject;
-			return new ChangeSetResourceMapping(cs);
-		}
-		return null;
-	}
-
-	@SuppressWarnings("unchecked")
-	public Class[] getAdapterList() {
-		return new Class[] { ResourceMapping.class };
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsChangeSetResourceMappingAdapterFactory.java b/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsChangeSetResourceMappingAdapterFactory.java
deleted file mode 100644
index a4611f1..0000000
--- a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsChangeSetResourceMappingAdapterFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ccvs;
-
-import org.eclipse.core.resources.mapping.ResourceMapping;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.team.internal.ccvs.core.mapping.ChangeSetResourceMapping;
-import org.eclipse.team.internal.core.subscribers.DiffChangeSet;
-
-/**
- * @author Eugene Kuleshov
- */
-public class CvsChangeSetResourceMappingAdapterFactory implements IAdapterFactory {
-
-	@SuppressWarnings("unchecked")
-	private static final Class[] ADAPTER_TYPES = new Class[] { ResourceMapping.class };
-
-	@SuppressWarnings("unchecked")
-	public Class[] getAdapterList() {
-		return ADAPTER_TYPES;
-	}
-
-	@SuppressWarnings("unchecked")
-	public Object getAdapter(Object object, Class adapterType) {
-		// used to bind popup menu actions in Synchronize view 
-		if (ResourceMapping.class.equals(adapterType) && object instanceof CvsContextChangeSet) {
-			return new ChangeSetResourceMapping((DiffChangeSet) object);
-		}
-
-		return null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsCommitWorkflowProvider.java b/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsCommitWorkflowProvider.java
deleted file mode 100644
index ecf27a5..0000000
--- a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsCommitWorkflowProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ccvs;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.mylyn.internal.team.ui.AbstractCommitWorkflowProvider;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.team.internal.ccvs.core.CVSException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- * 
- * 	TODO: consider deleting, not used
- */
-@SuppressWarnings( { "deprecation", "restriction" })
-public class CvsCommitWorkflowProvider extends AbstractCommitWorkflowProvider {
-
-	private static final String WIZARD_LABEL = Messages.CvsCommitWorkflowProvider_Commit_Resources_in_Task_Context;
-
-	@Override
-	public boolean hasOutgoingChanges(IResource[] resources) {
-		try {
-			CommitContextWizard wizard = new CommitContextWizard(resources, null);
-			return wizard.hasOutgoingChanges();
-		} catch (CVSException e) {
-			return false;
-		}
-	}
-
-	@Override
-	public void commit(IResource[] resources) {
-		try {
-			CommitContextWizard wizard = new CommitContextWizard(resources, null);
-			Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-			if (shell != null && !shell.isDisposed() && wizard.hasOutgoingChanges()) {
-				wizard.loadSize();
-				WizardDialog dialog = new WizardDialog(shell, wizard);
-				dialog.setMinimumPageSize(wizard.loadSize());
-				dialog.create();
-				dialog.setTitle(WIZARD_LABEL);
-				dialog.setBlockOnOpen(true);
-				if (dialog.open() == Window.CANCEL) {
-					dialog.close();
-				}
-			}
-		} catch (CVSException e) {
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsContextChangeSet.java b/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsContextChangeSet.java
deleted file mode 100644
index 4876a24..0000000
--- a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsContextChangeSet.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ccvs;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.team.ui.ContextChangeSet;
-import org.eclipse.mylyn.internal.team.ui.LinkedTaskInfo;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.resources.ui.ResourcesUi;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.team.ui.AbstractTaskReference;
-import org.eclipse.mylyn.team.ui.IContextChangeSet;
-import org.eclipse.team.core.TeamException;
-import org.eclipse.team.core.diff.IDiff;
-import org.eclipse.team.core.diff.provider.ThreeWayDiff;
-import org.eclipse.team.core.mapping.provider.ResourceDiff;
-import org.eclipse.team.internal.ccvs.core.mapping.CVSActiveChangeSet;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * Copied from {@link ContextChangeSet}
- * 
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class CvsContextChangeSet extends CVSActiveChangeSet implements IAdaptable, IContextChangeSet {
-
-	// HACK: copied from super
-	private static final String CTX_TITLE = "title"; //$NON-NLS-1$
-
-	public static final String SOURCE_ID = "org.eclipse.mylyn.java.context.changeset.add"; //$NON-NLS-1$
-
-	private boolean suppressInterestContribution = false;
-
-	private final ITask task;
-
-	public CvsContextChangeSet(ITask task, ActiveChangeSetManager manager) {
-		super(manager, task.getSummary());
-		this.task = task;
-		updateLabel();
-	}
-
-	@Override
-	public boolean isUserCreated() {
-		return true;
-	}
-
-	public void updateLabel() {
-		super.setName(task.getSummary());
-		super.setTitle(task.getSummary());
-	}
-
-	/**
-	 * Encodes the handle in the title, since init won't get called on this class.
-	 */
-	@Override
-	public void save(Preferences prefs) {
-		super.save(prefs);
-		prefs.put(CTX_TITLE, getTitleForPersistance());
-	}
-
-	private String getTitleForPersistance() {
-		return getTitle() + " (" + task.getHandleIdentifier() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public static String getHandleFromPersistedTitle(String title) {
-		int delimStart = title.lastIndexOf('(');
-		int delimEnd = title.lastIndexOf(')');
-		if (delimStart != -1 && delimEnd != -1) {
-			return title.substring(delimStart + 1, delimEnd);
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public String getComment() {
-		return getComment(true);
-	}
-
-	public String getComment(boolean checkTaskRepository) {
-		return ContextChangeSet.getComment(checkTaskRepository, task, getChangedResources());
-	}
-
-	@Override
-	public void remove(IResource resource) {
-		super.remove(resource);
-	}
-
-	@Override
-	public void remove(IResource[] newResources) {
-		super.remove(newResources);
-	}
-
-	@Override
-	public void add(IDiff diff) {
-		super.add(diff);
-		IResource resource = getResourceFromDiff(diff);
-		if (!suppressInterestContribution && resource != null) {
-			Set<IResource> resources = new HashSet<IResource>();
-			resources.add(resource);
-			if (ResourcesUiBridgePlugin.getDefault() != null) {
-				ResourcesUi.addResourceToContext(resources, InteractionEvent.Kind.SELECTION);
-			}
-		}
-	}
-
-	private IResource getResourceFromDiff(IDiff diff) {
-		if (diff instanceof ResourceDiff) {
-			return ((ResourceDiff) diff).getResource();
-		} else if (diff instanceof ThreeWayDiff) {
-			ThreeWayDiff threeWayDiff = (ThreeWayDiff) diff;
-			return ResourcesPlugin.getWorkspace().getRoot().findMember(threeWayDiff.getPath());
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public void add(IDiff[] diffs) {
-		super.add(diffs);
-	}
-
-	@Override
-	public void add(IResource[] newResources) throws CoreException {
-		super.add(newResources);
-	}
-
-	public void restoreResources(IResource[] newResources) throws CoreException {
-		suppressInterestContribution = true;
-		try {
-			super.add(newResources);
-			setComment(getComment(false));
-		} catch (TeamException e) {
-			throw e;
-		} finally {
-			suppressInterestContribution = false;
-		}
-	}
-
-	@Override
-	public IResource[] getResources() {
-		return super.getResources();
-//		List<IResource> allResources = getAllResourcesInChangeContext();
-//		return allResources.toArray(new IResource[allResources.size()]);
-	}
-
-	public IResource[] getChangedResources() {
-		return super.getResources();
-	}
-
-	public List<IResource> getAllResourcesInChangeContext() {
-		Set<IResource> allResources = new HashSet<IResource>();
-		allResources.addAll(Arrays.asList(super.getResources()));
-		if (Platform.isRunning() && ResourcesUiBridgePlugin.getDefault() != null && task.isActive()) {
-			// TODO: if super is always managed correctly should remove
-			// following line
-			allResources.addAll(ResourcesUiBridgePlugin.getDefault().getInterestingResources(
-					ContextCore.getContextManager().getActiveContext()));
-		}
-		return new ArrayList<IResource>(allResources);
-	}
-
-	/**
-	 * TODO: unnessary check context?
-	 */
-	@Override
-	public boolean contains(IResource local) {
-		return super.contains(local); //getAllResourcesInChangeContext().contains(local);
-	}
-
-	@Override
-	public boolean equals(Object object) {
-		if (object instanceof CvsContextChangeSet && task != null) {
-			CvsContextChangeSet changeSet = (CvsContextChangeSet) object;
-			return task.equals(changeSet.getTask());
-		} else {
-			return super.equals(object);
-		}
-	}
-
-	@Override
-	public int hashCode() {
-		if (task != null) {
-			return task.hashCode();
-		} else {
-			return super.hashCode();
-		}
-	}
-
-	public ITask getTask() {
-		return task;
-	}
-
-	@SuppressWarnings("unchecked")
-	public Object getAdapter(Class adapter) {
-//		if (adapter == ResourceMapping.class) {
-//			return null;
-//			return new ChangeSetResourceMapping(this);
-//		}
-		if (adapter == AbstractTask.class) {
-			return task;
-		} else if (adapter == AbstractTaskReference.class) {
-			return new LinkedTaskInfo(getTask(), this);
-		}
-		return Platform.getAdapterManager().getAdapter(this, adapter);
-	}
-}
diff --git a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsLinkedTaskInfoAdapterFactory.java b/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsLinkedTaskInfoAdapterFactory.java
deleted file mode 100644
index 169e7e7..0000000
--- a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsLinkedTaskInfoAdapterFactory.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ccvs;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.internal.team.ui.LinkedTaskInfo;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.team.ui.AbstractTaskReference;
-import org.eclipse.team.core.variants.IResourceVariant;
-import org.eclipse.team.internal.ccvs.core.CVSException;
-import org.eclipse.team.internal.ccvs.core.ICVSResource;
-import org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry;
-import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
-import org.eclipse.team.internal.ccvs.core.resources.RemoteResource;
-
-/**
- * @author Eugene Kuleshov
- */
-public class CvsLinkedTaskInfoAdapterFactory implements IAdapterFactory {
-
-	@SuppressWarnings("unchecked")
-	private static final Class[] ADAPTER_TYPES = new Class[] { AbstractTaskReference.class };
-
-	@SuppressWarnings("unchecked")
-	public Class[] getAdapterList() {
-		return ADAPTER_TYPES;
-	}
-
-	@SuppressWarnings("unchecked")
-	public Object getAdapter(Object object, Class adapterType) {
-		if (!AbstractTaskReference.class.equals(adapterType)) {
-			return null;
-		}
-
-		return adaptFromComment(object);
-	}
-
-	private AbstractTaskReference adaptFromComment(Object object) {
-		String comment = getCommentForElement(object);
-		if (comment == null) {
-			return null;
-		}
-
-		IResource resource = getResourceForElement(object);
-		if (resource != null) {
-			TaskRepository repository = TasksUiPlugin.getDefault().getRepositoryForResource(resource);
-			if (repository != null) {
-				return new LinkedTaskInfo(repository.getRepositoryUrl(), null, null, comment);
-			}
-		}
-
-		return new LinkedTaskInfo(null, null, null, comment);
-	}
-
-	private static String getCommentForElement(Object element) {
-		if (element instanceof LogEntry) {
-			return ((LogEntry) element).getComment();
-		}
-		return null;
-	}
-
-	private static IResource getResourceForElement(Object element) {
-		if (element instanceof IAdaptable) {
-			IAdaptable adaptable = (IAdaptable) element;
-			IResourceVariant resourceVariant = (IResourceVariant) adaptable.getAdapter(IResourceVariant.class);
-			if (resourceVariant != null && resourceVariant instanceof RemoteResource) {
-				RemoteResource remoteResource = (RemoteResource) resourceVariant;
-				// TODO is there a better way then iterating trough all projects?
-				String path = remoteResource.getRepositoryRelativePath();
-				if (path != null) {
-					for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
-						if (project.isAccessible()) {
-							ICVSResource cvsResource = CVSWorkspaceRoot.getCVSFolderFor(project);
-							try {
-								String repositoryRelativePath = cvsResource.getRepositoryRelativePath();
-								if (repositoryRelativePath != null && path.startsWith(repositoryRelativePath)) {
-									return project;
-								}
-							} catch (CVSException ex) {
-								// ignore
-							}
-						}
-					}
-				}
-			}
-		}
-
-		// TODO any other resource types?
-
-		return null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/Messages.java b/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/Messages.java
deleted file mode 100644
index 8daefb2..0000000
--- a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/Messages.java
+++ /dev/null
@@ -1,35 +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.team.ccvs;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.team.ccvs.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 CvsCommitWorkflowProvider_Commit_Resources_in_Task_Context;
-
-	public static String CvsContextChangeSet_Attempting_to_commit_resource;
-
-	public static String CvsContextChangeSet_Mylyn_Change_Set_Management;
-
-}
diff --git a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/messages.properties b/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/messages.properties
deleted file mode 100644
index a90da65..0000000
--- a/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/messages.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-CvsCommitWorkflowProvider_Commit_Resources_in_Task_Context=Commit Resources in Task Context
-
-CvsContextChangeSet_Attempting_to_commit_resource=You are attempting to commit a resource which is not associated with the selected task repository.  Proceed with creating the commit message?
-CvsContextChangeSet_Mylyn_Change_Set_Management=Mylyn Change Set Management
diff --git a/org.eclipse.mylyn.team.tests/.classpath b/org.eclipse.mylyn.team.tests/.classpath
deleted file mode 100644
index 1c9d79f..0000000
--- a/org.eclipse.mylyn.team.tests/.classpath
+++ /dev/null
@@ -1,12 +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">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/mylyn/**"/>
-			<accessrule kind="accessible" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.team.tests/.project b/org.eclipse.mylyn.team.tests/.project
deleted file mode 100644
index 08e2a2d..0000000
--- a/org.eclipse.mylyn.team.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.team.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.team.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.team.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 24505ee..0000000
--- a/org.eclipse.mylyn.team.tests/.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=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.team.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.team.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.team.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.team.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.team.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.team.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.team.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.team.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.team.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.team.tests/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.mylyn.team.tests/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 114cebf..0000000
--- a/org.eclipse.mylyn.team.tests/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,145 +0,0 @@
-#Tue Apr 08 17:51:02 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.team.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.team.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.team.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.team.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.team.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 1ef7033..0000000
--- a/org.eclipse.mylyn.team.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests Plug-in
-Bundle-SymbolicName: org.eclipse.mylyn.team.tests
-Bundle-Version: 0.0.0
-Bundle-Vendor: Eclipse Mylyn
-Require-Bundle: org.junit,
- org.eclipse.mylyn.team.ui,
- org.eclipse.mylyn.team.cvs,
- org.eclipse.mylyn.tasks.core,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.team.core,
- org.eclipse.core.resources,
- org.eclipse.mylyn.context.core,
- org.eclipse.team.cvs.ui,
- org.eclipse.mylyn.monitor.core,
- org.eclipse.mylyn.resources.tests,
- org.eclipse.mylyn.context.tests,
- org.eclipse.mylyn.tasks.ui,
- org.eclipse.mylyn.ide.ui,
- org.eclipse.mylyn.resources.ui,
- org.eclipse.mylyn.monitor.ui,
- org.eclipse.ui.ide,
- org.eclipse.mylyn.tasks.tests,
- org.eclipse.mylyn.context.ui,
- org.eclipse.team.cvs.core,
- org.eclipse.mylyn.commons.ui,
- org.eclipse.team.ui
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.mylyn.team.tests;x-internal:=true
diff --git a/org.eclipse.mylyn.team.tests/about.html b/org.eclipse.mylyn.team.tests/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.team.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.team.tests/build.properties b/org.eclipse.mylyn.team.tests/build.properties
deleted file mode 100644
index 185839e..0000000
--- a/org.eclipse.mylyn.team.tests/build.properties
+++ /dev/null
@@ -1,14 +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
-src.includes = about.html
diff --git a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/AllTeamTests.java b/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/AllTeamTests.java
deleted file mode 100644
index dab9031..0000000
--- a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/AllTeamTests.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.team.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Mik Kersten
- */
-public class AllTeamTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.mylyn.team.tests");
-		//$JUnit-BEGIN$
-		suite.addTestSuite(TestSyncViewRefresh.class);
-		suite.addTestSuite(ChangeSetManagerTest.class);
-		suite.addTestSuite(CommitTemplateTest.class);
-		suite.addTestSuite(TeamPropertiesLinkProviderTest.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/ChangeSetManagerTest.java b/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/ChangeSetManagerTest.java
deleted file mode 100644
index 903378d..0000000
--- a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/ChangeSetManagerTest.java
+++ /dev/null
@@ -1,138 +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.team.tests;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin;
-import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.tasks.core.LocalTask;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.internal.team.ui.ContextActiveChangeSetManager;
-import org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin;
-import org.eclipse.mylyn.resources.tests.AbstractResourceContextTest;
-import org.eclipse.mylyn.team.ui.IContextChangeSet;
-import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSet;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager;
-import org.eclipse.team.internal.core.subscribers.ChangeSet;
-
-/**
- * @author Mik Kersten
- */
-public class ChangeSetManagerTest extends AbstractResourceContextTest {
-
-	private ContextActiveChangeSetManager changeSetManager;
-
-	private ActiveChangeSetManager collector;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		assertNotNull(IdeUiBridgePlugin.getDefault());
-		changeSetManager = (ContextActiveChangeSetManager) FocusedTeamUiPlugin.getDefault()
-				.getContextChangeSetManagers()
-				.iterator()
-				.next();
-		collector = CVSUIPlugin.getPlugin().getChangeSetManager();
-		assertNotNull(changeSetManager);
-		assertNull(TasksUiPlugin.getTaskActivityManager().getActiveTask());
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testDisabledMode() {
-		ChangeSet[] sets = collector.getSets();
-		for (ChangeSet set : sets) {
-			collector.remove(set);
-		}
-
-		assertEquals(0, collector.getSets().length);
-		manager.deactivateContext(taskId);
-		changeSetManager.clearActiveChangeSets();
-		assertEquals(0, changeSetManager.getActiveChangeSets().size());
-
-		changeSetManager.disable();
-
-		AbstractTask task1 = new LocalTask("task1", "label");
-		TasksUiPlugin.getTaskActivityManager().activateTask(task1);
-		assertEquals(0, changeSetManager.getActiveChangeSets().size());
-		assertEquals(0, collector.getSets().length);
-
-		TasksUiPlugin.getTaskActivityManager().deactivateTask(task1);
-		changeSetManager.enable();
-	}
-
-	public void testSingleContextActivation() {
-		ChangeSet[] sets = collector.getSets();
-		for (ChangeSet set : sets) {
-			collector.remove(set);
-		}
-
-		assertEquals(0, collector.getSets().length);
-		manager.deactivateContext(taskId);
-		changeSetManager.clearActiveChangeSets();
-		assertEquals(0, changeSetManager.getActiveChangeSets().size());
-
-		AbstractTask task1 = new LocalTask("task1", "label");
-		TasksUiPlugin.getTaskActivityManager().activateTask(task1);
-		assertEquals(1, changeSetManager.getActiveChangeSets().size());
-		assertEquals(1, collector.getSets().length);
-
-		TasksUiPlugin.getTaskActivityManager().deactivateTask(task1);
-		assertFalse(ContextCore.getContextManager().isContextActive());
-		assertEquals(0, changeSetManager.getActiveChangeSets().size());
-		assertEquals(0, collector.getSets().length); // deleted because no
-		// active resources
-		TasksUiPlugin.getTaskActivityManager().deactivateTask(task1);
-
-		// TODO: test with resource
-	}
-
-	public void testContentsAfterDecay() throws CoreException {
-		IFile file = project.getProject().getFile(new Path("foo.txt"));
-		file.create(null, true, null);
-
-		AbstractTask task1 = new LocalTask("task1", "label");
-		TasksUiPlugin.getTaskActivityManager().activateTask(task1);
-
-		monitor.selectionChanged(navigator, new StructuredSelection(file));
-		IInteractionElement fileElement = ContextCore.getContextManager().getElement(
-				structureBridge.getHandleIdentifier(file));
-		assertTrue(fileElement.getInterest().isInteresting());
-
-		List<IContextChangeSet> changeSets = changeSetManager.getActiveChangeSets();
-		assertEquals(1, changeSets.size());
-		IContextChangeSet set = changeSets.get(0);
-		IResource[] resources = ((ActiveChangeSet) set).getResources();
-		// can have .project file in there
-		assertTrue("length: " + resources.length, resources.length <= 2);
-
-		for (int i = 0; i < 1 / (scaling.getDecay()) * 3; i++) {
-			ContextCore.getContextManager().processInteractionEvent(mockSelection());
-		}
-		assertTrue("" + fileElement.getInterest().getValue(), fileElement.getInterest().getValue() < 0);
-		assertTrue("length: " + resources.length, resources.length <= 2);
-
-		TasksUiPlugin.getTaskActivityManager().deactivateTask(task1);
-	}
-}
diff --git a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/CommitTemplateTest.java b/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/CommitTemplateTest.java
deleted file mode 100644
index 27ee29c..0000000
--- a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/CommitTemplateTest.java
+++ /dev/null
@@ -1,82 +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.team.tests;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.tasks.core.TaskTask;
-import org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin;
-import org.eclipse.mylyn.tasks.tests.connector.MockTask;
-
-/**
- * @author Mik Kersten
- */
-public class CommitTemplateTest extends TestCase {
-
-	public void testCreateTemplate() {
-		String template = "${task.status} - ${connector.task.prefix} ${task.key}: ${task.description}";
-
-		String taskId = "12345678";
-		TaskTask testTask = new TaskTask("no url", taskId, "summary");
-		testTask.setTaskKey(taskId);
-
-		String commitComment = FocusedTeamUiPlugin.getDefault().getCommitTemplateManager().generateComment(testTask,
-				template);
-		assertTrue(commitComment.contains(taskId));
-
-		testTask.setTaskKey(null);
-
-		commitComment = FocusedTeamUiPlugin.getDefault().getCommitTemplateManager().generateComment(testTask, template);
-		assertFalse(commitComment.contains(taskId));
-
-	}
-
-	public void testRepositoryTaskCommentParsing() {
-		String template = FocusedTeamUiPlugin.getDefault().getPreferenceStore().getString(
-				FocusedTeamUiPlugin.COMMIT_TEMPLATE);
-
-		AbstractTask task = new MockTask("12345");
-		String comment = FocusedTeamUiPlugin.getDefault().getCommitTemplateManager().generateComment(task, template);
-
-		String taskId = FocusedTeamUiPlugin.getDefault()
-				.getCommitTemplateManager()
-				.getTaskIdFromCommentOrLabel(comment);
-		assertEquals("12345", taskId);
-	}
-
-	public void testRepositoryTaskCommentParsingMultiline() {
-		String template = FocusedTeamUiPlugin.getDefault().getPreferenceStore().getString(
-				FocusedTeamUiPlugin.COMMIT_TEMPLATE);
-
-		AbstractTask task = new MockTask("12345");
-		String comment = FocusedTeamUiPlugin.getDefault().getCommitTemplateManager().generateComment(task, template)
-				+ "\n";
-
-		String taskId = FocusedTeamUiPlugin.getDefault()
-				.getCommitTemplateManager()
-				.getTaskIdFromCommentOrLabel(comment);
-		assertEquals("12345", taskId);
-	}
-
-	public void testRegex() {
-		String comment = "task 123: label for handle-123";
-		String regex = ".*\\ (\\d+):\\ .*";
-
-		Pattern pattern = Pattern.compile(regex);
-		Matcher matcher = pattern.matcher(comment);
-		assertTrue(matcher.find());
-	}
-}
diff --git a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/TeamPropertiesLinkProviderTest.java b/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/TeamPropertiesLinkProviderTest.java
deleted file mode 100644
index a135f14..0000000
--- a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/TeamPropertiesLinkProviderTest.java
+++ /dev/null
@@ -1,182 +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.team.tests;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.mylyn.internal.team.ui.ContextChangeSet;
-import org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin;
-import org.eclipse.mylyn.internal.team.ui.properties.TeamPropertiesLinkProvider;
-import org.eclipse.mylyn.tasks.tests.connector.MockTask;
-import org.eclipse.team.core.diff.IDiff;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager;
-
-/**
- * @author Steffen Pingel
- */
-public class TeamPropertiesLinkProviderTest extends TestCase {
-
-	private IProject project1;
-
-	private List<IResource> resources;
-
-	private IProject project2;
-
-	@Override
-	protected void setUp() throws Exception {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		project1 = root.getProject("Test Project1");
-		project1.create(null);
-		project1.open(null);
-
-		project2 = root.getProject("Test Project2");
-		project2.create(null);
-		project2.open(null);
-
-		resources = new ArrayList<IResource>();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		project1.delete(true, null);
-		project2.delete(true, null);
-	}
-
-	public void testCommitCommentTemplate() throws Exception {
-		MockTask task = new MockTask("1");
-		task.setSummary("summary");
-		task.setUrl("http://url");
-
-		ContextChangeSet changeSet = new ContextChangeSet(task, new StubChangeSetManager()) {
-			@Override
-			public IResource[] getChangedResources() {
-				return resources.toArray(new IResource[0]);
-			}
-		};
-		resources.add(project1);
-
-		FocusedTeamUiPlugin.getDefault().getPreferenceStore().setValue(FocusedTeamUiPlugin.COMMIT_TEMPLATE,
-				"${task.key}: ${task.description}");
-		assertEquals("1: summary", changeSet.getComment());
-
-		TeamPropertiesLinkProvider linkProvider = new TeamPropertiesLinkProvider();
-		assertNull(linkProvider.getCommitCommentTemplate(project1));
-		assertTrue(linkProvider.canAccessProperties(project1));
-
-		assertTrue(linkProvider.setCommitCommentTemplate(project1, "ab${task.url}cd"));
-		assertEquals("ab${task.url}cd", linkProvider.getCommitCommentTemplate(project1));
-		assertEquals("abhttp://urlcd", changeSet.getComment());
-		assertTrue(linkProvider.canAccessProperties(project1));
-
-		// create file
-		IFile file = project1.getFile("file");
-		file.create(new ByteArrayInputStream(new byte[0]), true, null);
-		resources.clear();
-		resources.add(file);
-
-		assertEquals("ab${task.url}cd", linkProvider.getCommitCommentTemplate(file));
-		assertEquals("abhttp://urlcd", changeSet.getComment());
-		assertTrue(linkProvider.canAccessProperties(file));
-
-		linkProvider.setCommitCommentTemplate(file, null);
-		assertNull(linkProvider.getCommitCommentTemplate(file));
-		assertNull(linkProvider.getCommitCommentTemplate(project1));
-		assertTrue(linkProvider.canAccessProperties(file));
-		assertTrue(linkProvider.canAccessProperties(project1));
-	}
-
-	public void testChangeSetCommitCommentMultipleProjects() throws Exception {
-		MockTask task = new MockTask("1");
-		task.setSummary("summary");
-		task.setUrl("http://url");
-
-		ContextChangeSet changeSet = new ContextChangeSet(task, new StubChangeSetManager()) {
-			@Override
-			public IResource[] getChangedResources() {
-				return resources.toArray(new IResource[0]);
-			}
-		};
-
-		resources.add(project1);
-
-		FocusedTeamUiPlugin.getDefault().getPreferenceStore().setValue(FocusedTeamUiPlugin.COMMIT_TEMPLATE,
-				"global template: ${task.key}");
-
-		// only set template on project 2
-		TeamPropertiesLinkProvider linkProvider = new TeamPropertiesLinkProvider();
-		assertTrue(linkProvider.setCommitCommentTemplate(project2, "project template: ${task.key}"));
-
-		resources.add(project1);
-		assertEquals("global template: 1", changeSet.getComment());
-
-		resources.add(project2);
-		assertEquals("project template: 1", changeSet.getComment());
-	}
-
-	public void testChangeSetCommitCommentChangedResources() throws Exception {
-		MockTask task = new MockTask("1");
-		task.setSummary("summary");
-		task.setUrl("http://url");
-
-		ContextChangeSet changeSet = new ContextChangeSet(task, new StubChangeSetManager()) {
-			@Override
-			public IResource[] getResources() {
-				return new IResource[] { project1, project2 };
-			}
-
-			@Override
-			public IResource[] getChangedResources() {
-				return new IResource[] { project2 };
-			}
-
-		};
-
-		FocusedTeamUiPlugin.getDefault().getPreferenceStore().setValue(FocusedTeamUiPlugin.COMMIT_TEMPLATE, "global");
-
-		// only the template project 2 should matter
-		TeamPropertiesLinkProvider linkProvider = new TeamPropertiesLinkProvider();
-		assertTrue(linkProvider.setCommitCommentTemplate(project1, "project1"));
-		assertEquals("global", changeSet.getComment());
-
-		assertTrue(linkProvider.setCommitCommentTemplate(project2, "project2"));
-		assertEquals("project2", changeSet.getComment());
-	}
-
-	public class StubChangeSetManager extends ActiveChangeSetManager {
-
-		@Override
-		public IDiff getDiff(IResource resource) throws CoreException {
-			return null;
-		}
-
-		@Override
-		protected String getName() {
-			return null;
-		}
-
-		@Override
-		protected void initializeSets() {
-		}
-
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/TestSyncViewRefresh.java b/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/TestSyncViewRefresh.java
deleted file mode 100644
index f3887ef..0000000
--- a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/TestSyncViewRefresh.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.team.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.team.internal.ui.synchronize.SynchronizeView;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.IPage;
-import org.eclipse.ui.part.MessagePage;
-
-/**
- * @author Mik Kersten
- */
-public class TestSyncViewRefresh extends TestCase {
-
-	public void testInitialPage() throws PartInitException {
-		String ID = "org.eclipse.team.sync.views.SynchronizeView";
-		IViewPart view = openInActivePerspective(ID);
-		assertTrue(view instanceof SynchronizeView);
-		SynchronizeView syncView = (SynchronizeView) view;
-		IPage page = syncView.getCurrentPage();
-		assertTrue(page instanceof MessagePage);
-
-		// TODO: get the AbstractSynchronizePage and call getViewer() for contents
-	}
-
-	private 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;
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.ui/.classpath b/org.eclipse.mylyn.team.ui/.classpath
deleted file mode 100644
index 600f1b3..0000000
--- a/org.eclipse.mylyn.team.ui/.classpath
+++ /dev/null
@@ -1,12 +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">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/team/internal/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/internal/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.team.ui/.cvsignore b/org.eclipse.mylyn.team.ui/.cvsignore
deleted file mode 100644
index 0149589..0000000
--- a/org.eclipse.mylyn.team.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.fbwarnings
diff --git a/org.eclipse.mylyn.team.ui/.project b/org.eclipse.mylyn.team.ui/.project
deleted file mode 100644
index 2856072..0000000
--- a/org.eclipse.mylyn.team.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.team.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.team.ui/.settings/.api_filters b/org.eclipse.mylyn.team.ui/.settings/.api_filters
deleted file mode 100644
index b55436e..0000000
--- a/org.eclipse.mylyn.team.ui/.settings/.api_filters
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.mylyn.team.ui" version="2">
-    <resource path="src/org/eclipse/mylyn/team/ui/AbstractActiveChangeSetProvider.java" type="org.eclipse.mylyn.team.ui.AbstractActiveChangeSetProvider">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="ActiveChangeSetManager"/>
-                <message_argument value="AbstractActiveChangeSetProvider"/>
-                <message_argument value="getActiveChangeSetManager()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.mylyn.team.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.team.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.team.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.team.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.team.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.team.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.team.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.team.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.team.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.team.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.team.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.team.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.team.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.team.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.team.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.team.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.team.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index c70465b..0000000
--- a/org.eclipse.mylyn.team.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.team.ui;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Activator: org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.compare,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.team.core,
- org.eclipse.team.ui,
- org.eclipse.ui.forms,
- org.eclipse.ui,
- org.eclipse.ui.navigator,
- org.eclipse.ui.navigator.resources,
- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.resources.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.mylyn.internal.team.ui;x-internal:=true,
- org.eclipse.mylyn.internal.team.ui.actions;x-internal:=true,
- org.eclipse.mylyn.internal.team.ui.preferences;x-internal:=true,
- org.eclipse.mylyn.internal.team.ui.properties;x-internal:=true,
- org.eclipse.mylyn.internal.team.ui.templates;x-internal:=true,
- org.eclipse.mylyn.team.ui
-Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.team.ui/about.html b/org.eclipse.mylyn.team.ui/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.team.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.team.ui/build.properties b/org.eclipse.mylyn.team.ui/build.properties
deleted file mode 100644
index d6f85f2..0000000
--- a/org.eclipse.mylyn.team.ui/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               about.html,\
-               plugin.properties
-src.includes = about.html,\
-               schema/
diff --git a/org.eclipse.mylyn.team.ui/icons/elcl16/apply-patch.gif b/org.eclipse.mylyn.team.ui/icons/elcl16/apply-patch.gif
deleted file mode 100644
index 17482b7..0000000
--- a/org.eclipse.mylyn.team.ui/icons/elcl16/apply-patch.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.team.ui/icons/elcl16/context-add.gif b/org.eclipse.mylyn.team.ui/icons/elcl16/context-add.gif
deleted file mode 100644
index 030eade..0000000
--- a/org.eclipse.mylyn.team.ui/icons/elcl16/context-add.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.team.ui/icons/elcl16/context-commit.gif b/org.eclipse.mylyn.team.ui/icons/elcl16/context-commit.gif
deleted file mode 100644
index efe5d85..0000000
--- a/org.eclipse.mylyn.team.ui/icons/elcl16/context-commit.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.team.ui/icons/elcl16/interest-increase.gif b/org.eclipse.mylyn.team.ui/icons/elcl16/interest-increase.gif
deleted file mode 100644
index 98a2586..0000000
--- a/org.eclipse.mylyn.team.ui/icons/elcl16/interest-increase.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.team.ui/icons/elcl16/task-repository.gif b/org.eclipse.mylyn.team.ui/icons/elcl16/task-repository.gif
deleted file mode 100644
index 78470a3..0000000
--- a/org.eclipse.mylyn.team.ui/icons/elcl16/task-repository.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.team.ui/plugin.properties b/org.eclipse.mylyn.team.ui/plugin.properties
deleted file mode 100644
index dacf30e..0000000
--- a/org.eclipse.mylyn.team.ui/plugin.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-#Properties file for org.eclipse.mylyn.team.ui
-Bundle-Vendor = Eclipse Mylyn
-Bundle-Name = Mylyn Team UI
-
-ContextChangeSetDecorator.label = Task Change Set Decorator
-
-OpenCorrespondingTaskAction.label = Open Corresponding Task
-OpenCorrespondingTaskAction.tooltip = Open Corresponding Task
-AddToTaskContextAction.label = Add to Task Context
-AddToTaskContextAction.tooltip = Add to Task Context
-#ApplyPatchAction.label = Apply Patch...
-#ApplyPatchAction.tooltip = Apply from Repository Task Attachment
-ApplyPatchAction.attachment.label = Apply Patch...
-ApplyPatchAction.attachment.tooltip = Apply from Task Attachment
-
-FocusedTeamPreferencePage.name = Team
-
-keywords.label = mylyn team
-
-CommitTemplateVariables.ConnectorTaskPrefix.description.0 = Task repository-specific connector prefix, e.g. bug
-CommitTemplateVariables.RepositoryKind.description = Provides the repository kind of a task
-CommitTemplateVariables.RepositoryUrl.description = Provides the repository URL of a task.
-CommitTemplateVariables.TaskAssignee.description = Provides the user a task is assigned to, if available.
-CommitTemplateVariables.TaskCc.description = Provides the comma separated CC list of a task, if available.
-CommitTemplateVariables.TaskDescription.description = Provides the description of a task.
-CommitTemplateVariables.TaskId.description = Provides the ID of a task.
-CommitTemplateVariables.TaskKey.description = Provides the key of a task, for most repositories this is equals to the ID.
-CommitTemplateVariables.TaskKeywords.description = Provides the comma separated keyword list of a task, if available.
-CommitTemplateVariables.TaskLastModified.description = Provides the date of last modification of a task, if available.
-CommitTemplateVariables.TaskNotes.description = Provides the notes of a task.
-CommitTemplateVariables.TaskPriority.description = Provides the priority of a task.
-#CommitTemplateVariables.TaskProduct.description = Provides the prroduct a task belongs to, if available.
-CommitTemplateVariables.TaskProduct.description = Provides the product a task belongs to, if available.
-CommitTemplateVariables.TaskReporter.description = Provides the user who reported a task, if available.
-CommitTemplateVariables.TaskResolution.description = Provides the resolution of a task, if available.
-CommitTemplateVariables.TaskStatus.description = Provides the status of a task, if available.
-CommitTemplateVariables.TaskSummary.description = Provides the summary or description of a task, whichever is available.
-CommitTemplateVariables.TaskType.description = Provides the type of a task.
-CommitTemplateVariables.TaskURL.description = Provides the URL of a task.
-CommitTemplateVariables.TaskCompletion.description = Provides the completion date of a task.
-CommitTemplateVariables.TaskCreation.description = Provides the creation date of a task.
-CommitTemplateVariables.TaskReminder.description = Provides the reminder date of a task.
-
-ProjectTeamPage.name = Commit Template
diff --git a/org.eclipse.mylyn.team.ui/plugin.xml b/org.eclipse.mylyn.team.ui/plugin.xml
deleted file mode 100644
index 6fefaa7..0000000
--- a/org.eclipse.mylyn.team.ui/plugin.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="changeSets" name="Task-Focused Change Providers" schema="schema/changeSets.exsd"/>
-   <extension-point id="commitTemplates" name="Commit Template Handlers" schema="schema/commitTemplates.exsd"/>
-    
-    <!-- needed to update change sets -->
-    <extension
-         name="Task Change Set Management"
-         point="org.eclipse.ui.startup">
-       <startup
-             class="org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin$FocusedTeamUiStartup">
-       </startup>
-    </extension>
-
-  <extension
-         point="org.eclipse.mylyn.team.ui.changeSets">
-      <contextChangeSetManager
-            class="org.eclipse.mylyn.internal.team.ui.ContextActiveChangeSetManager">
-      </contextChangeSetManager>
-   </extension>
-    
-   <extension
-         point="org.eclipse.ui.decorators">
-      <decorator
-            class="org.eclipse.mylyn.internal.team.ui.ContextChangeSetDecorator"
-            id="org.eclipse.mylyn.team.ui.changeset.decorator"
-            label="%ContextChangeSetDecorator.label"
-            lightweight="true"
-            state="true">
-         <enablement>
-            <objectClass
-                  name="org.eclipse.mylyn.team.ui.IContextChangeSet">
-            </objectClass>
-         </enablement>
-      </decorator>
-    </extension>
-    
-     <extension point="org.eclipse.ui.popupMenus"> 
-
-     	<objectContribution
-				id="org.eclipse.mylyn.ui.team.synchronize.open.report.contribution"
-				objectClass="org.eclipse.mylyn.team.ui.AbstractTaskReference"
-				adaptable="true">
-			<action
-				class="org.eclipse.mylyn.internal.team.ui.actions.OpenCorrespondingTaskAction"
-				enablesFor="1" 
-				icon="icons/elcl16/task-repository.gif"
-				id="org.eclipse.mylyn.ui.team.synchronize.open.report.linked"
-				label="%OpenCorrespondingTaskAction.label"
-				menubarPath="mylyn"
-				tooltip="%OpenCorrespondingTaskAction.tooltip">
-			</action> 
-			<action
-				class="org.eclipse.mylyn.internal.team.ui.actions.AddToTaskContextAction"
-				enablesFor="*" 
-				icon="icons/elcl16/context-add.gif"
-				id="org.eclipse.mylyn.ui.team.synchronize.create.context"
-				label="%AddToTaskContextAction.label"
-				menubarPath="mylyn"
-				tooltip="%AddToTaskContextAction.tooltip">
-			</action> 
-		</objectContribution>
-
-		<objectContribution
-            objectClass="org.eclipse.team.internal.ui.synchronize.SyncInfoModelElement"
-            id="org.eclipse.mylyn.ui.team.synchronize.open.report.syncinfo">
-            <action
-				class="org.eclipse.mylyn.internal.team.ui.actions.AddToTaskContextAction"
-				enablesFor="*" 
-				icon="icons/elcl16/context-add.gif"
-				id="org.eclipse.mylyn.ui.team.synchronize.create.context"
-				label="%AddToTaskContextAction.label"
-				menubarPath="mylyn"
-				tooltip="%AddToTaskContextAction.tooltip">
-			</action> 
-		</objectContribution>
-		<objectContribution
-            objectClass="org.eclipse.team.internal.ui.synchronize.UnchangedResourceModelElement"
-            id="org.eclipse.mylyn.ui.team.synchronize.open.report.unchanged">
-            <action
-				class="org.eclipse.mylyn.internal.team.ui.actions.AddToTaskContextAction"
-				enablesFor="*" 
-				icon="icons/elcl16/context-add.gif"
-				id="org.eclipse.mylyn.ui.team.synchronize.create.context"
-				label="%AddToTaskContextAction.label"
-				menubarPath="mylyn"
-				tooltip="%AddToTaskContextAction.tooltip">
-			</action> 
-		</objectContribution>
-	</extension>
-    
-    <!-- ================= NAVIGATOR CONTENT =================== -->
-    
-    <extension point="org.eclipse.ui.navigator.navigatorContent">
-	   <actionProvider           
-	   	 class="org.eclipse.mylyn.internal.team.ui.actions.TaskResourceMappingActionProvider"
-	     id="org.eclipse.mylyn.ide.ui.actions.TaskResourceMappingActionProvider">
-	     <enablement>
-	       <adapt type="org.eclipse.mylyn.team.ui.AbstractTaskReference"/>
-	     </enablement>
-	   </actionProvider>
-	</extension>
-	
-	<!-- =================  =================== -->
-	
-	<extension point = "org.eclipse.ui.popupMenus">
-      <objectContribution
-            adaptable="false"
-            id="org.eclipse.mylyn.ide.team.ui.contribution.attachment.patch"
-            objectClass="org.eclipse.mylyn.tasks.core.ITaskAttachment">
-         <action
-               class="org.eclipse.mylyn.internal.team.ui.actions.ApplyPatchAction"
-               enablesFor="1"
-               icon="icons/elcl16/apply-patch.gif"
-               id="org.eclipse.mylyn.team.ui.ui.patch.apply"
-               label="%ApplyPatchAction.attachment.label"
-               menubarPath="actions"
-               tooltip="%ApplyPatchAction.attachment.tooltip">
-         </action>
-      </objectContribution>
-   </extension>
-	
-  <extension point="org.eclipse.ui.preferencePages">
-      <page 
-         name="%FocusedTeamPreferencePage.name"
-         class="org.eclipse.mylyn.internal.team.ui.preferences.FocusedTeamPreferencePage"
-         id="org.eclipse.mylyn.team.ui.ui.preferences"
-         category="org.eclipse.mylyn.tasks.ui.preferences">
-         <keywordReference id="org.eclipse.mylyn.team.ui.keywords"/>
-      </page> 
-   </extension>
-   
-   <extension
-   		point="org.eclipse.ui.keywords">
-      <keyword
-            label="%keywords.label"
-            id="org.eclipse.mylyn.team.ui.keywords"/>
-   </extension>
-	
-    <extension
-          point="org.eclipse.mylyn.team.ui.commitTemplates">
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$ConnectorTaskPrefix"
-             description="%CommitTemplateVariables.ConnectorTaskPrefix.description"
-             recognizedKeyword="connector.task.prefix"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$RepositoryKind"
-             description="%CommitTemplateVariables.RepositoryKind.description"
-             recognizedKeyword="repository.kind"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$RepositoryUrl"
-             description="%CommitTemplateVariables.RepositoryUrl.description.2"
-             recognizedKeyword="repository.url"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskAssignee"
-             description="%CommitTemplateVariables.TaskAssignee.description.3"
-             recognizedKeyword="task.assignee"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskCc"
-             description="%CommitTemplateVariables.TaskCc.description"
-             recognizedKeyword="task.cc"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskDescription"
-             description="%CommitTemplateVariables.TaskDescription.description"
-             recognizedKeyword="task.description"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskId"
-             description="%CommitTemplateVariables.TaskId.description"
-             recognizedKeyword="task.id"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskKey"
-             description="%CommitTemplateVariables.TaskKey.description"
-             recognizedKeyword="task.key"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskKeywords"
-             description="%CommitTemplateVariables.TaskKeywords.description"
-             recognizedKeyword="task.keywords"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskLastModified"
-             description="%CommitTemplateVariables.TaskLastModified.description"
-             recognizedKeyword="task.lastmodified"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskNotes"
-             description="%CommitTemplateVariables.TaskNotes.description"
-             recognizedKeyword="task.notes"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskPriority"
-             description="%CommitTemplateVariables.TaskPriority.description"
-             recognizedKeyword="task.priority"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskProduct"
-             description="%CommitTemplateVariables.TaskProduct.description"
-             recognizedKeyword="task.product"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskReporter"
-             description="%CommitTemplateVariables.TaskReporter.description"
-             recognizedKeyword="task.reporter"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskResolution"
-             description="%CommitTemplateVariables.TaskResolution.description"
-             recognizedKeyword="task.resolution"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskStatus"
-             description="%CommitTemplateVariables.TaskStatus.description"
-             recognizedKeyword="task.status"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskSummary"
-             description="%CommitTemplateVariables.TaskSummary.description"
-             recognizedKeyword="task.summary"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskType"
-             description="%CommitTemplateVariables.TaskType.description"
-             recognizedKeyword="task.type"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskURL"
-             description="%CommitTemplateVariables.TaskURL.description"
-             recognizedKeyword="task.url"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskCompletion"
-             description="%CommitTemplateVariables.TaskCompletion.description"
-             recognizedKeyword="task.completiondate"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskCreation"
-             description="%CommitTemplateVariables.TaskCreation.description"
-             recognizedKeyword="task.creationdate"/>
-       <templateVariable
-             class="org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateVariables$TaskReminder"
-             description="%CommitTemplateVariables.TaskReminder.description"
-             recognizedKeyword="task.reminderdate"/>
-    </extension>
-	
-   <extension point="org.eclipse.core.runtime.adapters">
-     <factory adaptableType="org.eclipse.mylyn.internal.team.ui.ContextChangeSet"
-             class="org.eclipse.mylyn.internal.team.ui.LinkedTaskInfoAdapterFactory">
-       <adapter type="org.eclipse.mylyn.team.ui.AbstractTaskReference"/>
-     </factory>
-    <factory adaptableType="org.eclipse.team.core.history.IFileRevision"
-             class="org.eclipse.mylyn.internal.team.ui.LinkedTaskInfoAdapterFactory">
-       <adapter type="org.eclipse.mylyn.team.ui.AbstractTaskReference"/>
-    </factory>
-    <factory adaptableType="org.eclipse.team.internal.core.subscribers.DiffChangeSet"
-             class="org.eclipse.mylyn.internal.team.ui.LinkedTaskInfoAdapterFactory">
-       <adapter type="org.eclipse.mylyn.team.ui.AbstractTaskReference"/>
-    </factory>
-    <factory adaptableType="org.eclipse.team.internal.ui.synchronize.ChangeSetDiffNode"
-             class="org.eclipse.mylyn.internal.team.ui.LinkedTaskInfoAdapterFactory">
-       <adapter type="org.eclipse.mylyn.team.ui.AbstractTaskReference"/>
-    </factory>
-  </extension>
-  
-   <extension
-         point="org.eclipse.ui.propertyPages">
-      <page
-            category="org.eclipse.mylyn.tasks.ui.properties.pages.project.repository"
-            class="org.eclipse.mylyn.internal.team.ui.properties.ProjectTeamPage"
-            id="org.eclipse.mylyn.tasks.ui.properties.pages.project.team"
-            name="%ProjectTeamPage.name">
-         <enabledWhen>
-            <adapt
-                  type="org.eclipse.core.resources.IProject">
-            </adapt>
-         </enabledWhen>
-      </page>
-   </extension>
-	
-</plugin>
diff --git a/org.eclipse.mylyn.team.ui/schema/changeSets.exsd b/org.eclipse.mylyn.team.ui/schema/changeSets.exsd
deleted file mode 100644
index 1a006fb..0000000
--- a/org.eclipse.mylyn.team.ui/schema/changeSets.exsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.team.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.mylyn.team.ui" id="changeSets" name="Mylyn Chagne Set Integration"/>
-      </appInfo>
-      <documentation>
-         Provides repository specific team integration for Mylyn.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="activeChangeSetProvider" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="contextChangeSetManager" 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="activeChangeSetProvider">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.mylyn.provisional.ide.team.TeamRepositoryProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="contextChangeSetManager">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.mylyn.team.AbstractContextChangeSetManager"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/org.eclipse.mylyn.team.ui/schema/commitTemplates.exsd b/org.eclipse.mylyn.team.ui/schema/commitTemplates.exsd
deleted file mode 100644
index 1e379ac..0000000
--- a/org.eclipse.mylyn.team.ui/schema/commitTemplates.exsd
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.team.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.mylyn.team.ui" id="commitTemplates" name="Mylyn Commit Templates"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="templateVariable" minOccurs="1" 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="templateVariable">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.mylyn.team.ITemplateHandler"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="recognizedKeyword" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/AbstractCommitWorkflowProvider.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/AbstractCommitWorkflowProvider.java
deleted file mode 100644
index 0f1e3da..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/AbstractCommitWorkflowProvider.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * No longer used.
- * 
- * @author Mik Kersten
- */
-@Deprecated
-public class AbstractCommitWorkflowProvider {
-
-	/**
-	 * Determines if the team provider manages at least one of the resources and at least one of the resources has an
-	 * 'outgoing' state (locally changed). If this method returns <code>true</code>, the team provider may be later
-	 * asked to {@link #commit} them. The set of resources may contain resources from projects that are not managed by
-	 * your provider or not managed at all.
-	 * 
-	 * @param resources
-	 * @return <code>true</code> if the team provider manages at least one of the resources or <code>false</code>
-	 *         otherwise.
-	 */
-	public boolean hasOutgoingChanges(IResource[] resources) {
-		return false;
-	}
-
-	/**
-	 * Asks the team provider to commit a set of resources that may be managed by the team provider. It is up to the
-	 * team provider to only operate on resources that are being managed by it. The set of resources may contain
-	 * resources from projects that are not managed by your provider or not managed at all.
-	 * 
-	 * @param resources
-	 *            Set of resources that need to be committed
-	 */
-	public void commit(IResource[] resources) {
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextActiveChangeSetManager.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextActiveChangeSetManager.java
deleted file mode 100644
index da6d9f3..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextActiveChangeSetManager.java
+++ /dev/null
@@ -1,333 +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.team.ui;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.context.core.IInteractionContext;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-import org.eclipse.mylyn.internal.tasks.core.LocalTask;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.team.ui.AbstractActiveChangeSetProvider;
-import org.eclipse.mylyn.team.ui.AbstractContextChangeSetManager;
-import org.eclipse.mylyn.team.ui.IContextChangeSet;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSet;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager;
-import org.eclipse.team.internal.core.subscribers.ChangeSet;
-import org.eclipse.team.internal.core.subscribers.IChangeSetChangeListener;
-
-/**
- * NOTE: this class contains several work-arounds for change set limitations in the Platform/Team support.
- * 
- * @author Mik Kersten
- */
-public class ContextActiveChangeSetManager extends AbstractContextChangeSetManager {
-
-	private final List<ActiveChangeSetManager> changeSetManagers = new ArrayList<ActiveChangeSetManager>();
-
-	private final List<IContextChangeSet> activeChangeSets = new ArrayList<IContextChangeSet>();
-
-	private static final String LABEL_NO_TASK = "<No Active Task>"; //$NON-NLS-1$
-
-	private static final String HANDLE_NO_TASK = "org.eclipse.mylyn.team.ui.inactive.proxy"; //$NON-NLS-1$
-
-	private final Map<ActiveChangeSetManager, ActiveChangeSet> noTaskSetMap = new HashMap<ActiveChangeSetManager, ActiveChangeSet>();;
-
-	private final Map<ActiveChangeSetManager, ChangeSetChangeListener> listenerByManager = new HashMap<ActiveChangeSetManager, ChangeSetChangeListener>();
-
-	private final ITask noTaskActiveProxy = new LocalTask(HANDLE_NO_TASK, LABEL_NO_TASK);
-
-	/**
-	 * Used to restore change sets managed with task context when platform deletes them, bug 168129
-	 */
-	private class ChangeSetChangeListener implements IChangeSetChangeListener {
-
-		private final ActiveChangeSetManager manager;
-
-		public ChangeSetChangeListener(ActiveChangeSetManager manager) {
-			this.manager = manager;
-		}
-
-		public void setRemoved(ChangeSet set) {
-			if (set instanceof IContextChangeSet) {
-				IContextChangeSet contextChangeSet = (IContextChangeSet) set;
-				// never matches the noTask change set: its task is never active
-				if (contextChangeSet.getTask() != null && contextChangeSet.getTask().isActive()) {
-					// put it back
-					manager.add((ActiveChangeSet) contextChangeSet);
-				}
-			}
-		}
-
-		public void setAdded(ChangeSet set) {
-			// ignore
-		}
-
-		public void defaultSetChanged(ChangeSet previousDefault, ChangeSet set) {
-			// ignore
-		}
-
-		public void nameChanged(ChangeSet set) {
-			// ignore
-		}
-
-		public void resourcesChanged(ChangeSet set, IPath[] paths) {
-			// ignore
-		}
-
-	};
-
-	public ContextActiveChangeSetManager() {
-		Collection<AbstractActiveChangeSetProvider> providerList = FocusedTeamUiPlugin.getDefault()
-				.getActiveChangeSetProviders();
-		for (AbstractActiveChangeSetProvider provider : providerList) {
-			ActiveChangeSetManager changeSetManager = provider.getActiveChangeSetManager();
-			if (changeSetManager != null) {
-				changeSetManagers.add(changeSetManager);
-			}
-		}
-	}
-
-	@Override
-	protected void updateChangeSetLabel(ITask task) {
-		for (ActiveChangeSetManager collector : changeSetManagers) {
-			ChangeSet[] sets = collector.getSets();
-			for (ChangeSet set : sets) {
-				if (set instanceof IContextChangeSet) {
-					IContextChangeSet contextChangeSet = (IContextChangeSet) set;
-					if (contextChangeSet.getTask().equals(task)) {
-						contextChangeSet.updateLabel();
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public void enable() {
-		super.enable();
-		for (ActiveChangeSetManager collector : changeSetManagers) {
-			ChangeSetChangeListener listener = listenerByManager.get(collector);
-			if (listener == null) {
-				listener = new ChangeSetChangeListener(collector);
-				listenerByManager.put(collector, listener);
-				collector.addListener(listener);
-			}
-		}
-	}
-
-	@Override
-	public void disable() {
-		super.disable();
-		for (ActiveChangeSetManager collector : changeSetManagers) {
-			ChangeSetChangeListener listener = listenerByManager.get(collector);
-			if (listener != null) {
-				collector.removeListener(listener);
-				listenerByManager.remove(collector);
-			}
-		}
-	}
-
-	@Override
-	protected void initContextChangeSets() {
-		// replace existing change sets with IContextChangeSet
-		for (ActiveChangeSetManager manager : changeSetManagers) {
-			ChangeSet[] sets = manager.getSets();
-			for (ChangeSet restoredSet : sets) {
-				if (!(restoredSet instanceof IContextChangeSet)) {
-					String encodedTitle = restoredSet.getName();
-					String taskHandle = ContextChangeSet.getHandleFromPersistedTitle(encodedTitle);
-					ITask task = TasksUi.getRepositoryModel().getTask(taskHandle);
-					if (task != null) {
-						try {
-							IContextChangeSet contextChangeSet = getOrCreateSet(manager, task);
-							if (contextChangeSet instanceof ActiveChangeSet) {
-								contextChangeSet.restoreResources(restoredSet.getResources());
-								manager.remove(restoredSet);
-								manager.add((ActiveChangeSet) contextChangeSet);
-							}
-						} catch (Exception e) {
-							StatusHandler.log(new Status(IStatus.ERROR, FocusedTeamUiPlugin.ID_PLUGIN,
-									"Could not restore change set", e)); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * For testing.
-	 */
-	public void clearActiveChangeSets() {
-		activeChangeSets.clear();
-	}
-
-	public IResource[] getResources(ITask task) {
-		for (ActiveChangeSetManager collector : changeSetManagers) {
-			ChangeSet[] sets = collector.getSets();
-			for (ChangeSet set : sets) {
-				if (set instanceof IContextChangeSet) {
-					IContextChangeSet contextChangeSet = (IContextChangeSet) set;
-					if (contextChangeSet.getTask().equals(task) && contextChangeSet instanceof ActiveChangeSet) {
-						return ((ActiveChangeSet) contextChangeSet).getResources();
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	// TODO m4.0 remove deprecated method that is needed maintain backwards compatibility
-	@SuppressWarnings( { "restriction", "deprecation" })
-	@Override
-	public void contextActivated(IInteractionContext context) {
-		try {
-			ITask task = getTask(context);
-			if (task != null) {
-				for (ActiveChangeSetManager manager : changeSetManagers) {
-					IContextChangeSet contextChangeSet = getOrCreateSet(manager, task);
-					if (contextChangeSet instanceof ActiveChangeSet) {
-						ActiveChangeSet activeChangeSet = (ActiveChangeSet) contextChangeSet;
-						List<IResource> interestingResources = ResourcesUiBridgePlugin.getDefault()
-								.getInterestingResources(context);
-						activeChangeSet.add(interestingResources.toArray(new IResource[interestingResources.size()]));
-						activeChangeSets.add(contextChangeSet);
-
-						// makeDefault() will add the change set 
-//						if (!manager.contains(activeChangeSet)) {
-//							manager.add(activeChangeSet);
-//						}
-						manager.makeDefault(activeChangeSet);
-					}
-				}
-			}
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, FocusedTeamUiPlugin.ID_PLUGIN, "Could not update change set", e)); //$NON-NLS-1$
-		}
-	}
-
-	private IContextChangeSet getOrCreateSet(ActiveChangeSetManager manager, ITask task) {
-		ChangeSet[] sets = manager.getSets();
-		for (ChangeSet set : sets) {
-			if (set instanceof IContextChangeSet && task.equals(((IContextChangeSet) set).getTask())) {
-				return (IContextChangeSet) set;
-			}
-		}
-		// change set does not exist, create a new one
-		AbstractActiveChangeSetProvider provider = FocusedTeamUiPlugin.getDefault().getActiveChangeSetProvider(manager);
-		return provider.createChangeSet(task);
-	}
-
-	// TODO m4.0 remove deprecated method that is needed maintain backwards compatibility
-	@SuppressWarnings("deprecation")
-	@Override
-	public void contextDeactivated(IInteractionContext context) {
-		for (ActiveChangeSetManager collector : changeSetManagers) {
-			ChangeSet[] sets = collector.getSets();
-			for (ChangeSet set : sets) {
-				if (set instanceof ActiveChangeSet) {
-					IResource[] resources = set.getResources();
-					if (resources == null || resources.length == 0) {
-						collector.remove(set);
-					}
-				}
-			}
-			// First look for it in the collector, then in our cache
-			ActiveChangeSet noTaskSet = collector.getSet(LABEL_NO_TASK);
-			if (noTaskSet == null) {
-				noTaskSet = noTaskSetMap.get(collector);
-			}
-
-			if (noTaskSet == null) {
-				AbstractActiveChangeSetProvider changeSetProvider = FocusedTeamUiPlugin.getDefault()
-						.getActiveChangeSetProvider(collector);
-				noTaskSet = (ActiveChangeSet) changeSetProvider.createChangeSet(noTaskActiveProxy);
-				collector.add(noTaskSet);
-				noTaskSetMap.put(collector, noTaskSet);
-			}
-			// TODO: not great to do the lookup based on a String value in case the user created this set
-			collector.makeDefault(noTaskSet);
-			noTaskSet.remove(noTaskSet.getResources());
-			collector.remove(noTaskSet);
-		}
-		activeChangeSets.clear();
-	}
-
-	// TODO m4.0 remove deprecated method that is needed maintain backwards compatibility
-	@SuppressWarnings( { "restriction", "deprecation" })
-	@Override
-	public void interestChanged(List<IInteractionElement> elements) {
-		for (IInteractionElement element : elements) {
-			AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(element.getContentType());
-			try {
-				if (bridge.isDocument(element.getHandleIdentifier())) {
-					IResource resource = ResourcesUiBridgePlugin.getDefault().getResourceForElement(element, false);
-					if (resource != null && resource.exists()) {
-						for (IContextChangeSet activeContextChangeSet : getActiveChangeSets()) {
-							if (activeContextChangeSet instanceof ActiveChangeSet) {
-								if (!((ActiveChangeSet) activeContextChangeSet).contains(resource)) {
-									if (element.getInterest().isInteresting()) {
-										((ActiveChangeSet) activeContextChangeSet).add(new IResource[] { resource });
-									}
-								}
-							}
-						}
-						if (shouldRemove(element)) {
-							for (ActiveChangeSetManager collector : changeSetManagers) {
-								ChangeSet[] sets = collector.getSets();
-								for (ChangeSet set : sets) {
-									if (set instanceof ActiveChangeSet) {
-										set.remove(resource);
-									}
-								}
-							}
-						}
-					}
-				}
-			} catch (Exception e) {
-				StatusHandler.log(new Status(IStatus.ERROR, FocusedTeamUiPlugin.ID_PLUGIN,
-						"Could not manipulate change set resources", e)); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public List<IContextChangeSet> getActiveChangeSets() {
-		return new ArrayList<IContextChangeSet>(activeChangeSets);
-	}
-
-	private ITask getTask(IInteractionContext context) {
-		return TasksUi.getTaskActivityManager().getActiveTask();
-	}
-
-	/**
-	 * Ignores decay.
-	 */
-	private boolean shouldRemove(IInteractionElement element) {
-		// TODO: generalize this logic?
-		return (element.getInterest().getValue() + element.getInterest().getDecayValue()) < ContextCore.getCommonContextScaling()
-				.getInteresting();
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextChangeSet.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextChangeSet.java
deleted file mode 100644
index 8d36878..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextChangeSet.java
+++ /dev/null
@@ -1,279 +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.team.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.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil;
-import org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin;
-import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.internal.team.ui.properties.TeamPropertiesLinkProvider;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.resources.ui.ResourcesUi;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.team.ui.AbstractTaskReference;
-import org.eclipse.mylyn.team.ui.IContextChangeSet;
-import org.eclipse.team.core.TeamException;
-import org.eclipse.team.core.diff.IDiff;
-import org.eclipse.team.core.diff.provider.ThreeWayDiff;
-import org.eclipse.team.core.mapping.provider.ResourceDiff;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSet;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class ContextChangeSet extends ActiveChangeSet/*CVSActiveChangeSet*/implements IAdaptable, IContextChangeSet {
-
-	// HACK: copied from super
-	private static final String CTX_TITLE = "title"; //$NON-NLS-1$
-
-	public static final String SOURCE_ID = "org.eclipse.mylyn.java.context.changeset.add"; //$NON-NLS-1$
-
-	private boolean suppressInterestContribution = false;
-
-	private final ITask task;
-
-	public ContextChangeSet(ITask task, ActiveChangeSetManager manager) {
-		super(manager, task.getSummary());
-		this.task = task;
-		updateLabel();
-	}
-
-	@Override
-	public boolean isUserCreated() {
-		return true;
-	}
-
-	public void updateLabel() {
-		super.setName(task.getSummary());
-		super.setTitle(task.getSummary());
-	}
-
-	/**
-	 * Encodes the handle in the title, since init won't get called on this class.
-	 */
-	@Override
-	public void save(Preferences prefs) {
-		super.save(prefs);
-		prefs.put(CTX_TITLE, getTitleForPersistance());
-	}
-
-	private String getTitleForPersistance() {
-		return getTitle() + " (" + task.getHandleIdentifier() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public static String getHandleFromPersistedTitle(String title) {
-		int delimStart = title.lastIndexOf('(');
-		int delimEnd = title.lastIndexOf(')');
-		if (delimStart != -1 && delimEnd != -1) {
-			return title.substring(delimStart + 1, delimEnd);
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public String getComment() {
-		return getComment(true);
-	}
-
-	public String getComment(boolean checkTaskRepository) {
-		return ContextChangeSet.getComment(checkTaskRepository, task, getChangedResources());
-	}
-
-	@Override
-	public void remove(IResource resource) {
-		super.remove(resource);
-	}
-
-	@Override
-	public void remove(IResource[] newResources) {
-		super.remove(newResources);
-	}
-
-	@Override
-	public void add(IDiff diff) {
-		super.add(diff);
-		IResource resource = getResourceFromDiff(diff);
-		if (!suppressInterestContribution && resource != null) {
-			Set<IResource> resources = new HashSet<IResource>();
-			resources.add(resource);
-			if (ResourcesUiBridgePlugin.getDefault() != null) {
-				ResourcesUi.addResourceToContext(resources, InteractionEvent.Kind.SELECTION);
-			}
-		}
-	}
-
-	private IResource getResourceFromDiff(IDiff diff) {
-		if (diff instanceof ResourceDiff) {
-			return ((ResourceDiff) diff).getResource();
-		} else if (diff instanceof ThreeWayDiff) {
-			ThreeWayDiff threeWayDiff = (ThreeWayDiff) diff;
-			return ResourcesPlugin.getWorkspace().getRoot().findMember(threeWayDiff.getPath());
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public void add(IDiff[] diffs) {
-		super.add(diffs);
-	}
-
-	@Override
-	public void add(IResource[] newResources) throws CoreException {
-		super.add(newResources);
-	}
-
-	public void restoreResources(IResource[] newResources) throws CoreException {
-		suppressInterestContribution = true;
-		try {
-			super.add(newResources);
-			setComment(getComment(false));
-		} catch (TeamException e) {
-			throw e;
-		} finally {
-			suppressInterestContribution = false;
-		}
-	}
-
-	@Override
-	public IResource[] getResources() {
-		return super.getResources();
-//		List<IResource> allResources = getAllResourcesInChangeContext();
-//		return allResources.toArray(new IResource[allResources.size()]);
-	}
-
-	public IResource[] getChangedResources() {
-		return super.getResources();
-	}
-
-	public List<IResource> getAllResourcesInChangeContext() {
-		Set<IResource> allResources = new HashSet<IResource>();
-		allResources.addAll(Arrays.asList(super.getResources()));
-		if (Platform.isRunning() && ResourcesUiBridgePlugin.getDefault() != null && task.isActive()) {
-			// TODO: if super is always managed correctly should remove
-			// following line
-			allResources.addAll(ResourcesUiBridgePlugin.getDefault().getInterestingResources(
-					ContextCore.getContextManager().getActiveContext()));
-		}
-		return new ArrayList<IResource>(allResources);
-	}
-
-	/**
-	 * TODO: unnessary check context?
-	 */
-	@Override
-	public boolean contains(IResource local) {
-		return super.contains(local); //return getAllResourcesInChangeContext().contains(local);
-	}
-
-	@Override
-	public boolean equals(Object object) {
-		if (object instanceof ContextChangeSet && task != null) {
-			ContextChangeSet changeSet = (ContextChangeSet) object;
-			return task.equals(changeSet.getTask());
-		} else {
-			return super.equals(object);
-		}
-	}
-
-	@Override
-	public int hashCode() {
-		if (task != null) {
-			return task.hashCode();
-		} else {
-			return super.hashCode();
-		}
-	}
-
-	public ITask getTask() {
-		return task;
-	}
-
-	@SuppressWarnings("unchecked")
-	public Object getAdapter(Class adapter) {
-//		if (adapter == ResourceMapping.class) {
-//			return null;
-//			return new ChangeSetResourceMapping(this);
-//		}
-		if (adapter == AbstractTask.class) {
-			return task;
-		} else if (adapter == AbstractTaskReference.class) {
-			return new LinkedTaskInfo(getTask(), this);
-		}
-		return Platform.getAdapterManager().getAdapter(this, adapter);
-	}
-
-	public static String getComment(boolean checkTaskRepository, ITask task, IResource[] resources) {
-		String template = null;
-		Set<IProject> projects = new HashSet<IProject>();
-		for (IResource resource : resources) {
-			IProject project = resource.getProject();
-			if (project != null && project.isAccessible() && !projects.contains(project)) {
-				TeamPropertiesLinkProvider provider = new TeamPropertiesLinkProvider();
-				template = provider.getCommitCommentTemplate(project);
-				if (template != null) {
-					break;
-				}
-				projects.add(project);
-			}
-		}
-
-		boolean proceed = true;
-
-		if (checkTaskRepository) {
-			boolean unmatchedRepositoryFound = false;
-			for (IProject project : projects) {
-				TaskRepository repository = TasksUiPlugin.getDefault().getRepositoryForResource(project);
-				if (repository != null) {
-					if (!repository.getRepositoryUrl().equals(task.getRepositoryUrl())) {
-						unmatchedRepositoryFound = true;
-					}
-				}
-			}
-
-			if (unmatchedRepositoryFound) {
-				proceed = MessageDialog.openQuestion(WorkbenchUtil.getShell(),
-						Messages.ContextChangeSet_Mylyn_Change_Set_Management,
-						Messages.ContextChangeSet_ATTEMPTING_TO_COMMIT_RESOURCE);
-			}
-		}
-
-		if (proceed) {
-			if (template == null) {
-				template = FocusedTeamUiPlugin.getDefault().getPreferenceStore().getString(
-						FocusedTeamUiPlugin.COMMIT_TEMPLATE);
-			}
-			return FocusedTeamUiPlugin.getDefault().getCommitTemplateManager().generateComment(task, template);
-		} else {
-			return ""; //$NON-NLS-1$
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextChangeSetDecorator.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextChangeSetDecorator.java
deleted file mode 100644
index efd37b9..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/ContextChangeSetDecorator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui;
-
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFonts;
-import org.eclipse.mylyn.team.ui.IContextChangeSet;
-
-/**
- * @author Mik Kersten
- */
-public class ContextChangeSetDecorator implements ILightweightLabelDecorator {
-
-	public void decorate(Object element, IDecoration decoration) {
-		if (element instanceof IContextChangeSet) {
-			IContextChangeSet changeSet = (IContextChangeSet) element;
-			if (changeSet.getTask().isActive()) {
-				decoration.setFont(CommonFonts.BOLD);
-			}
-		}
-	}
-
-	public void addListener(ILabelProviderListener listener) {
-		// ignore
-	}
-
-	public void dispose() {
-		// ignore
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		// ignore
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-		// ignore
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamExtensionPointReader.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamExtensionPointReader.java
deleted file mode 100644
index 69114d4..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamExtensionPointReader.java
+++ /dev/null
@@ -1,79 +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:
- *     Gunnar Wagenknecht - initial API and implementation
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-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.team.ui.AbstractActiveChangeSetProvider;
-import org.eclipse.mylyn.team.ui.AbstractContextChangeSetManager;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Manages the registeres repository provides.
- * 
- * @author Gunnar Wagenknecht
- * @author Mik Kersten (rewrite)
- */
-public class FocusedTeamExtensionPointReader {
-
-	private static final String ATTR_CLASS = "class"; //$NON-NLS-1$
-
-	private static final String ELEM_ACTIVE_CHANGE_SET_PROVIDER = "activeChangeSetProvider"; //$NON-NLS-1$
-
-	private static final String ELEM_CHANGE_SET_MANAGER = "contextChangeSetManager"; //$NON-NLS-1$
-
-	private static final String EXT_POINT_TEAM_REPOSITORY_PROVIDER = "changeSets"; //$NON-NLS-1$
-
-	public void readExtensions() {
-		IExtensionPoint teamProvider = Platform.getExtensionRegistry().getExtensionPoint(FocusedTeamUiPlugin.ID_PLUGIN,
-				EXT_POINT_TEAM_REPOSITORY_PROVIDER);
-		IExtension[] extensions = teamProvider.getExtensions();
-		for (IExtension extension : extensions) {
-			IConfigurationElement[] elements = extension.getConfigurationElements();
-
-			for (IConfigurationElement element : elements) {
-				if (ELEM_ACTIVE_CHANGE_SET_PROVIDER.equals(element.getName())) {
-					try {
-						AbstractActiveChangeSetProvider provider = (AbstractActiveChangeSetProvider) element.createExecutableExtension(ATTR_CLASS);
-						FocusedTeamUiPlugin.getDefault().addActiveChangeSetProvider(provider);
-					} catch (Throwable e) {
-						StatusHandler.log(new Status(IStatus.ERROR, FocusedTeamUiPlugin.ID_PLUGIN, NLS.bind(
-								"Error while initializing repository contribution {0} from plugin {1}.", //$NON-NLS-1$
-								element.getAttribute(ATTR_CLASS), element.getContributor().getName()), e));
-					}
-				}
-			}
-		}
-		// NOTE: must first have read providers to properly instantiate manager
-		for (IExtension extension : extensions) {
-			IConfigurationElement[] elements = extension.getConfigurationElements();
-			for (IConfigurationElement element : elements) {
-				if (ELEM_CHANGE_SET_MANAGER.equals(element.getName())) {
-					try {
-						AbstractContextChangeSetManager manager = (AbstractContextChangeSetManager) element.createExecutableExtension(ATTR_CLASS);
-						FocusedTeamUiPlugin.getDefault().addContextChangeSetManager(manager);
-					} catch (Throwable e) {
-						StatusHandler.log(new Status(IStatus.ERROR, FocusedTeamUiPlugin.ID_PLUGIN, NLS.bind(
-								"Error while initializing repository contribution {0} from plugin {1}.", //$NON-NLS-1$
-								element.getAttribute(ATTR_CLASS), element.getContributor().getName()), e));
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamUiPlugin.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamUiPlugin.java
deleted file mode 100644
index c3577e8..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamUiPlugin.java
+++ /dev/null
@@ -1,148 +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.team.ui;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateManager;
-import org.eclipse.mylyn.team.ui.AbstractActiveChangeSetProvider;
-import org.eclipse.mylyn.team.ui.AbstractContextChangeSetManager;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager;
-import org.eclipse.ui.IStartup;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-// TODO 3.3 change the name of this class to avoid the word "focused"
-public class FocusedTeamUiPlugin extends AbstractUIPlugin {
-
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.team.ui"; //$NON-NLS-1$
-
-	private static FocusedTeamUiPlugin INSTANCE;
-
-	private final Set<AbstractContextChangeSetManager> changeSetManagers = new HashSet<AbstractContextChangeSetManager>();
-
-	private final Map<ActiveChangeSetManager, AbstractActiveChangeSetProvider> activeChangeSetProviders = new HashMap<ActiveChangeSetManager, AbstractActiveChangeSetProvider>();
-
-	private CommitTemplateManager commitTemplateManager;
-
-	public static final String CHANGE_SET_MANAGE = "org.eclipse.mylyn.team.changesets.manage"; //$NON-NLS-1$
-
-	public static final String COMMIT_TEMPLATE = "org.eclipse.mylyn.team.commit.template"; //$NON-NLS-1$
-
-	public static final String DEFAULT_COMMIT_TEMPLATE = "${task.status} - ${connector.task.prefix} ${task.key}: ${task.description} \n${task.url}"; //$NON-NLS-1$
-
-	private static final String OLD_DEFAULT_COMMIT_TEMPLATE = "${task.status} - ${connector.task.prefix} ${task.id}: ${task.description} \n${task.url}"; //$NON-NLS-1$
-
-	private static final String OLD_DEFAULT_COMMIT_TEMPLATE2 = "${task.status} - ${connector.task.prefix} ${task.id}: ${task.description} \r\n${task.url}"; //$NON-NLS-1$
-
-	public static class FocusedTeamUiStartup implements IStartup {
-
-		public void earlyStartup() {
-			// ignore
-		}
-	}
-
-	public FocusedTeamUiPlugin() {
-		INSTANCE = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		initPreferenceDefaults();
-		commitTemplateManager = new CommitTemplateManager();
-
-		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				try {
-					FocusedTeamExtensionPointReader extensionPointReader = new FocusedTeamExtensionPointReader();
-					extensionPointReader.readExtensions();
-
-					if (getPreferenceStore().getBoolean(CHANGE_SET_MANAGE)) {
-						for (AbstractContextChangeSetManager changeSetManager : changeSetManagers) {
-							changeSetManager.enable();
-						}
-					}
-				} catch (Exception e) {
-					StatusHandler.log(new Status(IStatus.ERROR, FocusedTeamUiPlugin.ID_PLUGIN,
-							"Mylyn Team start failed", e)); //$NON-NLS-1$
-				}
-			}
-		});
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		INSTANCE = null;
-		super.stop(context);
-		for (AbstractContextChangeSetManager changeSetManager : changeSetManagers) {
-			changeSetManager.disable();
-		}
-	}
-
-	private void initPreferenceDefaults() {
-		getPreferenceStore().setDefault(CHANGE_SET_MANAGE, true);
-		getPreferenceStore().setDefault(COMMIT_TEMPLATE, DEFAULT_COMMIT_TEMPLATE);
-		// 2.0M1 - 2.0M2 Default template migration
-		if (getPreferenceStore().getString(COMMIT_TEMPLATE).equals(OLD_DEFAULT_COMMIT_TEMPLATE)
-				|| getPreferenceStore().getString(COMMIT_TEMPLATE).equals(OLD_DEFAULT_COMMIT_TEMPLATE2)) {
-			getPreferenceStore().setValue(COMMIT_TEMPLATE, DEFAULT_COMMIT_TEMPLATE);
-		}
-	}
-
-	public static FocusedTeamUiPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	public void addContextChangeSetManager(AbstractContextChangeSetManager changeSetManager) {
-		changeSetManagers.add(changeSetManager);
-	}
-
-	public boolean removeContextChangeSetManager(AbstractContextChangeSetManager changeSetManager) {
-		return changeSetManagers.remove(changeSetManager);
-	}
-
-	public void addActiveChangeSetProvider(AbstractActiveChangeSetProvider provider) {
-		ActiveChangeSetManager manager = provider.getActiveChangeSetManager();
-		if (manager != null) {
-			activeChangeSetProviders.put(manager, provider);
-		}
-	}
-
-	public Collection<AbstractActiveChangeSetProvider> getActiveChangeSetProviders() {
-		return activeChangeSetProviders.values();
-	}
-
-	public AbstractActiveChangeSetProvider getActiveChangeSetProvider(ActiveChangeSetManager manager) {
-		return activeChangeSetProviders.get(manager);
-	}
-
-	public Set<AbstractContextChangeSetManager> getContextChangeSetManagers() {
-		return Collections.unmodifiableSet(changeSetManagers);
-	}
-
-	public CommitTemplateManager getCommitTemplateManager() {
-		return commitTemplateManager;
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/LinkedTaskInfo.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/LinkedTaskInfo.java
deleted file mode 100644
index 008c2ad..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/LinkedTaskInfo.java
+++ /dev/null
@@ -1,82 +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.team.ui;
-
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.team.ui.AbstractTaskReference;
-import org.eclipse.team.internal.core.subscribers.ChangeSet;
-
-/**
- * Default implementation of {@link AbstractTaskReference}
- * 
- * @author Eugene Kuleshov
- * @author Mik Kersten
- */
-public class LinkedTaskInfo extends AbstractTaskReference {
-
-	private ITask task;
-
-	private String repositoryUrl;
-
-	private String taskId;
-
-	private String taskFullUrl;
-
-	private String comment;
-
-	private ChangeSet changeSet = null;
-
-	public LinkedTaskInfo(ITask task, ChangeSet changeSet) {
-		this.task = task;
-		this.changeSet = changeSet;
-	}
-
-	public LinkedTaskInfo(String taskFullUrl) {
-		this.taskFullUrl = taskFullUrl;
-	}
-
-	public LinkedTaskInfo(String repositoryUrl, String taskId, String taskFullUrl, String comment) {
-		this.repositoryUrl = repositoryUrl;
-		this.taskId = taskId;
-		this.taskFullUrl = taskFullUrl;
-		this.comment = comment;
-	}
-
-	@Override
-	public String getRepositoryUrl() {
-		return repositoryUrl;
-	}
-
-	public ITask getTask() {
-		return task;
-	}
-
-	@Override
-	public String getTaskUrl() {
-		return taskFullUrl;
-	}
-
-	@Override
-	public String getTaskId() {
-		return taskId;
-	}
-
-	@Override
-	public String getText() {
-		return comment;
-	}
-
-	public ChangeSet getChangeSet() {
-		return changeSet;
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/LinkedTaskInfoAdapterFactory.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/LinkedTaskInfoAdapterFactory.java
deleted file mode 100644
index 4d60a47..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/LinkedTaskInfoAdapterFactory.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui;
-
-import org.eclipse.compare.structuremergeviewer.IDiffElement;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.team.ui.AbstractTaskReference;
-import org.eclipse.mylyn.team.ui.IContextChangeSet;
-import org.eclipse.team.core.history.IFileRevision;
-import org.eclipse.team.internal.core.subscribers.ChangeSet;
-import org.eclipse.team.internal.core.subscribers.DiffChangeSet;
-import org.eclipse.team.internal.ui.synchronize.ChangeSetDiffNode;
-import org.eclipse.team.internal.ui.synchronize.SynchronizeModelElement;
-
-/**
- * Adapter factory used to create adapters for <code>LinkedTaskInfo</code>
- * 
- * @author Eugene Kuleshov
- */
-public class LinkedTaskInfoAdapterFactory implements IAdapterFactory {
-
-	@SuppressWarnings("unchecked")
-	private static final Class[] ADAPTER_TYPES = new Class[] { AbstractTaskReference.class };
-
-	@SuppressWarnings("unchecked")
-	public Object getAdapter(Object object, Class adapterType) {
-		if (!AbstractTaskReference.class.equals(adapterType)) {
-			return null;
-		}
-
-		if (object instanceof ChangeSetDiffNode) {
-			return adaptChangeSetDiffNode(object);
-		}
-
-		// TODO add other adapted types
-
-		return adaptFromComment(object);
-	}
-
-	@SuppressWarnings("unchecked")
-	public Class[] getAdapterList() {
-		return ADAPTER_TYPES;
-	}
-
-	private AbstractTaskReference adaptChangeSetDiffNode(Object object) {
-		ChangeSetDiffNode diffNode = (ChangeSetDiffNode) object;
-		ChangeSet set = diffNode.getSet();
-
-		Object adapter = null;
-		if (set instanceof IAdaptable) {
-			adapter = ((IAdaptable) set).getAdapter(AbstractTaskReference.class);
-		}
-		if (adapter == null) {
-			adapter = Platform.getAdapterManager().getAdapter(set, AbstractTaskReference.class);
-		}
-		if (adapter != null) {
-			return (AbstractTaskReference) adapter;
-		}
-
-		return adaptFromComment(object);
-	}
-
-	private AbstractTaskReference adaptFromComment(Object object) {
-		String comment = getCommentForElement(object);
-		if (comment == null) {
-			return null;
-		}
-
-		IResource resource = getResourceForElement(object);
-		if (resource != null) {
-			TaskRepository repository = TasksUiPlugin.getDefault().getRepositoryForResource(resource);
-			if (repository != null) {
-				return new LinkedTaskInfo(repository.getRepositoryUrl(), null, null, comment);
-			}
-		}
-
-		return new LinkedTaskInfo(null, null, null, comment);
-	}
-
-	private static String getCommentForElement(Object element) {
-		if (element instanceof IContextChangeSet) {
-			return ((IContextChangeSet) element).getComment(false);
-		} else if (element instanceof DiffChangeSet) {
-			return ((DiffChangeSet) element).getComment();
-		} else if (element instanceof ChangeSetDiffNode) {
-			return ((ChangeSetDiffNode) element).getName();
-		} else if (element instanceof IFileRevision) {
-			return ((IFileRevision) element).getComment();
-		}
-		return null;
-	}
-
-	private static IResource getResourceForElement(Object element) {
-		if (element instanceof DiffChangeSet) {
-			IResource[] resources = ((DiffChangeSet) element).getResources();
-			if (resources.length > 0) {
-				// TODO: only checks first resource
-				return resources[0];
-			}
-		}
-		if (element instanceof SynchronizeModelElement) {
-			SynchronizeModelElement modelElement = (SynchronizeModelElement) element;
-			IResource resource = modelElement.getResource();
-			if (resource != null) {
-				return resource;
-			} else {
-				IDiffElement[] elements = modelElement.getChildren();
-				if (elements.length > 0) {
-					// TODO: only checks first diff
-					if (elements[0] instanceof SynchronizeModelElement) {
-						return ((SynchronizeModelElement) elements[0]).getResource();
-					}
-				}
-			}
-		}
-
-		// TODO any other resource types?
-
-		return null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/Messages.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/Messages.java
deleted file mode 100644
index 44d8cda..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/Messages.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.internal.team.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.team.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 ContextChangeSet_ATTEMPTING_TO_COMMIT_RESOURCE;
-	public static String ContextChangeSet_Mylyn_Change_Set_Management;
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/AddToTaskContextAction.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/AddToTaskContextAction.java
deleted file mode 100644
index 0956817..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/AddToTaskContextAction.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui.actions;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.team.ui.LinkedTaskInfo;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.resources.ui.ResourcesUi;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSet;
-import org.eclipse.team.internal.core.subscribers.ChangeSet;
-import org.eclipse.team.internal.core.subscribers.DiffChangeSet;
-import org.eclipse.team.internal.ui.synchronize.SynchronizeModelElement;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.ObjectPluginAction;
-
-/**
- * @author Mik Kersten
- */
-public class AddToTaskContextAction extends Action implements IViewActionDelegate {
-
-	private ISelection selection;
-
-	public AddToTaskContextAction() {
-		setText(Messages.AddToTaskContextAction_Add_to_Task_Context);
-		setToolTipText(Messages.AddToTaskContextAction_Add_to_Task_Context);
-		setImageDescriptor(TasksUiImages.CONTEXT_ADD);
-	}
-
-	public void init(IViewPart view) {
-	}
-
-	@Override
-	public void run() {
-		if (selection instanceof StructuredSelection) {
-			run((StructuredSelection) selection);
-		}
-	}
-
-	public void run(IAction action) {
-		if (action instanceof ObjectPluginAction) {
-			ObjectPluginAction objectAction = (ObjectPluginAction) action;
-			if (objectAction.getSelection() instanceof StructuredSelection) {
-				StructuredSelection selection = (StructuredSelection) objectAction.getSelection();
-				run(selection);
-			}
-		}
-	}
-
-	private void run(StructuredSelection selection) {
-		if (!ContextCore.getContextManager().isContextActive()) {
-			MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Messages.AddToTaskContextAction_Add_to_Task_Context,
-					Messages.AddToTaskContextAction_ACTIVATE_TASK_TO_ADD_RESOURCES);
-		}
-
-		Object element = selection.getFirstElement();
-		IResource[] resources = null;
-
-		if (element instanceof ActiveChangeSet) {
-			resources = ((ActiveChangeSet) element).getResources();
-		} else if (element instanceof DiffChangeSet) {
-			resources = ((DiffChangeSet) element).getResources();
-		} else if (element instanceof LinkedTaskInfo) {
-			LinkedTaskInfo linkedTaskInfo = (LinkedTaskInfo) element;
-			ChangeSet changeSet = linkedTaskInfo.getChangeSet();
-			resources = changeSet.getResources();
-		}
-
-		Set<IResource> resourcesToAdd = new HashSet<IResource>();
-		if (resources != null) {
-			resourcesToAdd.addAll(Arrays.asList(resources));
-		} else {
-			for (Iterator<?> iterator = selection.iterator(); iterator.hasNext();) {
-				Object object = iterator.next();
-				if (object instanceof IResource) {
-					resourcesToAdd.add((IResource) object);
-				} else if (object instanceof SynchronizeModelElement) {
-					resourcesToAdd.add(((SynchronizeModelElement) object).getResource());
-				} else if (object instanceof IAdaptable) {
-					Object adapted = ((IAdaptable) object).getAdapter(IResource.class);
-					if (adapted != null) {
-						resourcesToAdd.add((IResource) adapted);
-					}
-				}
-			}
-		}
-
-		if (!resourcesToAdd.isEmpty()) {
-			ResourcesUi.addResourceToContext(resourcesToAdd, InteractionEvent.Kind.SELECTION);
-		} else {
-			MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Messages.AddToTaskContextAction_Add_to_Task_Context,
-					Messages.AddToTaskContextAction_No_resources_to_add);
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/ApplyPatchAction.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/ApplyPatchAction.java
deleted file mode 100644
index ea2a9e1..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/ApplyPatchAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui.actions;
-
-import org.eclipse.compare.CompareConfiguration;
-import org.eclipse.compare.patch.ApplyPatchOperation;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.internal.tasks.ui.editors.TaskAttachmentStorage;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.tasks.core.ITaskAttachment;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.BaseSelectionListenerAction;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class ApplyPatchAction extends BaseSelectionListenerAction implements IViewActionDelegate {
-
-	public ApplyPatchAction() {
-		super(Messages.ApplyPatchAction_Apply_Patch);
-	}
-
-	protected ApplyPatchAction(String text) {
-		super(text);
-	}
-
-	private ISelection currentSelection;
-
-	public void init(IViewPart view) {
-		// ignore
-	}
-
-	public void run(IAction action) {
-		if (currentSelection instanceof StructuredSelection) {
-			Object object = ((StructuredSelection) currentSelection).getFirstElement();
-			if (object instanceof ITaskAttachment) {
-				final ITaskAttachment attachment = (ITaskAttachment) object;
-				IStorage storage;
-				try {
-					storage = TaskAttachmentStorage.create(attachment);
-				} catch (CoreException e) {
-					TasksUiInternal.displayStatus(Messages.ApplyPatchAction_Error_Retrieving_Context, e.getStatus());
-					return;
-				}
-				ApplyPatchOperation op = new ApplyPatchOperation(PlatformUI.getWorkbench()
-						.getActiveWorkbenchWindow()
-						.getActivePage()
-						.getActivePart(), storage, null, new CompareConfiguration());
-				BusyIndicator.showWhile(Display.getDefault(), op);
-			}
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.currentSelection = selection;
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/CommitContextAction.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/CommitContextAction.java
deleted file mode 100644
index 416fae8..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/CommitContextAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-
-/**
- * @author Mik Kersten
- */
-public class CommitContextAction implements IViewActionDelegate {
-
-	public void init(IViewPart view) {
-		// ignore
-	}
-
-	public void run(IAction action) {
-//		ITask task = TaskListView.getFromActivePerspective().getSelectedTask();
-//		// TODO: consider corresponding tasks to change set managers to avoid iteration
-//		for (AbstractContextChangeSetManager changeSetManager : MylynTeamPlugin.getDefault().getContextChangeSetManagers()) {
-//			IResource[] resources = MylynTeamPlugin.getDefault().getChangeSetManager().getResources(task);
-//			if (resources == null || resources.length == 0) {
-//				MessageDialog.openInformation(null, "Mylyn Information",
-//						"There are no interesting resources in the corresponding change set.\nRefer to Synchronize view.");
-//				return;
-//			}
-//
-//			List<AbstractCommitWorkflowProvider> providers = TeamRespositoriesManager.getInstance().getProviders();
-//			for (AbstractCommitWorkflowProvider element : providers) {
-//				AbstractCommitWorkflowProvider provider = (AbstractTeamRepositoryProvider) element;
-//				if (provider.hasOutgoingChanges(resources)) {
-//					provider.commit(resources);
-//				}
-//			} catch (Exception e) {
-//				StatusHandler.fail(e, "Could not commit context.", false);
-//			}	
-//		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// ignore
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/Messages.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/Messages.java
deleted file mode 100644
index f767260..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/Messages.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.team.ui.actions;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.team.ui.actions.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 AddToTaskContextAction_ACTIVATE_TASK_TO_ADD_RESOURCES;
-	public static String AddToTaskContextAction_Add_to_Task_Context;
-	public static String AddToTaskContextAction_No_resources_to_add;
-
-	public static String ApplyPatchAction_Apply_Patch;
-	public static String ApplyPatchAction_Error_Retrieving_Context;
-
-	public static String OpenCorrespondingTaskAction_Completed;
-	public static String OpenCorrespondingTaskAction_Open_Corresponding_Task;
-	public static String OpenCorrespondingTaskAction_Open_Task;
-	public static String OpenCorrespondingTaskAction_Opening_Corresponding_Task;
-	public static String OpenCorrespondingTaskAction_Progress_on;
-	public static String OpenCorrespondingTaskAction_Unable_to_match_task;
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/OpenCorrespondingTaskAction.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/OpenCorrespondingTaskAction.java
deleted file mode 100644
index 8812bca..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/OpenCorrespondingTaskAction.java
+++ /dev/null
@@ -1,341 +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.team.ui.actions;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
-import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.internal.tasks.ui.actions.OpenRepositoryTaskAction;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin;
-import org.eclipse.mylyn.internal.team.ui.LinkedTaskInfo;
-import org.eclipse.mylyn.internal.team.ui.templates.CommitTemplateManager;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.tasks.ui.TasksUiImages;
-import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
-import org.eclipse.mylyn.team.ui.AbstractTaskReference;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.ObjectPluginAction;
-
-/**
- * Action used to open linked task.
- * 
- * TODO: this class has evolved into a complete mess and has to be fixed.
- * 
- * @author Mik Kersten
- * @author Eugene Kuleshov
- */
-public class OpenCorrespondingTaskAction extends Action implements IViewActionDelegate {
-
-	private static final String LABEL = Messages.OpenCorrespondingTaskAction_Open_Corresponding_Task;
-
-	private static final String PREFIX_HTTP = "http://"; //$NON-NLS-1$
-
-	private static final String PREFIX_HTTPS = "https://"; //$NON-NLS-1$
-
-	private ISelection selection;
-
-	public OpenCorrespondingTaskAction() {
-		setText(LABEL);
-		setToolTipText(LABEL);
-		setImageDescriptor(TasksUiImages.TASK_REPOSITORY);
-	}
-
-	public void init(IViewPart view) {
-		// ignore
-	}
-
-	@Override
-	public void run() {
-		if (selection instanceof StructuredSelection) {
-			run((StructuredSelection) selection);
-		}
-	}
-
-	public void run(IAction action) {
-		if (action instanceof ObjectPluginAction) {
-			ObjectPluginAction objectAction = (ObjectPluginAction) action;
-			if (objectAction.getSelection() instanceof StructuredSelection) {
-				StructuredSelection selection = (StructuredSelection) objectAction.getSelection();
-				run(selection);
-			}
-		}
-	}
-
-	private void run(StructuredSelection selection) {
-		final Object element = selection.getFirstElement();
-
-		Job job = new OpenCorrespondingTaskJob(Messages.OpenCorrespondingTaskAction_Opening_Corresponding_Task, element);
-		job.schedule();
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-	}
-
-	/**
-	 * Reconcile <code>ILinkedTaskInfo</code> data.
-	 * 
-	 * This is used in order to keep LinkedTaskInfo lightweight with minimal dependencies.
-	 */
-	private static AbstractTaskReference reconcile(AbstractTaskReference info) {
-		ITask task;
-		if (info instanceof LinkedTaskInfo) {
-			task = ((LinkedTaskInfo) info).getTask();
-		} else {
-			task = null;
-		}
-
-		if (task != null) {
-			return info;
-		}
-
-		String repositoryUrl = info.getRepositoryUrl();
-		String taskId = info.getTaskId();
-		String taskFullUrl = info.getTaskUrl();
-		String comment = info.getText();
-
-		TaskRepositoryManager repositoryManager = TasksUiPlugin.getRepositoryManager();
-
-		TaskRepository repository = null;
-		if (repositoryUrl != null) {
-			repository = repositoryManager.getRepository(repositoryUrl);
-		}
-
-		if (taskFullUrl == null && comment != null) {
-			taskFullUrl = getUrlFromComment(comment);
-		}
-
-		AbstractRepositoryConnector connector = null;
-		if (taskFullUrl != null) {
-			connector = repositoryManager.getConnectorForRepositoryTaskUrl(taskFullUrl);
-		}
-		if (connector == null && repository != null) {
-			connector = repositoryManager.getRepositoryConnector(repository.getConnectorKind());
-		}
-
-		if (repositoryUrl == null && connector != null) {
-			repositoryUrl = connector.getRepositoryUrlFromTaskUrl(taskFullUrl);
-			if (repository == null) {
-				repository = repositoryManager.getRepository(repositoryUrl);
-			}
-		}
-
-		if (taskId == null && connector != null) {
-			taskId = connector.getTaskIdFromTaskUrl(taskFullUrl);
-		}
-
-		// XXX: clean up and remove break to label
-		if (taskId == null && comment != null) {
-			Collection<AbstractRepositoryConnector> connectors = connector != null ? Collections.singletonList(connector)
-					: TasksUi.getRepositoryManager().getRepositoryConnectors();
-			REPOSITORIES: for (AbstractRepositoryConnector c : connectors) {
-				Collection<TaskRepository> repositories = repository != null ? Collections.singletonList(repository)
-						: TasksUi.getRepositoryManager().getRepositories(c.getConnectorKind());
-				for (TaskRepository r : repositories) {
-					String[] ids = c.getTaskIdsFromComment(r, comment);
-					if (ids != null && ids.length > 0) {
-						taskId = ids[0];
-						connector = c;
-						repository = r;
-						repositoryUrl = r.getRepositoryUrl();
-						break REPOSITORIES;
-					}
-				}
-			}
-		}
-		if (taskId == null && comment != null) {
-			CommitTemplateManager commitTemplateManager = FocusedTeamUiPlugin.getDefault().getCommitTemplateManager();
-			taskId = commitTemplateManager.getTaskIdFromCommentOrLabel(comment);
-			if (taskId == null) {
-				taskId = getTaskIdFromLegacy07Label(comment);
-			}
-		}
-
-		if (taskFullUrl == null && repositoryUrl != null && taskId != null && connector != null) {
-			taskFullUrl = connector.getTaskUrl(repositoryUrl, taskId);
-		}
-
-		if (task == null) {
-			if (taskId != null && repositoryUrl != null) {
-				// XXX fix this hack (jira ids don't work here)
-				if (!taskId.contains(RepositoryTaskHandleUtil.HANDLE_DELIM)) {
-//					String handle = AbstractTask.getHandle(repositoryUrl, taskId);
-					task = TasksUiInternal.getTaskList().getTask(repositoryUrl, taskId);
-				}
-			}
-			if (task == null && taskFullUrl != null) {
-				// search by fullUrl
-				for (AbstractTask currTask : TasksUiPlugin.getTaskList().getAllTasks()) {
-					if (currTask != null) {
-						String currUrl = currTask.getUrl();
-						if (taskFullUrl.equals(currUrl)) {
-							return new LinkedTaskInfo(currTask, null);
-						}
-					}
-				}
-			}
-		}
-		if (task != null) {
-			return new LinkedTaskInfo(task, null);
-		}
-
-		return new LinkedTaskInfo(repositoryUrl, taskId, taskFullUrl, comment);
-	}
-
-	public static String getUrlFromComment(String comment) {
-		int httpIndex = comment.indexOf(PREFIX_HTTP);
-		int httpsIndex = comment.indexOf(PREFIX_HTTPS);
-		int idStart = -1;
-		if (httpIndex != -1) {
-			idStart = httpIndex;
-		} else if (httpsIndex != -1) {
-			idStart = httpsIndex;
-		}
-		if (idStart != -1) {
-			int idEnd = comment.indexOf(' ', idStart);
-			if (idEnd == -1) {
-				return comment.substring(idStart);
-			} else if (idEnd != -1 && idStart < idEnd) {
-				return comment.substring(idStart, idEnd);
-			}
-		}
-		return null;
-	}
-
-	public static String getTaskIdFromLegacy07Label(String comment) {
-		String PREFIX_DELIM = ":"; //$NON-NLS-1$
-		String PREFIX_START_1 = Messages.OpenCorrespondingTaskAction_Progress_on;
-		String PREFIX_START_2 = Messages.OpenCorrespondingTaskAction_Completed;
-		String usedPrefix = PREFIX_START_1;
-		int firstDelimIndex = comment.indexOf(PREFIX_START_1);
-		if (firstDelimIndex == -1) {
-			firstDelimIndex = comment.indexOf(PREFIX_START_2);
-			usedPrefix = PREFIX_START_2;
-		}
-		if (firstDelimIndex != -1) {
-			int idStart = firstDelimIndex + usedPrefix.length();
-			int idEnd = comment.indexOf(PREFIX_DELIM, firstDelimIndex + usedPrefix.length());// comment.indexOf(PREFIX_DELIM);
-			if (idEnd != -1 && idStart < idEnd) {
-				String id = comment.substring(idStart, idEnd);
-				if (id != null) {
-					return id.trim();
-				}
-			} else {
-				return comment.substring(0, firstDelimIndex);
-			}
-		}
-		return null;
-	}
-
-	private static final class OpenCorrespondingTaskJob extends Job {
-		private final Object element;
-
-		private OpenCorrespondingTaskJob(String name, Object element) {
-			super(name);
-			this.element = element;
-		}
-
-		@Override
-		protected IStatus run(IProgressMonitor monitor) {
-			AbstractTaskReference info = null;
-			if (element instanceof AbstractTaskReference) {
-				info = (AbstractTaskReference) element;
-			} else if (element instanceof IAdaptable) {
-				info = (AbstractTaskReference) ((IAdaptable) element).getAdapter(AbstractTaskReference.class);
-			}
-			if (info == null) {
-				info = (AbstractTaskReference) Platform.getAdapterManager().getAdapter(element,
-						AbstractTaskReference.class);
-			}
-
-			if (info != null) {
-				info = reconcile(info);
-				final ITask task;
-				if (info instanceof LinkedTaskInfo) {
-					task = ((LinkedTaskInfo) info).getTask();
-				} else {
-					task = null;
-				}
-				if (task != null) {
-					PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							TasksUiUtil.openTask(task);
-						}
-					});
-					return Status.OK_STATUS;
-				}
-				if (info.getRepositoryUrl() != null && info.getTaskId() != null) {
-					TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
-							info.getRepositoryUrl());
-					String taskId = info.getTaskId();
-					if (repository != null && taskId != null) {
-						AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(repository.getConnectorKind());
-						if (connectorUi != null) {
-							TasksUiInternal.openRepositoryTask(connectorUi.getConnectorKind(),
-									repository.getRepositoryUrl(), taskId);
-							return Status.OK_STATUS;
-						}
-					}
-				}
-				final String taskFullUrl = info.getTaskUrl();
-				if (taskFullUrl != null) {
-					PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							TasksUiUtil.openUrl(taskFullUrl);
-						}
-					});
-
-					return Status.OK_STATUS;
-				}
-			}
-
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-					boolean openDialog = MessageDialog.openQuestion(window.getShell(),
-							Messages.OpenCorrespondingTaskAction_Open_Task,
-							Messages.OpenCorrespondingTaskAction_Unable_to_match_task);
-					if (openDialog) {
-						new OpenRepositoryTaskAction().run(null);
-					}
-				}
-			});
-
-			return Status.OK_STATUS;
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/TaskResourceMappingActionProvider.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/TaskResourceMappingActionProvider.java
deleted file mode 100644
index 734e4c3..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/TaskResourceMappingActionProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui.actions;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonMenuConstants;
-
-/**
- * @author Mik Kersten
- */
-public class TaskResourceMappingActionProvider extends CommonActionProvider {
-
-	private final OpenCorrespondingTaskAction openCorrespondingAction = new OpenCorrespondingTaskAction();
-
-	private final AddToTaskContextAction addToTaskContextAction = new AddToTaskContextAction();
-
-	@Override
-	public void fillContextMenu(IMenuManager menuManager) {
-		IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
-		openCorrespondingAction.selectionChanged(openCorrespondingAction, selection);
-		addToTaskContextAction.selectionChanged(addToTaskContextAction, selection);
-
-		menuManager.insertAfter(ICommonMenuConstants.GROUP_ADDITIONS, openCorrespondingAction);
-		menuManager.insertAfter(ICommonMenuConstants.GROUP_ADDITIONS, addToTaskContextAction);
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/messages.properties b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/messages.properties
deleted file mode 100644
index 3441997..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/actions/messages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-AddToTaskContextAction_ACTIVATE_TASK_TO_ADD_RESOURCES=Activate a task to add resources.
-AddToTaskContextAction_Add_to_Task_Context=Add to Task Context
-AddToTaskContextAction_No_resources_to_add=No resources to add.
-
-ApplyPatchAction_Apply_Patch=Apply Patch
-ApplyPatchAction_Error_Retrieving_Context=Error Retrieving Context
-
-OpenCorrespondingTaskAction_Completed=Completed:
-OpenCorrespondingTaskAction_Open_Corresponding_Task=Open Corresponding Task
-OpenCorrespondingTaskAction_Open_Task=Open Task
-OpenCorrespondingTaskAction_Opening_Corresponding_Task=Opening Corresponding Task
-OpenCorrespondingTaskAction_Progress_on=Progress on:
-OpenCorrespondingTaskAction_Unable_to_match_task=Unable to match task. Open Repository Task dialog?
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/messages.properties b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/messages.properties
deleted file mode 100644
index 782ed46..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-ContextChangeSet_ATTEMPTING_TO_COMMIT_RESOURCE=You are attempting to commit a resource which is not associated with the selected task repository.  Proceed with creating the commit message?
-ContextChangeSet_Mylyn_Change_Set_Management=Mylyn Change Set Management
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/FocusedTeamPreferencePage.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/FocusedTeamPreferencePage.java
deleted file mode 100644
index b39f4e4..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/FocusedTeamPreferencePage.java
+++ /dev/null
@@ -1,137 +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.team.ui.preferences;
-
-import org.eclipse.jface.fieldassist.IContentProposalProvider;
-import org.eclipse.jface.fieldassist.IControlContentAdapter;
-import org.eclipse.jface.fieldassist.TextContentAdapter;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin;
-import org.eclipse.mylyn.internal.team.ui.templates.TemplateHandlerContentProposalProvider;
-import org.eclipse.mylyn.team.ui.AbstractContextChangeSetManager;
-import org.eclipse.swt.SWT;
-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.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
-
-/**
- * @author Mik Kersten
- */
-public class FocusedTeamPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	public final static String PAGE_ID = "org.eclipse.mylyn.team.ui.ui.preferences"; //$NON-NLS-1$
-
-	private Button manageChangeSets;
-
-	private Text commitTemplate = null;
-
-	public FocusedTeamPreferencePage() {
-		super();
-		setPreferenceStore(FocusedTeamUiPlugin.getDefault().getPreferenceStore());
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout(1, false);
-		container.setLayout(layout);
-
-		createChangeSetGroup(container);
-		createCommitGroup(container);
-		applyDialogFont(container);
-		return container;
-	}
-
-	public void init(IWorkbench workbench) {
-		// TODO Auto-generated method stub
-	}
-
-	@Override
-	public boolean performOk() {
-		getPreferenceStore().setValue(FocusedTeamUiPlugin.COMMIT_TEMPLATE, commitTemplate.getText());
-		getPreferenceStore().setValue(FocusedTeamUiPlugin.CHANGE_SET_MANAGE, manageChangeSets.getSelection());
-
-		if (manageChangeSets.getSelection()) {
-			for (AbstractContextChangeSetManager changeSetManager : FocusedTeamUiPlugin.getDefault()
-					.getContextChangeSetManagers()) {
-				changeSetManager.enable();
-			}
-		} else {
-			for (AbstractContextChangeSetManager changeSetManager : FocusedTeamUiPlugin.getDefault()
-					.getContextChangeSetManagers()) {
-				changeSetManager.disable();
-			}
-		}
-		return true;
-	}
-
-	@Override
-	public boolean performCancel() {
-		return true;
-	}
-
-	@Override
-	public void performDefaults() {
-		super.performDefaults();
-		commitTemplate.setText(getPreferenceStore().getDefaultString(FocusedTeamUiPlugin.COMMIT_TEMPLATE));
-		manageChangeSets.setSelection(getPreferenceStore().getDefaultBoolean(FocusedTeamUiPlugin.CHANGE_SET_MANAGE));
-	}
-
-	private void createChangeSetGroup(Composite parent) {
-		Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
-		group.setText(Messages.FocusedTeamPreferencePage_Change_Set_Management);
-		group.setLayout(new GridLayout(1, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		manageChangeSets = new Button(group, SWT.CHECK);
-		manageChangeSets.setText(Messages.FocusedTeamPreferencePage_Automatically_create_and_manage_with_task_context);
-		manageChangeSets.setSelection(getPreferenceStore().getBoolean(FocusedTeamUiPlugin.CHANGE_SET_MANAGE));
-	}
-
-	private void createCommitGroup(Composite parent) {
-		Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
-		group.setText(Messages.FocusedTeamPreferencePage_Commit_Comment_Template);
-		group.setLayout(new GridLayout(2, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-//		Label completedLabel = createLabel(group, "Template: ");
-//		completedLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-		String completedTemplate = getPreferenceStore().getString(FocusedTeamUiPlugin.COMMIT_TEMPLATE);
-		commitTemplate = addTemplateField(group, completedTemplate, new TemplateHandlerContentProposalProvider());
-	}
-
-	private Text addTemplateField(final Composite parent, final String text, IContentProposalProvider provider) {
-		IControlContentAdapter adapter = new TextContentAdapter();
-		Text control = new Text(parent, SWT.BORDER | SWT.MULTI);
-		control.setText(text);
-
-		new ContentAssistCommandAdapter(control, adapter, provider, null, new char[] { '$' }, true);
-
-		GridData gd = new GridData();
-		gd.heightHint = 60;
-		gd.horizontalAlignment = GridData.FILL;
-		gd.grabExcessHorizontalSpace = true;
-		gd.verticalAlignment = GridData.CENTER;
-		gd.grabExcessVerticalSpace = false;
-		control.setLayoutData(gd);
-
-		return control;
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/Messages.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/Messages.java
deleted file mode 100644
index 58e3fa3..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/Messages.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.team.ui.preferences;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.team.ui.preferences.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 FocusedTeamPreferencePage_Automatically_create_and_manage_with_task_context;
-	public static String FocusedTeamPreferencePage_Change_Set_Management;
-	public static String FocusedTeamPreferencePage_Commit_Comment_Template;
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/messages.properties b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/messages.properties
deleted file mode 100644
index 406c7f5..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/preferences/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-FocusedTeamPreferencePage_Automatically_create_and_manage_with_task_context=Automatically create and manage with task context
-FocusedTeamPreferencePage_Change_Set_Management=Change Set Management
-FocusedTeamPreferencePage_Commit_Comment_Template=Commit Comment Template
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/Messages.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/Messages.java
deleted file mode 100644
index fdeeead..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/Messages.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.team.ui.properties;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.team.ui.properties.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 ProjectTeamPage_Commit_Comment_Template;
-	public static String ProjectTeamPage_Configure_workspace;
-	public static String ProjectTeamPage_Enable_project_specific_settings;
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/ProjectTeamPage.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/ProjectTeamPage.java
deleted file mode 100644
index a0f0589..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/ProjectTeamPage.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui.properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.fieldassist.IContentProposalProvider;
-import org.eclipse.jface.fieldassist.IControlContentAdapter;
-import org.eclipse.jface.fieldassist.TextContentAdapter;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.resource.JFaceColors;
-import org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin;
-import org.eclipse.mylyn.internal.team.ui.preferences.FocusedTeamPreferencePage;
-import org.eclipse.mylyn.internal.team.ui.templates.TemplateHandlerContentProposalProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * A property page that support per project configuration of commit comment templates.
- * 
- * @author Rob Elves
- * @author Steffen Pingel
- * @see Adapted from org.eclipse.ui.internal.ide.dialogs.ProjectReferencePage
- */
-public class ProjectTeamPage extends PropertyPage {
-
-	private IProject project;
-
-	private boolean modified;
-
-	private boolean ignoreModifyEvents;
-
-	private Button useProjectSettings;
-
-	private Text commitTemplateText;
-
-	private Composite propertiesComposite;
-
-	private Hyperlink configurationHyperlink;
-
-	private Label label;
-
-	public ProjectTeamPage() {
-		noDefaultAndApplyButton();
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		Font font = parent.getFont();
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		composite.setFont(font);
-
-		createDescription(composite);
-		createPropertiesControl(composite);
-
-		initialize();
-
-		return composite;
-	}
-
-	private void createDescription(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setFont(parent.getFont());
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-
-		useProjectSettings = new Button(composite, SWT.CHECK);
-		useProjectSettings.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (!ignoreModifyEvents) {
-					modified = true;
-				}
-				setPropertiesEnabled(useProjectSettings.getSelection());
-			}
-		});
-		useProjectSettings.setText(Messages.ProjectTeamPage_Enable_project_specific_settings);
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(useProjectSettings);
-
-		configurationHyperlink = new Hyperlink(composite, SWT.NONE);
-		configurationHyperlink.setUnderlined(true);
-		configurationHyperlink.setText(Messages.ProjectTeamPage_Configure_workspace);
-		configurationHyperlink.addHyperlinkListener(new HyperlinkAdapter() {
-
-			@Override
-			public void linkActivated(HyperlinkEvent e) {
-				PreferenceDialog dlg = PreferencesUtil.createPreferenceDialogOn(getShell(),
-						FocusedTeamPreferencePage.PAGE_ID, new String[] { FocusedTeamPreferencePage.PAGE_ID }, null);
-				dlg.open();
-			}
-		});
-
-		Label horizontalLine = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
-		horizontalLine.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
-		horizontalLine.setFont(composite.getFont());
-	}
-
-	private void setPropertiesEnabled(boolean enabled) {
-		propertiesComposite.setEnabled(enabled);
-		for (Control child : propertiesComposite.getChildren()) {
-			child.setEnabled(enabled);
-		}
-		commitTemplateText.setEnabled(enabled);
-
-		configurationHyperlink.setEnabled(!enabled);
-		if (!enabled) {
-			configurationHyperlink.setForeground(JFaceColors.getHyperlinkText(getShell().getDisplay()));
-		} else {
-			configurationHyperlink.setForeground(getShell().getDisplay().getSystemColor(
-					SWT.COLOR_TITLE_INACTIVE_FOREGROUND));
-		}
-	}
-
-	private void createPropertiesControl(Composite parent) {
-		propertiesComposite = new Composite(parent, SWT.NONE);
-		propertiesComposite.setFont(parent.getFont());
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.numColumns = 1;
-		propertiesComposite.setLayout(layout);
-		propertiesComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-
-		label = new Label(propertiesComposite, SWT.NONE);
-		label.setText(Messages.ProjectTeamPage_Commit_Comment_Template);
-
-		String completedTemplate = ""; //getPreferenceStore().getString(FocusedTeamUiPlugin.COMMIT_TEMPLATE); //$NON-NLS-1$
-		commitTemplateText = addTemplateField(propertiesComposite, completedTemplate,
-				new TemplateHandlerContentProposalProvider());
-	}
-
-	private Text addTemplateField(final Composite parent, final String text, IContentProposalProvider provider) {
-		IControlContentAdapter adapter = new TextContentAdapter();
-		Text control = new Text(parent, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL);
-		control.setText(text);
-		control.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (!ignoreModifyEvents) {
-					modified = true;
-				}
-			}
-		});
-
-		new ContentAssistCommandAdapter(control, adapter, provider, null, new char[] { '$' }, true);
-
-		GridData gd = new GridData();
-		gd.heightHint = 60;
-		gd.horizontalAlignment = GridData.FILL;
-		gd.grabExcessHorizontalSpace = true;
-		gd.verticalAlignment = GridData.CENTER;
-		gd.grabExcessVerticalSpace = false;
-		control.setLayoutData(gd);
-
-		return control;
-	}
-
-	private void initialize() {
-		project = (IProject) getElement().getAdapter(IResource.class);
-		try {
-			ignoreModifyEvents = true;
-			TeamPropertiesLinkProvider provider = new TeamPropertiesLinkProvider();
-			String template = provider.getCommitCommentTemplate(project);
-			if (template == null) {
-				useProjectSettings.setSelection(false);
-				setPropertiesEnabled(false);
-				commitTemplateText.setText(FocusedTeamUiPlugin.getDefault().getPreferenceStore().getString(
-						FocusedTeamUiPlugin.COMMIT_TEMPLATE));
-			} else {
-				useProjectSettings.setSelection(true);
-				setPropertiesEnabled(true);
-				commitTemplateText.setText(template);
-			}
-		} finally {
-			ignoreModifyEvents = false;
-		}
-	}
-
-	@Override
-	public boolean performOk() {
-		if (!modified) {
-			return true;
-		}
-
-		TeamPropertiesLinkProvider provider = new TeamPropertiesLinkProvider();
-		if (useProjectSettings.getSelection()) {
-			provider.setCommitCommentTemplate(project, commitTemplateText.getText());
-		} else {
-			provider.setCommitCommentTemplate(project, null);
-		}
-
-		return true;
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/TeamPropertiesLinkProvider.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/TeamPropertiesLinkProvider.java
deleted file mode 100644
index 9992355..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/TeamPropertiesLinkProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Eugene Kuleshov and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Eugene Kuleshov - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui.properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * Retrieves team settings from project properties.
- * 
- * @author Eugene Kuleshov
- * @author Steffen Pingel
- */
-public class TeamPropertiesLinkProvider {
-
-	private static final String PROJECT_COMMIT_COMMENT_TEMPLATE = "commit.comment.template"; //$NON-NLS-1$
-
-	public TeamPropertiesLinkProvider() {
-	}
-
-	public boolean canAccessProperties(IResource resource) {
-		IProject project = resource.getProject();
-		return project != null && project.isAccessible();
-	}
-
-	public String getCommitCommentTemplate(IResource resource) {
-		if (!canAccessProperties(resource)) {
-			return null;
-		}
-
-		IScopeContext projectScope = new ProjectScope(resource.getProject());
-		IEclipsePreferences projectNode = projectScope.getNode(FocusedTeamUiPlugin.ID_PLUGIN);
-		if (projectNode != null) {
-			return projectNode.get(PROJECT_COMMIT_COMMENT_TEMPLATE, null);
-		}
-		return null;
-	}
-
-	public boolean setCommitCommentTemplate(IResource resource, String commitCommentTemplate) {
-		if (!canAccessProperties(resource)) {
-			return false;
-		}
-
-		IScopeContext projectScope = new ProjectScope(resource.getProject());
-		IEclipsePreferences projectNode = projectScope.getNode(FocusedTeamUiPlugin.ID_PLUGIN);
-		if (projectNode != null) {
-			if (commitCommentTemplate != null) {
-				projectNode.put(PROJECT_COMMIT_COMMENT_TEMPLATE, commitCommentTemplate);
-			} else {
-				projectNode.remove(PROJECT_COMMIT_COMMENT_TEMPLATE);
-			}
-			try {
-				projectNode.flush();
-				return true;
-			} catch (BackingStoreException e) {
-				StatusHandler.log(new Status(IStatus.ERROR, FocusedTeamUiPlugin.ID_PLUGIN,
-						"Failed to save commit comment template for project", e)); //$NON-NLS-1$
-			}
-		}
-		return false;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/messages.properties b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/messages.properties
deleted file mode 100644
index fcf40ba..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/properties/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-ProjectTeamPage_Commit_Comment_Template=Commit Comment Template
-ProjectTeamPage_Configure_workspace=Configure workspace
-ProjectTeamPage_Enable_project_specific_settings=Enable project specific settings
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java
deleted file mode 100644
index f6e37b6..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java
+++ /dev/null
@@ -1,262 +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:
- *     Eike Stepper- initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui.templates;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Stack;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-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.internal.team.ui.FocusedTeamUiPlugin;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.team.ui.AbstractCommitTemplateVariable;
-
-/**
- * @author Eike Stepper
- * @author Mik Kersten
- */
-public class CommitTemplateManager {
-
-	private static final String ATTR_CLASS = "class"; //$NON-NLS-1$
-
-	private static final String ATTR_DESCRIPTION = "description"; //$NON-NLS-1$
-
-	private static final String ATTR_RECOGNIZED_KEYWORD = "recognizedKeyword"; //$NON-NLS-1$
-
-	private static final String ELEM_TEMPLATE_HANDLER = "templateVariable"; //$NON-NLS-1$
-
-	private static final String EXT_POINT_TEMPLATE_HANDLERS = "commitTemplates"; //$NON-NLS-1$
-
-	public String generateComment(ITask task, String template) {
-		return processKeywords(task, template);
-	}
-
-	public String getTaskIdFromCommentOrLabel(String commentOrLabel) {
-		String id = getTaskIdFromComment(commentOrLabel);
-		return id;
-	}
-
-	private String getTaskIdFromComment(String comment) {
-		try {
-			String template = FocusedTeamUiPlugin.getDefault().getPreferenceStore().getString(
-					FocusedTeamUiPlugin.COMMIT_TEMPLATE);
-			int templateNewline = template.indexOf('\n');
-			String templateFirstLineIndex = template;
-			if (templateNewline != -1) {
-				templateFirstLineIndex = template.substring(0, templateNewline - 1);
-			}
-
-			String regex = getTaskIdRegEx(templateFirstLineIndex);
-
-			int commentNewlineIndex = comment.indexOf('\n');
-			String commentFirstLine = comment;
-			if (commentNewlineIndex != -1) {
-				commentFirstLine = comment.substring(0, commentNewlineIndex);
-			}
-
-			Pattern pattern = Pattern.compile(regex);
-			Matcher matcher = pattern.matcher(commentFirstLine);
-
-			if (matcher.find()) {
-				return matcher.group(1);
-			}
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, FocusedTeamUiPlugin.ID_PLUGIN,
-					"Problem while parsing task id from comment", e)); //$NON-NLS-1$
-		}
-
-		return null;
-	}
-
-	public String getTaskIdRegEx(String template) {
-		final String META_CHARS = " $()*+.< [\\]^{|}"; //$NON-NLS-1$
-		final String TASK_ID_PLACEHOLDER = "\uffff"; //$NON-NLS-1$
-		final String KEYWORD_PLACEHOLDER = "\ufffe"; //$NON-NLS-1$
-
-		template = template.replaceFirst("\\$\\{task\\.id\\}", TASK_ID_PLACEHOLDER); //$NON-NLS-1$
-		template = template.replaceFirst("\\$\\{task\\.key\\}", TASK_ID_PLACEHOLDER); //$NON-NLS-1$
-		template = replaceKeywords(template, KEYWORD_PLACEHOLDER);
-		template = quoteChars(template, META_CHARS);
-		template = template.replaceFirst(TASK_ID_PLACEHOLDER, "(\\\\d+)"); //$NON-NLS-1$
-		template = template.replaceAll(KEYWORD_PLACEHOLDER, ".*"); //$NON-NLS-1$
-		return template;
-	}
-
-	private String replaceKeywords(String str, String placeholder) {
-		String[] recognizedKeywords = getRecognizedKeywords();
-		for (String keyword : recognizedKeywords) {
-			str = str.replaceAll("\\$\\{" + keyword + "\\}", placeholder); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return str;
-	}
-
-	private String quoteChars(String str, String charsToQuote) {
-		StringBuilder builder = new StringBuilder(str.length() * 2);
-		for (int i = 0; i < str.length(); i++) {
-			char c = str.charAt(i);
-			if (charsToQuote.indexOf(c) != -1) {
-				builder.append('\\');
-			}
-			builder.append(c);
-		}
-		return builder.toString();
-	}
-
-	public String[] getRecognizedKeywords() {
-		final ArrayList<String> result = new ArrayList<String>();
-		new ExtensionProcessor() {
-			@Override
-			protected Object processContribution(IConfigurationElement element, String keyword, String description,
-					String className) throws Exception {
-				result.add(keyword);
-				return null;
-			}
-		}.run();
-
-		return result.toArray(new String[result.size()]);
-	}
-
-	public String getHandlerDescription(final String keyword) {
-		return (String) new ExtensionProcessor() {
-			@Override
-			protected Object processContribution(IConfigurationElement element, String foundKeyword,
-					String description, String className) throws Exception {
-				return keyword.equals(foundKeyword) ? description : null;
-			}
-		}.run();
-	}
-
-	public AbstractCommitTemplateVariable createHandler(final String keyword) {
-		return (AbstractCommitTemplateVariable) new ExtensionProcessor() {
-			@Override
-			protected Object processContribution(IConfigurationElement element, String foundKeyword,
-					String description, String className) throws Exception {
-				if (keyword.equals(foundKeyword)) {
-					AbstractCommitTemplateVariable handler = (AbstractCommitTemplateVariable) element.createExecutableExtension(ATTR_CLASS);
-					if (handler != null) {
-						(handler).setDescription(description);
-						(handler).setRecognizedKeyword(foundKeyword);
-					}
-//					else {
-//						String recognizedKeyword = handler.getRecognizedKeyword();
-//						if (recognizedKeyword == null || !recognizedKeyword.equals(foundKeyword)) {
-//							throw new IllegalArgumentException("Keyword markup does not match handler implementation");
-//						}
-//					}
-
-					return handler;
-				}
-
-				return null;
-			}
-		}.run();
-	}
-
-	private String processKeywords(ITask task, String template) {
-		String[] segments = template.split("\\$\\{"); //$NON-NLS-1$
-		Stack<String> evaluated = new Stack<String>();
-		evaluated.add(segments[0]);
-
-		for (int i = 1; i < segments.length; i++) {
-			String segment = segments[i];
-			String value = null;
-			int brace = segment.indexOf('}');
-			if (brace > 0) {
-				String keyword = segment.substring(0, brace);
-				value = processKeyword(task, keyword);
-			}
-
-			if (value != null) {
-				evaluated.add(value);
-				evaluated.add(segment.substring(brace + 1));
-			} else if (!evaluated.isEmpty()) {
-				evaluated.pop();
-			}
-//			else {
-//				buffer.append("${");
-//				buffer.append(segment);
-//			}
-		}
-		StringBuffer buffer = new StringBuffer();
-		for (String string : evaluated) {
-			buffer.append(string);
-		}
-
-		return buffer.toString();
-	}
-
-	private String processKeyword(ITask task, String keyword) {
-		try {
-			AbstractCommitTemplateVariable handler = createHandler(keyword);
-			if (handler != null) {
-				return handler.getValue(task);
-			}
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, FocusedTeamUiPlugin.ID_PLUGIN,
-					"Problem while dispatching to template handler for: " + keyword, e)); //$NON-NLS-1$
-		}
-
-		return null;
-	}
-
-	/**
-	 * @author Eike Stepper
-	 */
-	private static class ExtensionProcessor {
-		public Object run() {
-			IExtensionPoint extPoint = Platform.getExtensionRegistry().getExtensionPoint(FocusedTeamUiPlugin.ID_PLUGIN,
-					EXT_POINT_TEMPLATE_HANDLERS);
-			IExtension[] extensions = extPoint.getExtensions();
-			for (IExtension extension : extensions) {
-				IConfigurationElement[] elements = extension.getConfigurationElements();
-				for (IConfigurationElement element : elements) {
-					if (ELEM_TEMPLATE_HANDLER.equals(element.getName())) {
-						try {
-							Object result = processContribution(element);
-							if (result != null) {
-								return result;
-							}
-						} catch (Exception e) {
-							String msg = MessageFormat.format(
-									Messages.CommitTemplateManager_Error_while_processing_template_handler_contribution_X_from_plugin_X,
-									element.getAttribute(ATTR_CLASS), element.getContributor().getName());
-							StatusHandler.log(new Status(IStatus.ERROR, FocusedTeamUiPlugin.ID_PLUGIN, msg, e));
-						}
-					}
-				}
-			}
-
-			return null;
-		}
-
-		protected Object processContribution(IConfigurationElement element) throws Exception {
-			String keyword = element.getAttribute(ATTR_RECOGNIZED_KEYWORD);
-			String description = element.getAttribute(ATTR_DESCRIPTION);
-			String className = element.getAttribute(ATTR_CLASS);
-			return processContribution(element, keyword, description, className);
-		}
-
-		protected Object processContribution(IConfigurationElement element, String keyword, String description,
-				String className) throws Exception {
-			return null;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateVariables.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateVariables.java
deleted file mode 100644
index de649dc..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateVariables.java
+++ /dev/null
@@ -1,331 +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:
- *     Eike Stepper - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui.templates;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskMapping;
-import org.eclipse.mylyn.tasks.core.data.TaskData;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-import org.eclipse.mylyn.team.ui.AbstractCommitTemplateVariable;
-
-/**
- * @author Eike Stepper
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class CommitTemplateVariables {
-
-	private static String implode(List<String> list, String separator) {
-		if (list == null) {
-			return null;
-		}
-		StringBuilder builder = new StringBuilder();
-		for (String cc : list) {
-			if (builder.length() != 0) {
-				builder.append(separator);
-			}
-
-			builder.append(cc);
-		}
-
-		return builder.toString();
-	}
-
-	public static class ConnectorTaskPrefix extends AbstractCommitTemplateVariable {
-
-		@Override
-		public String getValue(ITask task) {
-			if (task != null) {
-				AbstractRepositoryConnector connector = TasksUi.getRepositoryManager().getRepositoryConnector(
-						task.getConnectorKind());
-				if (connector != null) {
-					return connector.getTaskIdPrefix();
-				}
-			}
-			return null;
-		}
-
-	}
-
-	public static class RepositoryKind extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			if (task != null) {
-				return task.getConnectorKind();
-			}
-			return null;
-		}
-	}
-
-	public static class RepositoryUrl extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			if (task != null) {
-				return task.getRepositoryUrl();
-			}
-
-			return null;
-		}
-	}
-
-	public static class TaskProduct extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			ITaskMapping taskMapping = getTaskMapping(task);
-			if (taskMapping != null) {
-				return taskMapping.getProduct();
-			}
-			return null;
-		}
-	}
-
-	public static class TaskAssignee extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			ITaskMapping taskMapping = getTaskMapping(task);
-			if (taskMapping != null) {
-				return taskMapping.getOwner();
-			}
-			return null;
-		}
-	}
-
-	public static class TaskReporter extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			ITaskMapping taskMapping = getTaskMapping(task);
-			if (taskMapping != null) {
-				return taskMapping.getReporter();
-			}
-			return null;
-		}
-	}
-
-	public static class TaskResolution extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			ITaskMapping taskMapping = getTaskMapping(task);
-			if (taskMapping != null) {
-				return taskMapping.getResolution();
-			}
-			return null;
-		}
-	}
-
-	public static class TaskStatus extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			ITaskMapping taskMapping = getTaskMapping(task);
-			if (taskMapping != null) {
-				String status = taskMapping.getTaskStatus();
-				if (status != null) {
-					return status.toUpperCase(Locale.ENGLISH);
-				}
-			}
-			if (task != null) {
-				if (task.isCompleted()) {
-					return Messages.CommitTemplateVariables_Complete;
-				} else {
-					return Messages.CommitTemplateVariables_Incomplete;
-				}
-			}
-			return null;
-		}
-	}
-
-	public static class TaskCc extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			ITaskMapping taskMapping = getTaskMapping(task);
-			if (taskMapping != null) {
-				List<String> list = taskMapping.getCc();
-				return implode(list, ", "); //$NON-NLS-1$
-			}
-			return null;
-		}
-	}
-
-	public static class TaskKeywords extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			ITaskMapping taskMapping = getTaskMapping(task);
-			if (taskMapping != null) {
-				List<String> list = getTaskMapping(task).getKeywords();
-				return implode(list, ", "); //$NON-NLS-1$
-			}
-			return null;
-		}
-	}
-
-	public static class TaskLastModified extends CommitTemplateDate {
-		@Override
-		protected Date getDate(ITask task) {
-			ITaskMapping taskMapping = getTaskMapping(task);
-			if (taskMapping != null) {
-				return taskMapping.getModificationDate();
-			}
-			return null;
-		}
-	}
-
-	public static class TaskSummary extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			ITaskMapping taskMapping = getTaskMapping(task);
-			if (taskMapping != null) {
-				return getTaskMapping(task).getSummary();
-			}
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	public static class TaskDescription extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			if (task != null) {
-				return task.getSummary();
-			}
-			return ""; //$NON-NLS-1$
-		}
-	}
-
-	public static class TaskId extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			if (task != null) {
-				return task.getTaskId();
-			} else {
-				return null;
-			}
-		}
-	}
-
-	public static class TaskKey extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			if (task != null) {
-				return task.getTaskKey();
-			} else {
-				return null;
-			}
-		}
-	}
-
-	public static class TaskNotes extends AbstractCommitTemplateVariable {
-		@SuppressWarnings("restriction")
-		@Override
-		public String getValue(ITask task) {
-			if (task instanceof AbstractTask) {
-				return ((AbstractTask) task).getNotes();
-			} else {
-				return ""; //$NON-NLS-1$
-			}
-		}
-	}
-
-	public static class TaskPriority extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			return task.getPriority();
-		}
-	}
-
-	public static class TaskType extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			return task.getTaskKind();
-		}
-	}
-
-	public static class TaskURL extends AbstractCommitTemplateVariable {
-		@Override
-		public String getValue(ITask task) {
-			return task.getUrl();
-		}
-	}
-
-	public static ITaskMapping getTaskMapping(ITask task) {
-		if (task != null) {
-			TaskData taskData;
-			try {
-				taskData = TasksUi.getTaskDataManager().getTaskData(task);
-				if (taskData != null) {
-					AbstractRepositoryConnector connector = TasksUi.getRepositoryManager().getRepositoryConnector(
-							task.getConnectorKind());
-					return connector.getTaskMapping(taskData);
-				}
-			} catch (CoreException e) {
-				// ignore
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @author Eike Stepper
-	 */
-	public static class TaskCompletion extends CommitTemplateDate {
-		@Override
-		protected Date getDate(ITask task) {
-			return task.getCompletionDate();
-		}
-	}
-
-	/**
-	 * @author Eike Stepper
-	 */
-	public static class TaskCreation extends CommitTemplateDate {
-		@Override
-		protected Date getDate(ITask task) {
-			return task.getCreationDate();
-		}
-	}
-
-	/**
-	 * @author Eike Stepper
-	 */
-	public static class TaskReminder extends CommitTemplateDate {
-		@Override
-		protected Date getDate(ITask task) {
-//			 TODO: Hide this field?
-			return ((AbstractTask) task).getScheduledForDate().getStartDate().getTime();
-		}
-	}
-
-	/**
-	 * @author Eike Stepper
-	 */
-	private static abstract class CommitTemplateDate extends AbstractCommitTemplateVariable {
-
-		@Override
-		public String getValue(ITask task) {
-			java.util.Date date = getDate(task);
-			return (date != null) ? formatDate(date) : null;
-		}
-
-		protected String formatDate(java.util.Date date) {
-			return date.toString();
-		}
-
-		protected abstract java.util.Date getDate(ITask task);
-
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/Messages.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/Messages.java
deleted file mode 100644
index 499edb2..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/Messages.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
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui.templates;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.team.ui.templates.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 CommitTemplateManager_Error_while_processing_template_handler_contribution_X_from_plugin_X;
-
-	public static String CommitTemplateVariables_Complete;
-
-	public static String CommitTemplateVariables_Incomplete;
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/TemplateHandlerContentProposalProvider.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/TemplateHandlerContentProposalProvider.java
deleted file mode 100644
index 202c3c7..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/TemplateHandlerContentProposalProvider.java
+++ /dev/null
@@ -1,130 +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:
- *     Eike Stepper - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.team.ui.templates;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.fieldassist.IContentProposal;
-import org.eclipse.jface.fieldassist.IContentProposalProvider;
-import org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin;
-
-/**
- * @author Eike Stepper
- */
-public class TemplateHandlerContentProposalProvider implements IContentProposalProvider {
-	public IContentProposal[] getProposals(String contents, int position) {
-		ProposalComputer proposalComputer = new ProposalComputer(contents, position);
-		return proposalComputer.computeProposals();
-	}
-
-	/**
-	 * @author Eike Stepper
-	 */
-	protected static class ProposalComputer {
-		private final String contents;
-
-		private final int position;
-
-		private final List<IContentProposal> result = new ArrayList<IContentProposal>();
-
-		private String[] keywords;
-
-		private String prefix;
-
-		public ProposalComputer(String contents, int position) {
-			this.contents = contents;
-			this.position = position;
-			initKeywords();
-			initPrefix();
-		}
-
-		public IContentProposal[] computeProposals() {
-			for (String keyword : keywords) {
-				String proposal = getMatch(keyword);
-				if (proposal != null) {
-					addProposal(proposal, keyword);
-				}
-			}
-
-			return result.toArray(new IContentProposal[result.size()]);
-		}
-
-		private void initKeywords() {
-			keywords = FocusedTeamUiPlugin.getDefault().getCommitTemplateManager().getRecognizedKeywords();
-		}
-
-		private void initPrefix() {
-			prefix = ""; //$NON-NLS-1$
-			String beforePosition = contents.substring(0, position);
-			if (beforePosition.endsWith("$")) { //$NON-NLS-1$
-				prefix = "$"; //$NON-NLS-1$
-			} else {
-				int start = beforePosition.lastIndexOf("${"); //$NON-NLS-1$
-				if (start >= 0) {
-					int end = contents.indexOf('}', start);
-					if (end >= position) {
-						prefix = contents.substring(start, position);
-					}
-				}
-			}
-		}
-
-		private String getMatch(String keyword) {
-			String wholeProposal = "${" + keyword + "}"; //$NON-NLS-1$ //$NON-NLS-2$
-			if (wholeProposal.startsWith(prefix)) {
-				return wholeProposal.substring(prefix.length());
-			}
-
-			return null;
-		}
-
-		private void addProposal(String proposal, String keyword) {
-			String description = FocusedTeamUiPlugin.getDefault().getCommitTemplateManager().getHandlerDescription(
-					keyword);
-			result.add(new Proposal(proposal, keyword, description));
-		}
-
-		/**
-		 * @author Eike Stepper
-		 */
-		private static final class Proposal implements IContentProposal {
-			private final String proposal;
-
-			private final String keyword;
-
-			private final String description;
-
-			private Proposal(String proposal, String keyword, String description) {
-				this.proposal = proposal;
-				this.keyword = keyword;
-				this.description = description;
-			}
-
-			public String getContent() {
-				return proposal;
-			}
-
-			public int getCursorPosition() {
-				return proposal.length();
-			}
-
-			public String getDescription() {
-				return description;
-			}
-
-			public String getLabel() {
-				return "${" + keyword + "}"; //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/messages.properties b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/messages.properties
deleted file mode 100644
index 878e608..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-CommitTemplateManager_Error_while_processing_template_handler_contribution_X_from_plugin_X=Error while processing template handler contribution {0} from plugin {1}.
-CommitTemplateVariables_Complete=Complete
-CommitTemplateVariables_Incomplete=Incomplete
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractActiveChangeSetProvider.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractActiveChangeSetProvider.java
deleted file mode 100644
index f80e1b4..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractActiveChangeSetProvider.java
+++ /dev/null
@@ -1,56 +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:
- *     Gunnar Wagenkecht - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.team.ui;
-
-import org.eclipse.mylyn.internal.team.ui.ContextChangeSet;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager;
-
-/**
- * Integrates an Eclipse Team repository with Mylyn.
- * 
- * @author Gunnar Wagenknecht
- * @author Mik Kersten
- * @since 2.0
- */
-public abstract class AbstractActiveChangeSetProvider {
-
-	/**
-	 * Return the change set collector that manages the active change set for the participant associated with this
-	 * capability. A <code>null</code> is returned if active change sets are not supported. The default is to return
-	 * <code>null</code>. This method must be overridden by subclasses that support active change sets.
-	 * 
-	 * Note that {@link ActiveChangeSetManager} is an internal class of <code>org.eclipse.team.core</code>, but is
-	 * required for change set support (bug 116084). The current implementation will only work if a subtype of
-	 * {@link ActiveChangeSetManager} is returned. In the future, if a change set API becomes available, an additional
-	 * extensibility mechanism will be provided.
-	 * 
-	 * @return the change set collector that manages the active change set for the participant associated with this
-	 *         capability or <code>null</code> if active change sets are not supported.
-	 * @since 3.0
-	 */
-	public ActiveChangeSetManager getActiveChangeSetManager() {
-		return null;
-	}
-
-	/**
-	 * Override if a custom change set class is needed, e.g. in order to support custom action and model mappings as is
-	 * the case with the CVS change set implementation used by org.eclipse.mylyn.team.cvs.
-	 * 
-	 * @since 3.0
-	 */
-	public IContextChangeSet createChangeSet(ITask task) {
-		return new ContextChangeSet(task, getActiveChangeSetManager());
-	}
-
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractCommitTemplateVariable.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractCommitTemplateVariable.java
deleted file mode 100644
index c89a3f8..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractCommitTemplateVariable.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Eike Stepper - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.team.ui;
-
-import org.eclipse.mylyn.tasks.core.ITask;
-
-/**
- * @author Eike Stepper
- * @author Mik Kersten
- * @since 2.0
- */
-public abstract class AbstractCommitTemplateVariable {
-
-	protected String description;
-
-	protected String recognizedKeyword;
-
-	public String getDescription() {
-		return description != null ? description : "Handler for '" + recognizedKeyword + "'"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getRecognizedKeyword() {
-		return recognizedKeyword;
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public abstract String getValue(ITask task);
-
-	public void setRecognizedKeyword(String recognizedKeyword) {
-		if (recognizedKeyword == null) {
-			throw new IllegalArgumentException("Keyword to recognize must not be null"); //$NON-NLS-1$
-		}
-
-		this.recognizedKeyword = recognizedKeyword;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractContextChangeSetManager.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractContextChangeSetManager.java
deleted file mode 100644
index 5ad825c..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractContextChangeSetManager.java
+++ /dev/null
@@ -1,87 +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.team.ui;
-
-import java.util.Set;
-
-import org.eclipse.mylyn.context.core.AbstractContextListener;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.tasks.core.ITaskListChangeListener;
-import org.eclipse.mylyn.internal.tasks.core.TaskContainerDelta;
-import org.eclipse.mylyn.internal.tasks.ui.editors.TaskListChangeAdapter;
-import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
-import org.eclipse.mylyn.tasks.core.ITask;
-
-/**
- * Manages changes sets along with task context and activation.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-@SuppressWarnings("restriction")
-public abstract class AbstractContextChangeSetManager extends AbstractContextListener {
-
-	protected boolean isEnabled = false;
-
-	private boolean isInitialized = false;
-
-	@SuppressWarnings("deprecation")
-	public void enable() {
-		if (!isEnabled) {
-			isEnabled = true;
-			TasksUiInternal.getTaskList().addChangeListener(WORKING_SET_LABEL_UPDATE_LISTENER);
-			if (!isInitialized) {
-				initContextChangeSets(); // otherwise listener will do it
-			}
-
-			if (ContextCore.getContextManager().isContextActive()) {
-				// TODO m4.0 remove call to deprecated method that is needed maintain backwards compatibility
-				contextActivated(ContextCore.getContextManager().getActiveContext());
-			}
-			ContextCore.getContextManager().addListener(this);
-		}
-	}
-
-	public void disable() {
-		ContextCore.getContextManager().removeListener(this);
-		TasksUiInternal.getTaskList().removeChangeListener(WORKING_SET_LABEL_UPDATE_LISTENER);
-		isEnabled = false;
-	}
-
-	protected abstract void initContextChangeSets();
-
-	/**
-	 * @since 3.0
-	 */
-	protected abstract void updateChangeSetLabel(ITask task);
-
-	private final ITaskListChangeListener WORKING_SET_LABEL_UPDATE_LISTENER = new TaskListChangeAdapter() {
-
-		@Override
-		public void containersChanged(Set<TaskContainerDelta> containers) {
-			for (TaskContainerDelta taskContainerDelta : containers) {
-				if (taskContainerDelta.getKind() == TaskContainerDelta.Kind.ROOT && !isInitialized) {
-					initContextChangeSets();
-					isInitialized = true;
-				}
-				if (taskContainerDelta.getElement() instanceof ITask) {
-					ITask task = (ITask) taskContainerDelta.getElement();
-					switch (taskContainerDelta.getKind()) {
-					case CONTENT:
-						updateChangeSetLabel(task);
-						break;
-					}
-				}
-			}
-		}
-	};
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractTaskReference.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractTaskReference.java
deleted file mode 100644
index c5e577d..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/AbstractTaskReference.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Eugene Kuleshov and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Eugene Kuleshov - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.team.ui;
-
-/**
- * @author Eugene Kuleshov
- * @author Mik Kersten
- * @since 3.0
- */
-public abstract class AbstractTaskReference {
-
-	public abstract String getTaskId();
-
-	public abstract String getTaskUrl();
-
-	public abstract String getRepositoryUrl();
-
-	public abstract String getText();
-
-}
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/IContextChangeSet.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/IContextChangeSet.java
deleted file mode 100644
index 8bb6f4a..0000000
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/team/ui/IContextChangeSet.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.team.ui;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.mylyn.tasks.core.ITask;
-
-/**
- * Mixin interface used for custom change set support.
- * 
- * @author Mik Kersten
- * @since 3.0
- */
-public interface IContextChangeSet {
-
-	public abstract ITask getTask();
-
-	public abstract void updateLabel();
-
-	public abstract void restoreResources(IResource[] resources) throws CoreException;
-
-	public abstract String getComment(boolean checkTaskRepository);
-
-}