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_op