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

Sprout from master 2007-06-20 19:13:19 UTC relves 'NEW - bug 192309: fix synchronization of Trac web tasks'
Delete:
    org.eclipse.mylyn.examples.monitor.study/.classpath
    org.eclipse.mylyn.examples.monitor.study/.cvsignore
    org.eclipse.mylyn.examples.monitor.study/.project
    org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.mylar.tasklist.prefs
    org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.examples.monitor.study/META-INF/MANIFEST.MF
    org.eclipse.mylyn.examples.monitor.study/build.properties
    org.eclipse.mylyn.examples.monitor.study/doc/study-ethics.html
    org.eclipse.mylyn.examples.monitor.study/doc/study-info.html
    org.eclipse.mylyn.examples.monitor.study/doc/study-signup.html
    org.eclipse.mylyn.examples.monitor.study/icons/eview16/wizard-feedback.gif
    org.eclipse.mylyn.examples.monitor.study/plugin.xml
    org.eclipse.mylyn.examples.monitor.study/scripts/getUID.cgi
    org.eclipse.mylyn.examples.monitor.study/scripts/questionnaire.cgi
    org.eclipse.mylyn.examples.monitor.study/scripts/upload.cgi
    org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/FeedbackWizard.java
    org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/MylarUserStudyExamplePlugin.java
    org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/QuestionnaireWizardPage.java
    org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SelectionMonitor.java
    org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SubmitFeedbackPage.java
    org.eclipse.mylyn.monitor.reports/.classpath
    org.eclipse.mylyn.monitor.reports/.cvsignore
    org.eclipse.mylyn.monitor.reports/.project
    org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.mylar.tasklist.prefs
    org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.monitor.reports/META-INF/MANIFEST.MF
    org.eclipse.mylyn.monitor.reports/about.html
    org.eclipse.mylyn.monitor.reports/build-user.xml
    org.eclipse.mylyn.monitor.reports/build.properties
    org.eclipse.mylyn.monitor.reports/icons/eview16/folder.gif
    org.eclipse.mylyn.monitor.reports/icons/eview16/monitor.gif
    org.eclipse.mylyn.monitor.reports/plugin.xml
    org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/MonitorReportsPlugin.java
    org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/AbstractMylarUsageCollector.java
    org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageAnalysisCollector.java
    org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageDetector.java
    org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiViewUsageCollector.java
    org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/preferences/UiUsageReportsPreferencePage.java
    org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/EclipseUsageSummaryAction.java
    org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/FocusedUiUserAnalysisAction.java
    org.eclipse.mylyn.sandbox.dev-feature/.project
    org.eclipse.mylyn.sandbox.dev-feature/.settings/org.eclipse.mylar.tasklist.prefs
    org.eclipse.mylyn.sandbox.dev-feature/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.sandbox.dev-feature/about.html
    org.eclipse.mylyn.sandbox.dev-feature/build.properties
    org.eclipse.mylyn.sandbox.dev-feature/epl-v10.html
    org.eclipse.mylyn.sandbox.dev-feature/feature.xml
    org.eclipse.mylyn.sandbox.dev-feature/license.html
    org.eclipse.mylyn.sandbox.dev/.classpath
    org.eclipse.mylyn.sandbox.dev/.cvsignore
    org.eclipse.mylyn.sandbox.dev/.project
    org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.mylar.tasklist.prefs
    org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.sandbox.dev/META-INF/MANIFEST.MF
    org.eclipse.mylyn.sandbox.dev/about.html
    org.eclipse.mylyn.sandbox.dev/build.properties
    org.eclipse.mylyn.sandbox.dev/plugin.xml
    org.eclipse.mylyn.sandbox.dev/src/org/eclipse/mylyn/internal/sandbox/dev/InterestDebuggingDecorator.java
    org.eclipse.mylyn.sandbox.dev/src/org/eclipse/mylyn/internal/sandbox/dev/IntrospectObjectAction.java
    org.eclipse.mylyn.sandbox.tests/.classpath
    org.eclipse.mylyn.sandbox.tests/.cvsignore
    org.eclipse.mylyn.sandbox.tests/.project
    org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.mylar.tasklist.prefs
    org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.sandbox.tests/META-INF/MANIFEST.MF
    org.eclipse.mylyn.sandbox.tests/build.properties
    org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/AllSandboxTests.java
    org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/BugzillaActiveSearchTest.java
    org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/SharedTaskFolderTest.java
    org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/StatisticsReportingTest.java
diff --git a/org.eclipse.mylyn.examples.monitor.study/.classpath b/org.eclipse.mylyn.examples.monitor.study/.classpath
deleted file mode 100644
index 5db8238..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.examples.monitor.study/.cvsignore b/org.eclipse.mylyn.examples.monitor.study/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.examples.monitor.study/.project b/org.eclipse.mylyn.examples.monitor.study/.project
deleted file mode 100644
index 6995b81..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.examples.monitor.study</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4f6160a..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,315 +0,0 @@
-#Wed Jun 06 17:09:48 EDT 2007
-eclipse.preferences.version=1
-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=disabled
-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.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.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-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.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-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.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-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=false
-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_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.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
\ No newline at end of file
diff --git a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 69628fe..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Feb 05 18:45:15 PST 2007
-eclipse.preferences.version=1
-formatter_profile=_Mylar based on Eclipse [built-in]
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><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\="true" 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 *\r\n * ${tags}\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\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</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\="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 - 2006 Mylar committers 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\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\="true" 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\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method 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.jdt.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.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></templates>
diff --git a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index f157fc4..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:31:04 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.mylar.tasklist.prefs
deleted file mode 100644
index 3fc4813..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.mylar.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 20 16:44:58 PDT 2006
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 13b3718..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:13:43 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 8f16aca..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Tue Feb 07 16:04:38 PST 2006
-compilers.p.build=2
-compilers.p.deprecated=2
-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-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.examples.monitor.study/META-INF/MANIFEST.MF b/org.eclipse.mylyn.examples.monitor.study/META-INF/MANIFEST.MF
deleted file mode 100644
index 6289e6f..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn User Study Example
-Bundle-SymbolicName: org.eclipse.mylyn.monitor.study;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.mylyn.examples.monitor.study.MylarUserStudyExamplePlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.mylyn.context.core,
- org.eclipse.core.resources,
- org.eclipse.jdt.ui,
- org.eclipse.pde.ui,
- org.eclipse.ui.editors,
- org.eclipse.jdt.core,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.mylyn.monitor.usage,
- org.eclipse.mylyn.monitor.ui,
- org.eclipse.mylyn.monitor.core,
- org.eclipse.mylyn,
- org.eclipse.mylyn.web.core
-Eclipse-AutoStart: true
-Bundle-ClassPath: mylar-study.jar
-Export-Package: org.eclipse.mylyn.examples.monitor.study
-Bundle-Vendor: Eclipse.org
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.examples.monitor.study/build.properties b/org.eclipse.mylyn.examples.monitor.study/build.properties
deleted file mode 100644
index 02bac7c..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = META-INF/,\
-               doc/,\
-               lib/,\
-               plugin.xml,\
-               icons/,\
-               mylar-study.jar
-src.includes = doc/,\
-               lib/,\
-               plugin.xml,\
-               icons/,\
-               src/
-jars.compile.order = mylar-study.jar
-source.mylar-study.jar = src/
diff --git a/org.eclipse.mylyn.examples.monitor.study/doc/study-ethics.html b/org.eclipse.mylyn.examples.monitor.study/doc/study-ethics.html
deleted file mode 100644
index 0efa935..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/doc/study-ethics.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<HTML>
-
-<head>
-<style>
-<!--
-	H4 {
-		font:15px/16px Verdana, Arial, Helvetica, sans-serif; 
-		color:black; 
-		font-weight:bold; 
-		margin-left: 10px;
-		line-height:140%;
-	}
--->
-</style>
-</head>
-
-<BODY>
-
-<P>
-<font size="2">Thank you for downloading the preview release of Mylar.  As you work Mylar will monitor your interaction
-with Eclipse (by logging IDs of: views, editors, commands, and preference changes along with their values).
-The log also stores information about the program elements that you edit and navigate, but removes identifying
-information about those elements by obfuscating their names and paths.  Approximately once every week you will
-be asked to confirm an upload of this interaction log to a UBC server.  Before uploading you will have a chance to 
-review the information being sent, and to answer a short questionnaire.  You will have the option to remain 
-anonymous throughout the study.</font></P>
-
-<P>	
-<font color="#999999" size="2">Details: The UBC Study title is Using Interaction History to Determine Interesting Information in a Development 
-Environment. There are no known risks associated with this study. After the study, this interaction history 
-will be stripped of all information identifying non-anonymous subjects, and we will use this data to determine 
-what Mylar views are useful, and to determine whether Mylar makes it easier to work on large systems in Eclipse. 
-We also plan on making this anonymous usage data available to other researchers interested in improving the 
-IDE user experience. Please note that the data collected will be archived for future use. This data will be 
-anonymous and not contain any identification information. This study is being conducted by Mik Kersten 
-(beatmik@cs.ubc.ca) as a part of his PhD Thesis and supervised by Dr. Gail Murphy (murphy@cs.ubc.ca). If you 
-have any questions about the data being collected or about the study in general please email us or call Mik 
-Kersten at 604-822-0193.  If you have any concerns about your treatment or rights as a research subject, you 
-may contact  Research Subject Information Line in the UBC Office of Research Services at the University of 
-British Columbia, at 604-822-8598.  If this questionnaire is completed it will be assumed that consent has 
-been given.  This study is being funded by the IBM Centre for Advanced Studies and by NSERC.
-</font>
-</P>
-
-</BODY>
-</HEAD>
diff --git a/org.eclipse.mylyn.examples.monitor.study/doc/study-info.html b/org.eclipse.mylyn.examples.monitor.study/doc/study-info.html
deleted file mode 100644
index feb1654..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/doc/study-info.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<HTML>
-
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="STYLESHEET" href="book.css" charset="ISO-8859-1"
-	type="text/css">
-<title>Mylar Documentation</title>
-</head>
-
-<BODY>
-
-<table border="0" cellpadding="0" style="border-collapse: collapse" width="100%" id="table1">
-	<tr>
-		<td>
-		<p class="paragraph"><img border="0" src="images/logo-ubc.gif"></td>
-		<td>
-		<p align="right" class="smallParagraph">UBC Department of Computer 
-		Science<br>
-		201-2366 Main Mall, Vancouver, B.C., V6T 1Z4<br>
-		<a href="http://www.cs.ubc.ca" style="color: #4756AC">
-		http://www.cs.ubc.ca</a> <br>
-		Tel: (604) 822-3061 Fax: (604) 822-5485</td>
-	</tr>
-</table>
-<h4 align="center">Using Interaction History to Determine Interesting 
-Information <br>
-in a Development Environment </h4>
-<P>
-Thank you for downloading the preview release of Mylar. As you work Mylar will 
-monitor your interaction with Eclipse (by logging IDs of: views, editors, 
-commands, and preference changes along with their values). The log also stores 
-information about the program elements that you edit and navigate, but removes 
-identifying information about those elements by obfuscating their names and 
-paths. Approximately once every week you will be asked to confirm an upload of 
-this interaction log to a UBC server. Before uploading you will have a chance to 
-review the information being sent, and to answer a short questionnaire. You will 
-have the option to remain anonymous throughout the study.</P>
-
-<P>	
-<font color="#999999">Details: The UBC Study title is Using Interaction History 
-to Determine Interesting Information in a Development Environment. There are no 
-known risks associated with this study. After the study, this interaction 
-history will be stripped of all information identifying non-anonymous subjects, 
-and we will use this data to determine what Mylar views are useful, and to 
-determine whether Mylar makes it easier to work on large systems in Eclipse. We 
-also plan on making this anonymous usage data available to other researchers 
-interested in improving the IDE user experience. Please note that the data 
-collected will be archived for future use. This data will be anonymous and not 
-contain any identification information. This study is being conducted by Mik 
-Kersten (beatmik@cs.ubc.ca) as a part of his PhD Thesis and supervised by Dr. 
-Gail Murphy (murphy@cs.ubc.ca). If you have any questions about the data being 
-collected or about the study in general please email us or call Mik Kersten at 
-604-822-0193. If you have any concerns about your treatment or rights as a 
-research subject, you may contact Research Subject Information Line in the UBC 
-Office of Research Services at the University of British Columbia, at 
-604-822-8598. If this questionnaire is completed it will be assumed that consent 
-has been given. This study is being funded by the IBM Centre for Advanced 
-Studies and by NSERC.
-</font>
-</P>
-
-</BODY>
-</HEAD>
diff --git a/org.eclipse.mylyn.examples.monitor.study/doc/study-signup.html b/org.eclipse.mylyn.examples.monitor.study/doc/study-signup.html
deleted file mode 100644
index 3fc943b..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/doc/study-signup.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Mylar</title>
-<!--<link rel="stylesheet" href="http://eclipse.org/proposals/eclipse-webtools/templates/eclipse/eclipse.css">
--->
-<STYLE TYPE="text/css">
-<!--
- 
-.indextop { font-size: x-large;; font-family: Verdana, Arial, Helvetica, sans-serif; font-weight: bold}
-.indexsub { font-size: xx-small;; font-family: Verdana, Arial, Helvetica, sans-serif; color: #8080FF}
- 
-	/*
-	BODY {margin-top: 15px; margin-left: 15px; margin-right: 15px;}
-	*/
-
-	A:link {
-		color:#4756AC;
-	}
-	A:visited {
-		color:#60657B;
-	}
-	A:hover {
-		color:red
-	}
-	
-	INPUT {font:12px "Courier New", sans-serif;}
-	
-	H2 {
-		font:18px/18px Verdana, Arial, Helvetica, sans-serif; 
-		color:black; 
-		font-weight:bold; 
-		margin-left: 10px;
-		line-height:110%; 
-	}
-	H3 {
-		font:17px/17px Verdana, Arial, Helvetica, sans-serif; 
-		color:black; 
-		//font-weight:bold; 
-		margin-left: 10px;
-		line-height:110%; 
-	}
-	H4 {
-		font:15px/16px Verdana, Arial, Helvetica, sans-serif; 
-		color:black; 
-		font-weight:bold; 
-		margin-left: 10px;
-		line-height:140%;
-	}
-	P {
-		font:13px/13px Verdana, Arial, Helvetica, sans-serif; 
-		margin-right: 10px;
-		margin-left: 10px;
-		line-height:130%; 
-	}
-	.paragraph {
-		font:13px/13px Verdana, Arial, Helvetica, sans-serif; 
-		margin-right: 10px;
-		margin-left: 10px;
-		line-height:130%; 
-	}
-	.smallParagraph {
-		font:11px/11px Verdana, Arial, Helvetica, sans-serif; 
-		margin-right: 10px;
-		margin-left: 10px;
-		line-height:130%; 
-	}
-	LI {
-		font:13px/13px Verdana, Arial, Helvetica, sans-serif;
-		text-align:justify; 
-		margin-right: 10px;
-		margin-left: 15px;
-		line-height:120%; 
-	}
-	/*
-	UL {
-		font:13px/13px Verdana, Arial, Helvetica, sans-serif;
-		text-align:justify; 
-		margin-right: 10px;
-		margin-left: 15px;
-		line-height:120%; 
-	}*/
-	
-	DL {
-		font:13px/13px Verdana, Arial, Helvetica, sans-serif;
-		text-align:justify; 
-		margin-right: 10px;
-		margin-left: 15px;
-		line-height:120%; 
-	}
-	B { font:13px/13px Verdana, Arial, Helvetica, sans-serif; 
-		font-weight:bold; 
-		line-height:140%;
-	}
-	.footer {
-		font:10px/10px Verdana, Arial, Helvetica, sans-serif;  
-		color:#888888; 
-		text-align:left
-	}
-	.figureTitle {
-		font:13px/13px Verdana, Arial, Helvetica, sans-serif; 
-		text-align:justify; 
-		text-align:center
-	}
-	.copyrightNotice {
-		font:10px/10px Verdana, Arial, Helvetica, sans-serif; 
-		color:#999999; 
-		line-height:110%;
-	}
-	.smallHeading {
-		font:13px/13px Verdana, Arial, Helvetica, sans-serif; 
-		font-weight:bold;
-		line-height:110%;
-	}
-	.tinyHeading {
-		font:11px/11px Verdana, Arial, Helvetica, sans-serif; 
-		font-weight:bold;
-		line-height:120%;
-	}
-	.newsText {
-		font:11px/11px Verdana, Arial, Helvetica, sans-serif; 
-		line-height:130%;
-	}
-	.smallParagraph {
-		font:11px/11px Verdana, Arial, Helvetica, sans-serif; 
-		line-height:130%;
-	}
-	.fancyHeading {
-		font:20px/20px Chantilly, Arial, Helvetica, sans-serif; 
-		margin-right: 10px;
-		color:#6f7a92;
-		margin-left: 10px;
-		line-height:130%;
-	}
- 
-		h2.title_with_border {
-			background:#D4D4D4;
-			border-top:1px solid #A3A3A3;
-			border-bottom:1px solid #A3A3A3;
-			border-left:1px solid #A3A3A3;
-			border-right:1px solid #A3A3A3;
-
-			}
--->
-</STYLE>
-
-</head>
-<body>
-
-<p align="left"><b><i><span style="background-color: #CCCCFF">consent form</span></i></b></p>
-<hr>
-
-<table border="0" cellpadding="0" style="border-collapse: collapse" width="100%" id="table1">
-	<tr>
-		<td>
-		<p class="paragraph"><img border="0" src="ubc.gif"> Page 1 of 1</td>
-		<td>
-		<p align="right" class="smallParagraph">UBC Department of Computer 
-		Science<br>
-		201-2366 Main Mall, Vancouver, B.C., V6T 1Z4<br>
-		<a href="http://www.cs.ubc.ca">http://www.cs.ubc.ca</a> <br>
-		Tel: (604) 822-3061 Fax: (604) 822-5485</td>
-	</tr>
-</table>
-<h4 align="center">Using Interaction History to Determine Interesting 
-Information <br>
-in a Development Environment </h4>
-<p align="left">Thank you for downloading the preview release of Mylar.&nbsp; As 
-you work Mylar will monitor your interaction with Eclipse (by logging IDs 
-of: views, editors, commands, and preference changes 
-along with their values). &nbsp;The log also stores information about the program 
-elements that you edit and navigate, but removes identifying information about 
-those elements by obfuscating their names and paths.&nbsp; Approximately once every week you will be asked to confirm an 
-upload of this interaction log to a UBC server.&nbsp; Before uploading you will have 
-a chance to review the information being sent, and to answer a short 
-questionnaire.&nbsp; You will have the option to remain anonymous throughout the study.&nbsp; </p>
-<p>The UBC Study title is: Using Interaction History to Determine Interesting 
-Information in a Development Environment. There are no known risks associated 
-with this study. After the study, this interaction history will be stripped of 
-all information identifying non-anonymous subjects, and we will use this data to 
-determine what Mylar views are useful, and to determine whether Mylar makes it 
-easier to work on large systems in Eclipse. We also plan on making this 
-anonymous usage data available to other researchers interested in improving the 
-IDE user experience. Please note that the data collected will be archived for 
-future use. This data will be anonymous and not contain any identification 
-information. This study is being conducted by Mik Kersten (beatmik@cs.ubc.ca) as 
-a part of his PhD Thesis and supervised by Dr. Gail Murphy (murphy@cs.ubc.ca). 
-If you have any questions about the data being collected or about the study in 
-general please email us or call Mik Kersten at 604-822-0193.&nbsp; If you have 
-any concerns about your treatment or rights as a research subject, you may 
-contact&nbsp; Research Subject Information Line in the UBC Office of Research 
-Services at the University of British Columbia, at 604-822-8598.&nbsp; If this 
-questionnaire is completed it will be assumed that consent has been given.&nbsp; 
-This study is being funded by the IBM Centre for Advanced Studies and by NSERC.</p>
-<p>By clicking &quot;I Agree&quot; below you acknowledge that you have received this 
-consent form, and are consenting to participate in the study.&nbsp; To 
-participate please fill in your name, email address, and date.&nbsp; Incomplete 
-submissions will be discarded.&nbsp; Note that your name and email address will not be 
-associated with the study ID that you are given, should you wish to remain 
-anonymous.</p>
-<form method="POST" action="--WEBBOT-SELF--">
-	<!--webbot bot="SaveResults" U-File="fpweb:///_private/form_results.csv" S-Format="TEXT/CSV" S-Label-Fields="TRUE" -->
-	<p>Your name:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <input type="text" name="T1" size="20"></p>
-	<p>Email address:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <input type="text" name="T2" size="20"></p>
-	<p>Job function:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
-	<input type="text" name="T4" size="20"> <br>
-	<span style="background-color: #CCCCFF">[choices: Application Developer, 
-	QA/Testing, Program Director, CIO/CTO, VP Development Systems Integrator, 
-	Application Architect, Project Manager, Student, Faculty, Business Analyst, 
-	Database Administrator, Other]</span></p>
-	<p>Company size:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
-	<input type="text" name="T5" size="20"><br>
-	<span style="background-color: #CCCCFF">[choices: Individual, &lt;50, 50-100, 
-	100-500, 500-1000, 1000-2500, &gt;2500]</span></p>
-	<p>Company business:&nbsp;&nbsp; <input type="text" name="T6" size="20"><br>
-	<span style="background-color: #CCCCFF">[choices: Financial 
-	service/insurance, Energy, Government, Hardware Manufacturer, Networking, 
-	Pharmaceutical/Medical, Automotive, Software Manufacturer, Communications, 
-	Transportation, Retail, Utilities, Other Manufacturing, Academic/Education]</span></p>
-	<p>Today's date:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <input type="text" name="T3" size="20"></p>
-	<p><input type="submit" value="I Agree" name="B1"> </p>
-</form>
-<hr>
-<p><i>Version: May 16, 2005</i></p>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.examples.monitor.study/icons/eview16/wizard-feedback.gif b/org.eclipse.mylyn.examples.monitor.study/icons/eview16/wizard-feedback.gif
deleted file mode 100644
index ef565b3..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/icons/eview16/wizard-feedback.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.examples.monitor.study/plugin.xml b/org.eclipse.mylyn.examples.monitor.study/plugin.xml
deleted file mode 100644
index 37d9348..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/plugin.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    <extension
-         name="Mylyn User Study Example Plug-in"
-         point="org.eclipse.ui.startup">
-    </extension>
-
-   <extension
-         point="org.eclipse.mylyn.monitor.usage.study">
-         <scripts
-         	url="http://my.server"
-         	upload="upload.cgi"
-         	userId="getUID.cgi"
-         	questionnaire="questionnaire.cgi"/>
-         <ui
-         	title="Mylyn User Study Example"
-         	daysBetweenUpload="6"
-         	questionnairePage="org.eclipse.mylyn.examples.monitor.study.QuestionnaireWizardPage"
-         	consentForm="doc/study-ethics.html"/>
-   </extension>
-   
-   <extension point="org.eclipse.ui.newWizards">
-      <wizard
-            category="org.eclipse.mylyn.wizards"
-            class="org.eclipse.mylyn.examples.monitor.study.FeedbackWizard"
-            icon="icons/eview16/wizard-feedback.gif"
-            id="org.eclipse.mylyn.monitor.ui.ui.wizards.FeedbackWizard"
-            name="Feedback Submission">
-      </wizard>
-   </extension>
-   
-   <extension point="org.eclipse.ui.newWizards">
-      <wizard
-            category="org.eclipse.mylyn.wizards"
-            class="org.eclipse.mylyn.internal.monitor.usage.wizards.UsageSubmissionWizard"
-            icon="icons/eview16/wizard-feedback.gif"
-            id="org.eclipse.mylyn.monitor.ui.ui.uploadStatistics.StatisticsUploadWizard"
-            name="Usage Feedback">
-      </wizard>
-   </extension>
-   
-</plugin> 
diff --git a/org.eclipse.mylyn.examples.monitor.study/scripts/getUID.cgi b/org.eclipse.mylyn.examples.monitor.study/scripts/getUID.cgi
deleted file mode 100644
index b70a409..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/scripts/getUID.cgi
+++ /dev/null
@@ -1,526 +0,0 @@
-#!/usr/bin/perl -wT

-

-use Fcntl ':flock';

-

-# START USER EDITS

-

-# absolute path to folder files will be uploaded to.

-# WINDOWS users, your path would like something like : images\\uploads

-# UNIX    users, your path would like something like : /home/www/images/uploads

-# do not end the path with any slashes and if you're on a UNIX serv, make sure

-# you CHMOD each folder in the path to 777

-

-$lockfileName = ".lock";

-$logFile = "/.../uploadLog.txt";

-$uidMapFile = "/.../mylarUidMap.txt";

-$nextUidFile = "/.../mylarNextUid.txt";

-$allConsentedUsers = "/.../mylarUsers.txt";

-

-# if you would like to be notified of uploads, enter your email address

-# between the SINGLE quotes. leave this blank if you would not like to be notified

-#$notify = '';

-

-# UNIX users, if you entered a value for $notify, you must also enter your

-# server's sendmail path. It usually looks something like : /usr/sbin/sendmail

-#$send_mail_path = "";

-

-# WINDOWS users, if you entered a value for $notify, you must also enter your

-# server's SMTP path. It usually looks something like : mail.servername.com

-#$smtp_path = "";

-

-

-####################################################################

-#    END USER EDITS

-####################################################################

-

-$OS = $^O; # operating system name

-if($OS =~ /darwin/i) { $isUNIX = 1; }

-elsif($OS =~ /win/i) { $isWIN = 1; }

-else {$isUNIX = 1;}

-	

-if($isWIN){ $S{S} = "\\\\"; }

-else { $S{S} = "/";} # seperator used in paths

-

-use CGI; # load the CGI.pm module

-my $GET = new CGI; # create a new object

-my @VAL = $GET->param; #get all form field names

-

-my($query_string) = "";

-$query_string = $ENV{'QUERY_STRING'};

-

-my($firstName);

-my($lastName);

-my($email_address);

-my($job_function);

-my($company_size);

-my($company_buisness);

-my($anonymousStr);

-my($uid) = -1;

-my($anonymous) = 0;

-my($first);

-my($second);

-my($third);

-my($fourth);

-my($fifth);

-my($sixth);

-my($seventh);

-	

-if($query_string =~ m/^(.+)\&(.+)\&(.+)\&(.+)\&(.+)\&(.+)\&(.+)$/)

-{

-	$first = $1;

-	$second = $2;

-	$third = $3;

-	$fourth = $4;

-	$fifth = $5;

-	$sixth = $6;

-	$seventh = $7;

-}

-else

-{

-	# error, query string is wrong

-	print "Content-type: text/plain", "\n";

-	print "Status: 501 Not Implemented", "\n\n";

-	exit;

-}

-

-if($first =~ m/^firstName\=(.+)$/){

-	$firstName = $1;

-}

-elsif($second =~ m/^firstName\=(.+)$/){

-	$firstName = $1;

-}

-elsif ($third =~ m/^firstName\=(.+)$/){

-	$firstName = $1;

-}

-elsif ($fourth =~ m/^firstName\=(.+)$/){

-	$firstName = $1;

-}

-elsif ($fifth =~ m/^firstName\=(.+)$/){

-	$firstName = $1;

-}

-elsif ($sixth =~ m/^firstName\=(.+)$/){

-	$firstName = $1;

-}

-elsif ($seventh =~ m/^firstName\=(.+)$/){

-	$firstName = $1;

-}

-

-if($first =~ m/^lastName\=(.+)$/){

-	$lastName = $1;

-}

-elsif($second =~ m/^lastName\=(.+)$/){

-	$lastName = $1;

-}

-elsif ($third =~ m/^lastName\=(.+)$/){

-	$lastName = $1;

-}

-elsif ($fourth =~ m/^lastName\=(.+)$/){

-	$lastName = $1;

-}

-elsif ($fifth =~ m/^lastName\=(.+)$/){

-	$lastName = $1;

-}

-elsif ($sixth =~ m/^lastName\=(.+)$/){

-	$lastName = $1;

-}

-elsif ($seventh =~ m/^lastName\=(.+)$/){

-	$lastName = $1;

-}

-

-if($first =~ m/^email\=(.+)$/){

-	$email_address = $1;

-}

-elsif($second =~ m/^email\=(.+)$/){

-	$email_address = $1;

-}

-elsif ($third =~ m/^email\=(.+)$/){

-	$email_address = $1;

-}

-elsif ($fourth =~ m/^email\=(.+)$/){

-	$email_address= $1;

-}

-elsif ($fifth =~ m/^email\=(.+)$/){

-	$email_address= $1;

-}

-elsif ($sixth =~ m/^email\=(.+)$/){

-	$email_address = $1;

-}

-elsif ($seventh =~ m/^email\=(.+)$/){

-	$email_address= $1;

-}

-

-if($first =~ m/^jobFunction\=(.+)$/){

-	$job_function = $1;

-}

-elsif($second =~ m/^jobFunction\=(.+)$/){

-	$job_function = $1;

-}

-elsif ($third =~ m/^jobFunction\=(.+)$/){

-	$job_function = $1;

-}

-elsif ($fourth =~ m/^jobFunction\=(.+)$/){

-	$job_function= $1;

-}

-elsif ($fifth =~ m/^jobFunction\=(.+)$/){

-	$job_function = $1;

-}

-elsif ($sixth =~ m/^jobFunction\=(.+)$/){

-	$job_function = $1;

-}

-elsif ($seventh =~ m/^jobFunction\=(.+)$/){

-	$job_function = $1;

-}

-

-if($first =~ m/^companySize\=(.+)$/){

-	$company_size = $1;

-}

-elsif($second =~ m/^companySize\=(.+)$/){

-	$company_size = $1;

-}

-elsif ($third =~ m/^companySize\=(.+)$/){

-	$company_size = $1;

-}

-elsif ($fourth =~ m/^companySize\=(.+)$/){

-	$company_size = $1;

-}

-elsif ($fifth =~ m/^companySize\=(.+)$/){

-	$company_size = $1;

-}

-elsif ($sixth =~ m/^companySize\=(.+)$/){

-	$company_size = $1;

-}

-elsif ($seventh =~ m/^companySize\=(.+)$/){

-	$company_size = $1;

-}

-

-if($first =~ m/^companyBuisness\=(.+)$/){

-	$company_buisness = $1;

-}

-elsif($second =~ m/^companyBuisness\=(.+)$/){

-	$company_buisness = $1;

-}

-elsif ($third =~ m/^companyBuisness\=(.+)$/){

-	$company_buisness = $1;

-}

-elsif ($fourth =~ m/^companyBuisness\=(.+)$/){

-	$company_buisness = $1;

-}

-elsif ($fifth =~ m/^companyBuisness\=(.+)$/){

-	$company_buisness = $1;

-}

-elsif ($sixth =~ m/^companyBuisness\=(.+)$/){

-	$company_buisness = $1;

-}

-elsif ($seventh =~ m/^companyBuisness\=(.+)$/){

-	$company_buisness = $1;

-}

-

-

-if($first =~ m/^anonymous\=(.+)$/){

-	$anonymousStr = $1;

-}

-elsif($second =~ m/^anonymous\=(.+)$/){

-	$anonymousStr = $1;

-}

-elsif ($third =~ m/^anonymous\=(.+)$/){

-	$anonymousStr = $1;

-}

-elsif ($fourth =~ m/^anonymous\=(.+)$/){

-	$anonymousStr = $1;

-}

-elsif ($fifth =~ m/^anonymous\=(.+)$/){

-	$anonymousStr = $1;

-}

-elsif ($sixth =~ m/^anonymous\=(.+)$/){

-	$anonymousStr = $1;

-}

-elsif ($seventh =~ m/^anonymous\=(.+)$/){

-	$anonymousStr = $1;

-}

-

-if ($anonymousStr =~ "true") {

-	$anonymous = 1;

-}

-

-open(USERS, "+<$allConsentedUsers ") || die "Can't open Log File: $!\n"; 

-seek USERS, 0, 2;

-print USERS "$firstName\t$lastName\t$email_address\t$job_function\t$company_size\t$company_buisness\n";

-close USERS;

-

-if($anonymous != 1){

-	# give them the same id as before

-	my($old) = &checkExistance($firstName, $lastName, $email_address);

-	if($old == -1){

-		$uid = &getNewUID($firstName, $lastName, $email_address);

-	}

-	else{

-		$uid = $old;

-	}

-}

-else

-{

-	$uid = &getNewUID("anonymous", "anonymous", "anonymous");

-}

-

-if($uid != -1)

-{

-	print "Content-type: text/plain", "\n";

-	print "Status: 200 OK", "\n\n";

-	print "UID: $uid" . "\n";

-	exit;

-}

-else

-{

-	print "Content-type: text/plain", "\n";

-	print "Status: 501 Not Implemented", "\n\n";

-	print "COULD NOT GET UID" . "\n";

-	exit;

-}

-

-

-#################################################################### 

-

-#################################################################### 

-

-sub send_mail {

-	my ($from_email, $from_name, $to_email, $to_name, $subject, $message ) = @_;

-	

-	if(open(MAIL, "|$CONFIG{mailprogram} -t")) {

-		print MAIL "From: $from_email ($from_name)\n";

-		print MAIL "To: $to_email ($to_name)\n";

-		print MAIL "Subject: $subject\n";

-		print MAIL "$message\n\nSubmitter's IP Address : $ENV{REMOTE_ADDR}";

-		close MAIL;

-		return(1);

-	} else {

-		return;

-	}

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub send_mail_NT {

-	

-	my ($from_email, $from_name, $to_email, $to_name, $subject, $message ) = @_;

-	

-	my ($SMTP_SERVER, $WEB_SERVER, $status, $err_message);

-	use Socket; 

-    $SMTP_SERVER = "$CONFIG{smtppath}";                                 

-	

-	# correct format for "\n"

-    local($CRLF) = "\015\012";

-    local($SMTP_SERVER_PORT) = 25;

-    local($AF_INET) = ($] > 5 ? AF_INET : 2);

-    local($SOCK_STREAM) = ($] > 5 ? SOCK_STREAM : 1);

-#    local(@bad_addresses) = ();

-    $, = ', ';

-    $" = ', ';

-

-    $WEB_SERVER = "$CONFIG{smtppath}\n";

-    chop ($WEB_SERVER);

-

-    local($local_address) = (gethostbyname($WEB_SERVER))[4];

-    local($local_socket_address) = pack('S n a4 x8', $AF_INET, 0, $local_address);

-

-    local($server_address) = (gethostbyname($SMTP_SERVER))[4];

-    local($server_socket_address) = pack('S n a4 x8', $AF_INET, $SMTP_SERVER_PORT, $server_address);

-

-    # Translate protocol name to corresponding number

-    local($protocol) = (getprotobyname('tcp'))[2];

-

-    # Make the socket filehandle

-    if (!socket(SMTP, $AF_INET, $SOCK_STREAM, $protocol)) {

-        return;

-    }

-

-	# Give the socket an address

-	bind(SMTP, $local_socket_address);

-	

-	# Connect to the server

-	if (!(connect(SMTP, $server_socket_address))) {

-		return;

-	}

-	

-	# Set the socket to be line buffered

-	local($old_selected) = select(SMTP);

-	$| = 1;

-	select($old_selected);

-	

-	# Set regex to handle multiple line strings

-	$* = 1;

-

-    # Read first response from server (wait for .75 seconds first)

-    select(undef, undef, undef, .75);

-    sysread(SMTP, $_, 1024);

-	#print "<P>1:$_";

-

-    print SMTP "HELO $WEB_SERVER$CRLF";

-    sysread(SMTP, $_, 1024);

-	#print "<P>2:$_";

-

-	while (/(^|(\r?\n))[^0-9]*((\d\d\d).*)$/g) { $status = $4; $err_message = $3}

-	if ($status != 250) {

-		return;

-	}

-

-	print SMTP "MAIL FROM:<$from_email>$CRLF";

-

-	sysread(SMTP, $_, 1024);

-	#print "<P>3:$_";

-	if (!/[^0-9]*250/) {

-		return;

-	}

-

-    # Tell the server where we're sending to

-	print SMTP "RCPT TO:<$to_email>$CRLF";

-	sysread(SMTP, $_, 1024);

-	#print "<P>4:$_";

-	/[^0-9]*(\d\d\d)/;

-

-	# Give the server the message header

-	print SMTP "DATA$CRLF";

-	sysread(SMTP, $_, 1024);

-	#print "<P>5:$_";

-	if (!/[^0-9]*354/) {

-		return;

-	}

-

-	$message =~ s/\n/$CRLF/ig;

-	

-	print SMTP qq~From: $from_email ($from_name)$CRLF~;

-	print SMTP qq~To: $to_email ($to_name)$CRLF~;

-#	if($cc){

-#		print SMTP "CC: $cc ($cc_name)\n";

-#	}

-	print SMTP qq~Subject: $subject$CRLF$CRLF~;

-	print SMTP qq~$message~;

-

-	print SMTP "$CRLF.$CRLF";

-	sysread(SMTP, $_, 1024);

-	#print "<P>6:$_";

-	if (!/[^0-9]*250/) {

-		return;

-	} else {

-		return(1);

-	}

-

-	if (!shutdown(SMTP, 2)) {

-		return;

-    } 

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub check_email {

-	my($fe_email) = $_[0];

-	if($fe_email) {

-		if(($fe_email =~ /(@.*@)|(\.\.)|(@\.)|(\.@)|(^\.)|(\.$)/) ||

-		($fe_email !~ /^.+@\[?(\w|[-.])+\.[a-zA-Z]{2,3}|[0-9]{1,3}\]?$/)) {

-			return;

-		} else { return(1) }

-	} else {

-		return;

-	}

-}

-#################################################################### 

-

-#################################################################### 

-

-sub getNewUID {

-	my($firstName, $lastName, $email_address) = @_;

-

-	open(LOCKFILE, $lockfileName);

-    	flock(LOCKFILE, LOCK_EX);

-

-	open(NEXTUID, "<$nextUidFile") || die "Can't open Log File: $!\n"; 

-	my($uid) = -1;

-	my(@lines) = <NEXTUID>;

-	my($line) = "";

-	foreach $line (@lines)

-	{

-		if($line =~ m/^(\d+)$/)

-		{

-			$uid = $1;		   

-			last;

-		}

-	}		

-	close NEXTUID;

-

-	my($nextUid) = $uid + 17;

-	open(NEXTUID, ">$nextUidFile") || die "Can't open Log File: $!\n"; 

-	print NEXTUID $nextUid;		

-	close NEXTUID;

-	    	

-

-	open(UIDMAP, "+<$uidMapFile") || die "Can't open Log File: $!\n"; 	

-	seek UIDMAP, 0, 2;

-	print UIDMAP "$uid\t$firstName\t$lastName\t$email_address\n";	

-	close UIDMAP;

-

-	flock(LOCKFILE, LOCK_UN);

-	close LOCKFILE;

-	return $uid;

-

-}

-#################################################################### 

-

-#################################################################### 

-

-sub checkExistance {

-	my($firstName, $lastName, $email_address) = @_;

-	my($uid) = -1;

-

-	open(LOCKFILE, $lockfileName);

-    	flock(LOCKFILE, LOCK_EX);

-    	

-	open(UIDMAP, $uidMapFile) || die "Can't open Log File: $!\n"; 

-	my(@lines) = <UIDMAP>;

-	my($line) = "";

-	foreach $line (@lines)

-	{

-		if($line =~ m/^(\d+)\t$firstName\t$lastName\t$email_address$/)

-		{

-			$uid = $1;

-			last;

-		}

-	}

-	close UIDMAP;

-

-	flock(LOCKFILE, LOCK_UN);

-	close LOCKFILE;

-	return $uid;

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub log {

-	open(LOCKFILE, $lockfileName);

-	flock(LOCKFILE, LOCK_EX);

-    	

-	open(LOG, "+<$logFile") || die "Can't open Log File: $!\n"; 

-    

-	seek LOG, 0, 2;

-	print LOG $_[0] . "\t\t";	

-

-	my ($sec,$min,$hour,$mday,$mon,$year, $wday,$yday,$isdst) = localtime time;

-

-	# update the year so that it is correct since it perl

-	# has a 1900 yr offset	

-	$year += 1900;

-

-	# update the month since it is 0 based in perl	

-	$mon += 1;

-	

-	printf LOG "%02d/%02d/%04d %02d:%02d:%02d\n", $mday, $mon, $year, $hour, $min, $sec;

-	

-	close LOG;

-	

-	flock(LOCKFILE, LOCK_UN);

-    close LOCKFILE;

-}

diff --git a/org.eclipse.mylyn.examples.monitor.study/scripts/questionnaire.cgi b/org.eclipse.mylyn.examples.monitor.study/scripts/questionnaire.cgi
deleted file mode 100644
index a9d9c4c..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/scripts/questionnaire.cgi
+++ /dev/null
@@ -1,450 +0,0 @@
-#!/usr/bin/perl -w

-

-# START USER EDITS

-

-# absolute path to folder files will be uploaded to.

-# WINDOWS users, your path would like something like : images\\uploads

-# UNIX    users, your path would like something like : /home/www/images/uploads

-# do not end the path with any slashes and if you're on a UNIX serv, make sure

-# you CHMOD each folder in the path to 777

-

-$dir = "/.../upload";  

-$logFile =    "/.../questionnaireLog.txt";

-

-# if you would like to be notified of uploads, enter your email address

-# between the SINGLE quotes. leave this blank if you would not like to be notified

-$notify = '';

-

-# UNIX users, if you entered a value for $notify, you must also enter your

-# server's sendmail path. It usually looks something like : /usr/sbin/sendmail

-$send_mail_path = "";

-

-# WINDOWS users, if you entered a value for $notify, you must also enter your

-# server's SMTP path. It usually looks something like : mail.servername.com

-$smtp_path = "";

-

-# file types allowed, enter each type on a new line

-# Enter the word "ALL" in uppercase, to accept all file types.

-@types = qw~

-txt

-~;

-

-####################################################################

-#    END USER EDITS

-####################################################################

-

-$OS = $^O; # operating system name

-if($OS =~ /darwin/i) { $isUNIX = 1; }

-elsif($OS =~ /win/i) { $isWIN = 1; }

-else {$isUNIX = 1;}

-	

-if($isWIN){ $S{S} = "\\\\"; }

-else { $S{S} = "/";} # seperator used in paths

-

-unless (-d "$dir"){

-	mkdir ("$dir", 0777); # unless the dir exists, make it ( and chmod it on UNIX )

-	chmod(0777, "$dir");

-}

-

-

-unless (-d "$dir"){

-	# if there still is no dir, the path entered by the user is wrong and the upload will fail

-	# send back an error code

-	# unauthorized, uid not correct

-	exit;

-}

-

-use CGI; # load the CGI.pm module

-my $GET = new CGI; # create a new object

-my @VAL = $GET->param; #get all form field names

-

-foreach(@VAL){

-	$FORM{$_} = $GET->param($_); # put all fields and values in hash 

-}

-

-my @files;

-foreach(keys %FORM){

-    # check for the parameter name

-    # This must be MYLARa where is a a number

-    if($_ =~ /^MYLAR/){

-        push(@files, $_); # place the field NAME in an array

-    } else {

-	&log( "Filenamed not named MYLARa: ".$_);

-	exit;

-    }

-}

-

-

-if(!$VAL[0]){

-	# no file to upload so exit with an error

-	print "Content-type: text/plain", "\n";

-	print "Status: 501 Not Implemented", "\n\n";

-	print "Upload Failed - no file to upload","\n";

-	&log("Upload Failed - no file to upload\n");

-	exit;

-}

-

-

-my $failed; # results string = false

-my $selected; # num of files selected by user

-

-#################################################################### 

-

-#################################################################### 

-

-foreach (@files){

-	# upload each file, pass the form field NAME if it has a value

-	if($GET->param($_)){

-		# if the form field contains a file name &psjs_upload subroutine

-		# the file's name and path are passed to the subroutine 

-		$returned = &psjs_upload($_); 

-		if($returned =~ /^Success/i){

-			# if the $returned message begins with "Success" the upload was succssful

-			# remove the word "Success" and any spaces and we're left with the filename   

-			$returned =~ s/^Success\s+//;

-			push(@success, $returned);

-		} else {

-			# else if the word "success" is not returned, the message is the error encountered. 

-			# add the error to the $failed scalar

-			$failed .= $returned;

-		}

-		$selected++; # increment num of files selected for uploading by user

-	}

-}

-

-if(!$selected){

-	# no files were selected by user, so nothing is returned to either variable

-	$failed .= qq~No files were selected for uploading~;

-}

-

-# if no error message is return ed, the upload was successful

-

-my ($fNames, $aa, $bb, @current, @currentfiles );

-

-if($failed){

-

-	# file failed to upload return error

-	print "Content-type: text/plain", "\n";

-	print "Status: 501 Not Implemented", "\n\n";

-	print "Upload Failed","\n";

-	

-} else {

-	# upload was successful

-	# log the success and return success code

-	

-	# send email if valid email was entered

-	if(check_email($notify)){

-		

-		# TODO send an appropriate message

-		

-		# enter the message you would like to receive

-		my $message = qq~

-		The following files were uploaded to your server :

-		~; 

-		

-		foreach(@success){

-			$message .= qq~

-			$dir/$_	

-			~;

-		}

-		

-		if($isUNIX){

-			$CONFIG{mailprogram} = $send_mail_path;

-			# enter your e-mail name here if you like

-			# from e-mail, from name, to e-mail, to name, subject, body

-			&send_mail($notify, 'Demo Upload', $notify, 'Demo Upload', 'Upload Notification', $message);

-			

-		} else {

-			$CONFIG{smtppath} = $smtp_path;

-			&send_mail_NT($notify, 'Your Name', $notify, 'Your Name', 'Upload Notification', $message);

-		}

-	}

-	

-	# NEED TO LOG THE UPLOAD

-	foreach(@success){

-		&log("NONE" . "\t" . "$dir/$_");

-	}

-	

-	

-	print "Content-type: text/plain". "\n";

-	print "Status: 200 OK", "\n\n";

-	print "Upload Success","\n";

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub psjs_upload {

-

-	my $filename = $GET->param($_[0]); 

-	$filename =~ s/.*[\/\\](.*)/$1/; 

-	my $upload_filehandle = $GET->upload($_[0]); 

-	# if $file_type matchs one of the types specified, make the $type_ok var true

-	for($b = 0; $b < @types; $b++){

-		if($filename =~ /^.*\.$types[$b]$/i){

-			$type_ok++;

-		}

-		if($types[$b] eq "ALL"){

-			$type_ok++; # if ALL keyword is found, increment $type_ok var.

-		}

-	}

-	

-	# if ok, check if overwrite is allowed

-	if($type_ok){

-	    if(open UPLOADFILE, ">$dir/$filename"){

-

-	    	binmode UPLOADFILE; 

-

-	    	while ( <$upload_filehandle> ) 

-	    	{

-				print UPLOADFILE; 

-	    	} 

-   		    close UPLOADFILE; 

-	    }else {

-	    	return qq~Error opening file on the server~; 

-	    }

-	} else {

-		return qq~Bad file type~; 

-	}

-			

-	# check if file has actually been uploaded, by checking the file has a size

-	if(-s "$dir/$filename"){

-		return qq~Success $filename~; #success 

-	} else {

-		# delete the file as it has no content

-		# user probably entered an incorrect path to file

-		return qq~Upload failed : No data in $filename. No size on server's copy of file. 

-		Check the path entered.~; 

-	}

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub check_existence {

-	# $dir,$filename,$newnum are the args passed to this sub

-	my ($dir,$filename,$newnum) = @_;

-	

-	my (@file_type, $file_type, $exists, $bareName); 

-	# declare some vars we will use later on in this sub always use paranthesis 

-	# when declaring more than one var! Some novice programmers will tell you 

-	# this is not necessary. Tell them to learn how to program.

-	

-	if(!$newnum){$newnum = "0";} # new num is empty in first call, so set it to 0

-	

-	# read dir and put all files in an array (list)

-	opendir(DIR, "$dir");

-	@existing_files =  readdir(DIR);

-	closedir(DIR);

-	

-	# if the filename passed exists, set $exists to true or 1

-	foreach(@existing_files){

-		if($_ eq $filename){

-			$exists = 1;

-		}

-	}

-	

-	# if it exists, we need to rename the file being uploaded and then recheck it to 

-	# make sure the new name does not exist

-	if($exists){

-		$newnum++; # increment new number (add 1)

-

-		# get the extension

-		@file_type   = split(/\./, $filename); # split the dots and add inbetweens to a list

-		# put the first element in the $barename var

-		$bareName    = $file_type[0]; 

-		# we can assume everything after the last . found is the extension

-		$file_type   = $file_type[$#file_type]; 

-		# $#file_type is the last element (note the pound or hash is used)

-		

-		# remove all numbers from the end of the $bareName

-		$bareName =~ s/\d+$//ig;

-		

-		# concatenate a new name using the barename + newnum + extension 

-		$filename = $bareName . $newnum . '.' . $file_type;

-		

-		# reset $exists to 0 because the new file name is now being checked

-		$exists = 0;

-		

-		# recall this subroutine

-		&check_existence($dir,$filename,$newnum);

-	} else {

-		# the $filename, whether the first or one hundreth call, now does not exist

-		# so return the name to be used

-		return ($filename);

-	}

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub send_mail {

-	my ($from_email, $from_name, $to_email, $to_name, $subject, $message ) = @_;

-	

-	if(open(MAIL, "|$CONFIG{mailprogram} -t")) {

-		print MAIL "From: $from_email ($from_name)\n";

-		print MAIL "To: $to_email ($to_name)\n";

-		print MAIL "Subject: $subject\n";

-		print MAIL "$message\n\nSubmitter's IP Address : $ENV{REMOTE_ADDR}";

-		close MAIL;

-		return(1);

-	} else {

-		return;

-	}

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub send_mail_NT {

-	

-	my ($from_email, $from_name, $to_email, $to_name, $subject, $message ) = @_;

-	

-	my ($SMTP_SERVER, $WEB_SERVER, $status, $err_message);

-	use Socket; 

-    $SMTP_SERVER = "$CONFIG{smtppath}";                                 

-	

-	# correct format for "\n"

-    local($CRLF) = "\015\012";

-    local($SMTP_SERVER_PORT) = 25;

-    local($AF_INET) = ($] > 5 ? AF_INET : 2);

-    local($SOCK_STREAM) = ($] > 5 ? SOCK_STREAM : 1);

-#    local(@bad_addresses) = ();

-    $, = ', ';

-    $" = ', ';

-

-    $WEB_SERVER = "$CONFIG{smtppath}\n";

-    chop ($WEB_SERVER);

-

-    local($local_address) = (gethostbyname($WEB_SERVER))[4];

-    local($local_socket_address) = pack('S n a4 x8', $AF_INET, 0, $local_address);

-

-    local($server_address) = (gethostbyname($SMTP_SERVER))[4];

-    local($server_socket_address) = pack('S n a4 x8', $AF_INET, $SMTP_SERVER_PORT, $server_address);

-

-    # Translate protocol name to corresponding number

-    local($protocol) = (getprotobyname('tcp'))[2];

-

-    # Make the socket filehandle

-    if (!socket(SMTP, $AF_INET, $SOCK_STREAM, $protocol)) {

-        return;

-    }

-

-	# Give the socket an address

-	bind(SMTP, $local_socket_address);

-	

-	# Connect to the server

-	if (!(connect(SMTP, $server_socket_address))) {

-		return;

-	}

-	

-	# Set the socket to be line buffered

-	local($old_selected) = select(SMTP);

-	$| = 1;

-	select($old_selected);

-	

-	# Set regex to handle multiple line strings

-	$* = 1;

-

-    # Read first response from server (wait for .75 seconds first)

-    select(undef, undef, undef, .75);

-    sysread(SMTP, $_, 1024);

-	#print "<P>1:$_";

-

-    print SMTP "HELO $WEB_SERVER$CRLF";

-    sysread(SMTP, $_, 1024);

-	#print "<P>2:$_";

-

-	while (/(^|(\r?\n))[^0-9]*((\d\d\d).*)$/g) { $status = $4; $err_message = $3}

-	if ($status != 250) {

-		return;

-	}

-

-	print SMTP "MAIL FROM:<$from_email>$CRLF";

-

-	sysread(SMTP, $_, 1024);

-	#print "<P>3:$_";

-	if (!/[^0-9]*250/) {

-		return;

-	}

-

-    # Tell the server where we're sending to

-	print SMTP "RCPT TO:<$to_email>$CRLF";

-	sysread(SMTP, $_, 1024);

-	#print "<P>4:$_";

-	/[^0-9]*(\d\d\d)/;

-

-	# Give the server the message header

-	print SMTP "DATA$CRLF";

-	sysread(SMTP, $_, 1024);

-	#print "<P>5:$_";

-	if (!/[^0-9]*354/) {

-		return;

-	}

-

-	$message =~ s/\n/$CRLF/ig;

-	

-	print SMTP qq~From: $from_email ($from_name)$CRLF~;

-	print SMTP qq~To: $to_email ($to_name)$CRLF~;

-#	if($cc){

-#		print SMTP "CC: $cc ($cc_name)\n";

-#	}

-	print SMTP qq~Subject: $subject$CRLF$CRLF~;

-	print SMTP qq~$message~;

-

-	print SMTP "$CRLF.$CRLF";

-	sysread(SMTP, $_, 1024);

-	#print "<P>6:$_";

-	if (!/[^0-9]*250/) {

-		return;

-	} else {

-		return(1);

-	}

-

-	if (!shutdown(SMTP, 2)) {

-		return;

-    } 

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub check_email {

-	my($fe_email) = $_[0];

-	if($fe_email) {

-		if(($fe_email =~ /(@.*@)|(\.\.)|(@\.)|(\.@)|(^\.)|(\.$)/) ||

-		($fe_email !~ /^.+@\[?(\w|[-.])+\.[a-zA-Z]{2,3}|[0-9]{1,3}\]?$/)) {

-			return;

-		} else { return(1) }

-	} else {

-		return;

-	}

-    }

-#################################################################### 

-

-#################################################################### 

-

-sub log {

-	open(LOG, "+<$logFile") || die "Can't open Log File: $!\n"; 

-    

-	seek LOG, 0, 2;

-	print LOG $_[0] . "\t\t";	

-

-	my ($sec,$min,$hour,$mday,$mon,$year, $wday,$yday,$isdst) = localtime time;

-

-	# update the year so that it is correct since it perl

-	# has a 1900 yr offset	

-	$year += 1900;

-

-	# update the month since it is 0 based in perl	

-	$mon += 1;

-	

-	printf LOG "%02d/%02d/%04d %02d:%02d:%02d\n", $mday, $mon, $year, $hour, $min, $sec;

-	

-	close LOG;

-}

diff --git a/org.eclipse.mylyn.examples.monitor.study/scripts/upload.cgi b/org.eclipse.mylyn.examples.monitor.study/scripts/upload.cgi
deleted file mode 100644
index d74fc2d..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/scripts/upload.cgi
+++ /dev/null
@@ -1,502 +0,0 @@
-#!/usr/bin/perl -w

-

-use Fcntl ':flock';

-

-# START USER EDITS

-

-# absolute path to folder files will be uploaded to.

-# WINDOWS users, your path would like something like : images\\uploads

-# UNIX    users, your path would like something like : /home/www/images/uploads

-# do not end the path with any slashes and if you're on a UNIX serv, make sure

-# you CHMOD each folder in the path to 777

-

-$lockfileName = "/.../.lock";

-$logFile =    "/.../uploadLog.txt";

-$uidMapFile = "/.../mylarUidMap.txt";

-

-$dir = "/isd/se2/project/mylar/userStudy/upload";  

-

-# if you would like to be notified of uploads, enter your email address

-# between the SINGLE quotes. leave this blank if you would not like to be notified

-$notify = '';

-

-# UNIX users, if you entered a value for $notify, you must also enter your

-# server's sendmail path. It usually looks something like : /usr/sbin/sendmail

-$send_mail_path = "";

-

-# WINDOWS users, if you entered a value for $notify, you must also enter your

-# server's SMTP path. It usually looks something like : mail.servername.com

-$smtp_path = "";

-

-# file types allowed, enter each type on a new line

-# Enter the word "ALL" in uppercase, to accept all file types.

-@types = qw~

-zip

-txt

-~;

-

-####################################################################

-#    END USER EDITS

-####################################################################

-

-$OS = $^O; # operating system name

-if($OS =~ /darwin/i) { $isUNIX = 1; }

-elsif($OS =~ /win/i) { $isWIN = 1; }

-else {$isUNIX = 1;}

-	

-if($isWIN){ $S{S} = "\\\\"; }

-else { $S{S} = "/";} # seperator used in paths

-

-unless (-d "$dir"){

-	mkdir ("$dir", 0777); # unless the dir exists, make it ( and chmod it on UNIX )

-	chmod(0777, "$dir");

-}

-

-

-unless (-d "$dir"){

-	# if there still is no dir, the path entered by the user is wrong and the upload will fail

-	# send back an error code

-	# unauthorized, uid not correct

-	exit;

-}

-

-use CGI; # load the CGI.pm module

-my $GET = new CGI; # create a new object

-my @VAL = $GET->param; #get all form field names

-

-foreach(@VAL){

-	$FORM{$_} = $GET->param($_); # put all fields and values in hash 

-}

-

-my($uid) = "";

-

-my @files;

-foreach(keys %FORM){

-	# check for the parameter name

-	# This must be MYLARa where is a a number

-	if($_ =~ /^MYLAR(\d+)/){

-		$uid = $1;

-		if(&checkUID($uid) == 1)

-		{

-			push(@files, $_); # place the field NAME in an array

-		}

-		else

-		{

-			# unauthorized, uid not correct

-			print "Content-type: text/plain", "\n";

-			print "Status: 401 Unauthorized", "\n\n";

-			print "UID Incorrect","\n";

-			exit;

-		}

-	}

-}

-

-

-if(!$VAL[0]){

-	# no file to upload so exit with an error

-	print "Content-type: text/plain", "\n";

-	print "Status: 501 Not Implemented", "\n\n";

-	print "Upload Failed - no file to upload","\n";

-

-	exit;

-}

-

-

-my $failed; # results string = false

-my $selected; # num of files selected by user

-

-#################################################################### 

-

-#################################################################### 

-

-foreach (@files){

-	# upload each file, pass the form field NAME if it has a value

-	if($GET->param($_)){

-		# if the form field contains a file name &psjs_upload subroutine

-		# the file's name and path are passed to the subroutine 

-		$returned = &psjs_upload($_); 

-		if($returned =~ /^Success/i){

-			# if the $returned message begins with "Success" the upload was succssful

-			# remove the word "Success" and any spaces and we're left with the filename   

-			$returned =~ s/^Success\s+//;

-			push(@success, $returned);

-		} else {

-			# else if the word "success" is not returned, the message is the error encountered. 

-			# add the error to the $failed scalar

-			$failed .= $returned;

-		}

-		$selected++; # increment num of files selected for uploading by user

-	}

-}

-

-if(!$selected){

-	# no files were selected by user, so nothing is returned to either variable

-	$failed .= qq~No files were selected for uploading~;

-}

-

-# if no error message is return ed, the upload was successful

-

-my ($fNames, $aa, $bb, @current, @currentfiles );

-

-if($failed){

-

-	# file failed to upload return error

-	print "Content-type: text/plain", "\n";

-	print "Status: 501 Not Implemented", "\n\n";

-	print "Upload Failed","\n";

-	

-} else {

-	# upload was successful

-	# log the success and return success code

-	

-	# send email if valid email was entered

-	if(check_email($notify)){

-		

-		# TODO send an appropriate message

-		

-		# enter the message you would like to receive

-		my $message = qq~

-		The following files were uploaded to your server :

-		~; 

-		

-		foreach(@success){

-			$message .= qq~

-			$dir/$_	

-			~;

-		}

-		

-		if($isUNIX){

-			$CONFIG{mailprogram} = $send_mail_path;

-			# enter your e-mail name here if you like

-			# from e-mail, from name, to e-mail, to name, subject, body

-			&send_mail($notify, 'Demo Upload', $notify, 'Demo Upload', 'Upload Notification', $message);

-			

-		} else {

-			$CONFIG{smtppath} = $smtp_path;

-			&send_mail_NT($notify, 'Your Name', $notify, 'Your Name', 'Upload Notification', $message);

-		}

-	}

-	

-	# NEED TO LOG THE UPLOAD

-	foreach(@success){

-		&log($uid . "\t" . "$dir/$_");

-	}

-	

-	

-	print "Content-type: text/plain". "\n";

-	print "Status: 200 OK", "\n\n";

-	print "Upload Success","\n";

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub psjs_upload {

-

-	my $filename = $GET->param($_[0]); 

-	$filename =~ s/.*[\/\\](.*)/$1/; 

-	my $upload_filehandle = $GET->upload($_[0]); 

-	# if $file_type matchs one of the types specified, make the $type_ok var true

-	for($b = 0; $b < @types; $b++){

-		if($filename =~ /^.*\.$types[$b]$/i){

-			$type_ok++;

-		}

-		if($types[$b] eq "ALL"){

-			$type_ok++; # if ALL keyword is found, increment $type_ok var.

-		}

-	}

-	

-	# if ok, check if overwrite is allowed

-	if($type_ok){

-	    if(open UPLOADFILE, ">$dir/$filename"){

-

-	    	binmode UPLOADFILE; 

-

-	    	while ( <$upload_filehandle> ) 

-	    	{

-				print UPLOADFILE; 

-	    	} 

-   		    close UPLOADFILE; 

-	    }else {

-	    	return qq~Error opening file on the server~; 

-	    }

-	} else {

-		return qq~Bad file type~; 

-	}

-			

-	# check if file has actually been uploaded, by checking the file has a size

-	if(-s "$dir/$filename"){

-		return qq~Success $filename~; #success 

-	} else {

-		# delete the file as it has no content

-		# user probably entered an incorrect path to file

-		return qq~Upload failed : No data in $filename. No size on server's copy of file. 

-		Check the path entered.~; 

-	}

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub check_existence {

-	# $dir,$filename,$newnum are the args passed to this sub

-	my ($dir,$filename,$newnum) = @_;

-	

-	my (@file_type, $file_type, $exists, $bareName); 

-	# declare some vars we will use later on in this sub always use paranthesis 

-	# when declaring more than one var! Some novice programmers will tell you 

-	# this is not necessary. Tell them to learn how to program.

-	

-	if(!$newnum){$newnum = "0";} # new num is empty in first call, so set it to 0

-	

-	# read dir and put all files in an array (list)

-	opendir(DIR, "$dir");

-	@existing_files =  readdir(DIR);

-	closedir(DIR);

-	

-	# if the filename passed exists, set $exists to true or 1

-	foreach(@existing_files){

-		if($_ eq $filename){

-			$exists = 1;

-		}

-	}

-	

-	# if it exists, we need to rename the file being uploaded and then recheck it to 

-	# make sure the new name does not exist

-	if($exists){

-		$newnum++; # increment new number (add 1)

-

-		# get the extension

-		@file_type   = split(/\./, $filename); # split the dots and add inbetweens to a list

-		# put the first element in the $barename var

-		$bareName    = $file_type[0]; 

-		# we can assume everything after the last . found is the extension

-		$file_type   = $file_type[$#file_type]; 

-		# $#file_type is the last element (note the pound or hash is used)

-		

-		# remove all numbers from the end of the $bareName

-		$bareName =~ s/\d+$//ig;

-		

-		# concatenate a new name using the barename + newnum + extension 

-		$filename = $bareName . $newnum . '.' . $file_type;

-		

-		# reset $exists to 0 because the new file name is now being checked

-		$exists = 0;

-		

-		# recall this subroutine

-		&check_existence($dir,$filename,$newnum);

-	} else {

-		# the $filename, whether the first or one hundreth call, now does not exist

-		# so return the name to be used

-		return ($filename);

-	}

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub send_mail {

-	my ($from_email, $from_name, $to_email, $to_name, $subject, $message ) = @_;

-	

-	if(open(MAIL, "|$CONFIG{mailprogram} -t")) {

-		print MAIL "From: $from_email ($from_name)\n";

-		print MAIL "To: $to_email ($to_name)\n";

-		print MAIL "Subject: $subject\n";

-		print MAIL "$message\n\nSubmitter's IP Address : $ENV{REMOTE_ADDR}";

-		close MAIL;

-		return(1);

-	} else {

-		return;

-	}

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub send_mail_NT {

-	

-	my ($from_email, $from_name, $to_email, $to_name, $subject, $message ) = @_;

-	

-	my ($SMTP_SERVER, $WEB_SERVER, $status, $err_message);

-	use Socket; 

-    $SMTP_SERVER = "$CONFIG{smtppath}";                                 

-	

-	# correct format for "\n"

-    local($CRLF) = "\015\012";

-    local($SMTP_SERVER_PORT) = 25;

-    local($AF_INET) = ($] > 5 ? AF_INET : 2);

-    local($SOCK_STREAM) = ($] > 5 ? SOCK_STREAM : 1);

-#    local(@bad_addresses) = ();

-    $, = ', ';

-    $" = ', ';

-

-    $WEB_SERVER = "$CONFIG{smtppath}\n";

-    chop ($WEB_SERVER);

-

-    local($local_address) = (gethostbyname($WEB_SERVER))[4];

-    local($local_socket_address) = pack('S n a4 x8', $AF_INET, 0, $local_address);

-

-    local($server_address) = (gethostbyname($SMTP_SERVER))[4];

-    local($server_socket_address) = pack('S n a4 x8', $AF_INET, $SMTP_SERVER_PORT, $server_address);

-

-    # Translate protocol name to corresponding number

-    local($protocol) = (getprotobyname('tcp'))[2];

-

-    # Make the socket filehandle

-    if (!socket(SMTP, $AF_INET, $SOCK_STREAM, $protocol)) {

-        return;

-    }

-

-	# Give the socket an address

-	bind(SMTP, $local_socket_address);

-	

-	# Connect to the server

-	if (!(connect(SMTP, $server_socket_address))) {

-		return;

-	}

-	

-	# Set the socket to be line buffered

-	local($old_selected) = select(SMTP);

-	$| = 1;

-	select($old_selected);

-	

-	# Set regex to handle multiple line strings

-	$* = 1;

-

-    # Read first response from server (wait for .75 seconds first)

-    select(undef, undef, undef, .75);

-    sysread(SMTP, $_, 1024);

-	#print "<P>1:$_";

-

-    print SMTP "HELO $WEB_SERVER$CRLF";

-    sysread(SMTP, $_, 1024);

-	#print "<P>2:$_";

-

-	while (/(^|(\r?\n))[^0-9]*((\d\d\d).*)$/g) { $status = $4; $err_message = $3}

-	if ($status != 250) {

-		return;

-	}

-

-	print SMTP "MAIL FROM:<$from_email>$CRLF";

-

-	sysread(SMTP, $_, 1024);

-	#print "<P>3:$_";

-	if (!/[^0-9]*250/) {

-		return;

-	}

-

-    # Tell the server where we're sending to

-	print SMTP "RCPT TO:<$to_email>$CRLF";

-	sysread(SMTP, $_, 1024);

-	#print "<P>4:$_";

-	/[^0-9]*(\d\d\d)/;

-

-	# Give the server the message header

-	print SMTP "DATA$CRLF";

-	sysread(SMTP, $_, 1024);

-	#print "<P>5:$_";

-	if (!/[^0-9]*354/) {

-		return;

-	}

-

-	$message =~ s/\n/$CRLF/ig;

-	

-	print SMTP qq~From: $from_email ($from_name)$CRLF~;

-	print SMTP qq~To: $to_email ($to_name)$CRLF~;

-#	if($cc){

-#		print SMTP "CC: $cc ($cc_name)\n";

-#	}

-	print SMTP qq~Subject: $subject$CRLF$CRLF~;

-	print SMTP qq~$message~;

-

-	print SMTP "$CRLF.$CRLF";

-	sysread(SMTP, $_, 1024);

-	#print "<P>6:$_";

-	if (!/[^0-9]*250/) {

-		return;

-	} else {

-		return(1);

-	}

-

-	if (!shutdown(SMTP, 2)) {

-		return;

-    } 

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub check_email {

-	my($fe_email) = $_[0];

-	if($fe_email) {

-		if(($fe_email =~ /(@.*@)|(\.\.)|(@\.)|(\.@)|(^\.)|(\.$)/) ||

-		($fe_email !~ /^.+@\[?(\w|[-.])+\.[a-zA-Z]{2,3}|[0-9]{1,3}\]?$/)) {

-			return;

-		} else { return(1) }

-	} else {

-		return;

-	}

-}

-#################################################################### 

-

-#################################################################### 

-

-sub checkUID {

-	my($uid) = $_[0];

-

-	open(LOCKFILE, $lockfileName);

-    	flock(LOCKFILE, LOCK_EX);

-    	

-	open(UIDMAP, $uidMapFile) || die "Can't open Log File: $!\n"; 

-	my($found) = 0;

-	my(@lines) = <UIDMAP>;

-	my($line) = "";

-	foreach $line (@lines)

-	{

-		if($line =~ m/^$uid\t(.*)\t(.*)\t(.*)$/)

-		{

-			$found = 1;

-			last;

-		}

-	}

-	close UIDMAP;

-

-	flock(LOCKFILE, LOCK_UN);

-	close LOCKFILE;

-	return $found;

-}

-

-#################################################################### 

-

-#################################################################### 

-

-sub log {

-	open(LOCKFILE, $lockfileName);

-	flock(LOCKFILE, LOCK_EX);

-    	

-	open(LOG, "+<$logFile") || die "Can't open Log File: $!\n"; 

-    

-	seek LOG, 0, 2;

-	print LOG $_[0] . "\t\t";	

-

-	my ($sec,$min,$hour,$mday,$mon,$year, $wday,$yday,$isdst) = localtime time;

-

-	# update the year so that it is correct since it perl

-	# has a 1900 yr offset	

-	$year += 1900;

-

-	# update the month since it is 0 based in perl	

-	$mon += 1;

-	

-	printf LOG "%02d/%02d/%04d %02d:%02d:%02d\n", $mday, $mon, $year, $hour, $min, $sec;

-	

-	close LOG;

-	

-	flock(LOCKFILE, LOCK_UN);

-    close LOCKFILE;

-}

diff --git a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/FeedbackWizard.java b/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/FeedbackWizard.java
deleted file mode 100644
index a5423a6..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/FeedbackWizard.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2005 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.examples.monitor.study;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.net.NoRouteToHostException;
-import java.net.UnknownHostException;
-import java.util.Date;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.multipart.FilePart;
-import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
-import org.apache.commons.httpclient.methods.multipart.Part;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-import org.eclipse.mylyn.internal.monitor.usage.wizards.UsageSubmissionWizard;
-import org.eclipse.mylyn.monitor.core.DateUtil;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * A wizard for uploading the Mylar statistics to a website
- * 
- * @author Shawn Minto
- * @author Mik Kersten
- */
-public class FeedbackWizard extends Wizard implements INewWizard {
-
-	private SubmitFeedbackPage feedbackPage;
-
-	/**
-	 * Constructor for SampleNewWizard.
-	 */
-	public FeedbackWizard(UsageSubmissionWizard wizard) {
-		super();
-		setNeedsProgressMonitor(true);
-
-		feedbackPage = new SubmitFeedbackPage(wizard);
-	}
-
-	public FeedbackWizard() {
-		super();
-		setNeedsProgressMonitor(true);
-		super.setDefaultPageImageDescriptor(UiUsageMonitorPlugin.imageDescriptorFromPlugin(
-				UiUsageMonitorPlugin.PLUGIN_ID, "icons/wizban/banner-user.gif"));
-		super.setWindowTitle("Mylar Feedback");
-		feedbackPage = new SubmitFeedbackPage(null);
-	}
-
-	@Override
-	public boolean performFinish() {
-		File f = feedbackPage.createFeedbackFile();
-		if (f == null)
-			return true;
-		upload(f, feedbackPage.getStringUid());
-		if (f.exists()) {
-			f.delete();
-		}
-		return true;
-	}
-
-	private int status;
-
-	/**
-	 * Method to upload a file to a cgi script
-	 * 
-	 * @param f
-	 *            The file to upload
-	 */
-	private void upload(File f, String uid) {
-		String uploadScript;
-
-		// XXX: unimplemented
-		uploadScript = "<unimplemented>";
-		// uploadScript =
-		// MylarUsageMonitorPlugin.getDefault().getStudyParameters().getScriptsUrl()
-		// +
-		// MylarUsageMonitorPlugin.getDefault().getStudyParameters().getScriptsQuestionnaire();
-
-		if (f.length() == 0)
-			return;
-
-		try {
-			final PostMethod filePost = new PostMethod(uploadScript);
-
-			long time = new Date().getTime();
-
-			Part[] parts;
-			Part[] p = { new FilePart("MYLAR" + uid, UiUsageMonitorPlugin.UPLOAD_FILE_LABEL + "-"
-					+ UiUsageMonitorPlugin.VERSION + "-" + "feedback" + "-" + uid + "-"
-					+ DateUtil.getFormattedDateTime(time) + ".txt", f) };
-			parts = p;
-
-			filePost.setRequestEntity(new MultipartRequestEntity(parts, filePost.getParams()));
-
-			final HttpClient client = new HttpClient();
-			UiUsageMonitorPlugin.getDefault().configureProxy(client, uploadScript);
-
-			ProgressMonitorDialog pmd = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());
-			pmd.run(false, false, new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						status = client.executeMethod(filePost);
-						filePost.releaseConnection();
-
-					} catch (Exception e) {
-						// there was a problem with the file upload so throw up
-						// an error
-						// dialog to inform the user and log the exception
-						if (e instanceof NoRouteToHostException || e instanceof UnknownHostException) {
-							MessageDialog.openError(null, "Error Uploading",
-									"There was an error uploading the feedback" + ": \n"
-											+ "No network connection.  Please try again later");
-						} else {
-							MessageDialog.openError(null, "Error Uploading",
-									"There was an error uploading the feedback" + ": \n"
-											+ e.getClass().getCanonicalName());
-							StatusManager.log(e, "could not uplaod feedback");
-						}
-					}
-					monitor.worked(1);
-					monitor.done();
-				}
-			});
-
-			if (status == 401) {
-				// The uid was incorrect so inform the user
-				MessageDialog.openError(null, "Error Uploading", "There was an error uploading the feedback: \n"
-						+ "Your uid was incorrect: " + uid + "\n");
-			} else if (status == 407) {
-				MessageDialog
-						.openError(null, "Error Uploading",
-								"Could not upload because proxy server authentication failed.  Please check your proxy server settings.");
-			} else if (status != 200) {
-				// there was a problem with the file upload so throw up an error
-				// dialog to inform the user
-				MessageDialog.openError(null, "Error Uploading", "There was an error uploading the feedback: \n"
-						+ "HTTP Response Code " + status + "\n" + "Please try again later");
-			} else {
-				// the file was uploaded successfully
-			}
-
-		} catch (Exception e) {
-			// there was a problem with the file upload so throw up an error
-			// dialog to inform the user and log the exception
-			if (e instanceof NoRouteToHostException) {
-				MessageDialog.openError(null, "Error Uploading", "There was an error uploading the feedback: \n"
-						+ "No network connection.  Please try again later");
-			} else {
-				MessageDialog.openError(null, "Error Uploading", "There was an error uploading the feedback: \n"
-						+ e.getClass().getCanonicalName());
-				StatusManager.log(e, "error uploading");
-			}
-		} finally {
-			f.delete();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
-	 *      org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		// don't need to do any initialization
-	}
-
-	@Override
-	public void addPages() {
-		addPage(feedbackPage);
-	}
-}
diff --git a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/MylarUserStudyExamplePlugin.java b/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/MylarUserStudyExamplePlugin.java
deleted file mode 100644
index 233859e..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/MylarUserStudyExamplePlugin.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.eclipse.mylyn.examples.monitor.study;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-import org.eclipse.mylyn.monitor.ui.MonitorUiPlugin;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.ui.IStartup;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.editors.text.EditorsPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Mik Kersten
- */
-public class MylarUserStudyExamplePlugin extends AbstractUIPlugin implements IStartup {
-
-	private static MylarUserStudyExamplePlugin plugin;
-
-	private SelectionMonitor selectionMonitor;
-
-	public MylarUserStudyExamplePlugin() {
-		plugin = this;
-	}
-
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	public void earlyStartup() {
-		final IWorkbench workbench = PlatformUI.getWorkbench();
-		workbench.getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				selectionMonitor = new SelectionMonitor();
-				MonitorUiPlugin.getDefault().getSelectionMonitors().add(selectionMonitor);
-
-				UiUsageMonitorPlugin.getDefault().addMonitoredPreferences(
-						WorkbenchPlugin.getDefault().getPluginPreferences());
-				// MylarUsageMonitorPlugin.getDefault().addMonitoredPreferences(
-				// MylarUiPlugin.getDefault().getPluginPreferences());
-				UiUsageMonitorPlugin.getDefault().addMonitoredPreferences(
-						JavaPlugin.getDefault().getPluginPreferences());
-				UiUsageMonitorPlugin.getDefault().addMonitoredPreferences(
-						WorkbenchPlugin.getDefault().getPluginPreferences());
-				UiUsageMonitorPlugin.getDefault().addMonitoredPreferences(
-						EditorsPlugin.getDefault().getPluginPreferences());
-				UiUsageMonitorPlugin.getDefault().addMonitoredPreferences(
-						PDEPlugin.getDefault().getPluginPreferences());
-			}
-		});
-	}
-
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-
-		MonitorUiPlugin.getDefault().getSelectionMonitors().remove(selectionMonitor);
-		UiUsageMonitorPlugin.getDefault().removeMonitoredPreferences(
-				WorkbenchPlugin.getDefault().getPluginPreferences());
-		UiUsageMonitorPlugin.getDefault().removeMonitoredPreferences(
-				ContextCorePlugin.getDefault().getPluginPreferences());
-		UiUsageMonitorPlugin.getDefault().removeMonitoredPreferences(JavaPlugin.getDefault().getPluginPreferences());
-		UiUsageMonitorPlugin.getDefault().removeMonitoredPreferences(
-				WorkbenchPlugin.getDefault().getPluginPreferences());
-		UiUsageMonitorPlugin.getDefault().removeMonitoredPreferences(
-				EditorsPlugin.getDefault().getPluginPreferences());
-		UiUsageMonitorPlugin.getDefault().removeMonitoredPreferences(PDEPlugin.getDefault().getPluginPreferences());
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static MylarUserStudyExamplePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in
-	 * relative path.
-	 * 
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.mylyn.examples.monitor.study", path);
-	}
-}
diff --git a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/QuestionnaireWizardPage.java b/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/QuestionnaireWizardPage.java
deleted file mode 100644
index 0336cbb..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/QuestionnaireWizardPage.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2005 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.examples.monitor.study;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
-import org.eclipse.mylyn.monitor.usage.IQuestionnairePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A wizard for uploading the Mylar statistics to a website
- * 
- * @author Ken Sueda
- * @author Mik Kersten
- */
-public class QuestionnaireWizardPage extends WizardPage implements IQuestionnairePage {
-
-	private static final String NOT_GOOD = "Not Good";
-
-	private static final String GOOD = "Good";
-
-	private static final String NOT_WELL = "Not well";
-
-	private static final String OK = "OK";
-
-	private static final String WELL = "Well";
-
-	private static final String UNSURE = "Unsure";
-
-	private static final String SELECT = "";
-
-	private static final String EXPLORED = "Explored";
-
-	private static final String DOCUMENTED = "Documented";
-
-	private static final String TESTED = "Tested";
-
-	private static final String ADDED_NEW_FEATURES = "Added new features";
-
-	private static final String MADE_ENHANCEMENTS = "Made enhancements";
-
-	private static final String FIXED_BUGS = "Fixed bugs";
-
-	private Combo taskCombo;
-
-	private Combo mentalModelCombo;
-
-	private Combo integrateCombo;
-
-	private Combo doiCombo;
-
-	private String taskPerformedFeedback = null;
-
-	private String mentalModelFeedback = null;
-
-	private String doiModelFeedback = null;
-
-	private String integrateFeedback = null;
-
-	private String positiveFeedback = null;
-
-	private String negativeFeedback = null;
-
-	private Text positiveText = null;
-
-	private Text negativeText = null;
-
-	public QuestionnaireWizardPage() {
-		super("Questionnaire Wizard");
-		setTitle("Questionnaire");
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-		layout.numColumns = 1;
-		layout.verticalSpacing = 9;
-
-		// drop down box, choose from:
-		// fixed bugs, made enhancements, added new features, tested,
-		// documented, explored
-		Label label = new Label(container, SWT.NULL);
-		label.setText("What task did you primarily work on this week?");
-
-		taskCombo = new Combo(container, SWT.READ_ONLY);
-		taskCombo.setText(SELECT);
-		taskCombo.add(FIXED_BUGS);
-		taskCombo.add(MADE_ENHANCEMENTS);
-		taskCombo.add(ADDED_NEW_FEATURES);
-		taskCombo.add(TESTED);
-		taskCombo.add(DOCUMENTED);
-		taskCombo.add(EXPLORED);
-		taskCombo.add(UNSURE);
-
-		taskCombo.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				taskPerformedFeedback = taskCombo.getText();
-				getContainer().updateButtons();
-			}
-		});
-
-		// drop down box, choose from:
-		// well, ok, not well
-		label = new Label(container, SWT.NULL);
-		label.setText("How accurately did the Mylar model match your mental model of interesting elements?");
-		mentalModelCombo = new Combo(container, SWT.READ_ONLY);
-		mentalModelCombo.setText(SELECT);
-		mentalModelCombo.add(WELL);
-		mentalModelCombo.add(OK);
-		mentalModelCombo.add(NOT_WELL);
-		mentalModelCombo.add(UNSURE);
-
-		mentalModelCombo.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				mentalModelFeedback = mentalModelCombo.getText();
-				getContainer().updateButtons();
-			}
-		});
-
-		// drop down box
-		// chose from: good, ok, not good
-		label = new Label(container, SWT.NULL);
-		label.setText("How effective are the Mylar views at exposing what you are working on?");
-		doiCombo = new Combo(container, SWT.READ_ONLY);
-		doiCombo.setText(SELECT);
-		doiCombo.add(GOOD);
-		doiCombo.add(OK);
-		doiCombo.add(NOT_GOOD);
-		doiCombo.add(UNSURE);
-
-		doiCombo.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				doiModelFeedback = doiCombo.getText();
-				getContainer().updateButtons();
-			}
-		});
-
-		// drop down box
-		// chose from: well, ok, not well
-		label = new Label(container, SWT.NULL);
-		label.setText("How well did Mylar integrate with your workspace and environment?");
-		integrateCombo = new Combo(container, SWT.READ_ONLY);
-		integrateCombo.setText(SELECT);
-		integrateCombo.add(WELL);
-		integrateCombo.add(OK);
-		integrateCombo.add(NOT_WELL);
-		integrateCombo.add(UNSURE);
-
-		integrateCombo.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				integrateFeedback = integrateCombo.getText();
-				getContainer().updateButtons();
-			}
-		});
-
-		positiveText = createTextWithLabel(container, "What worked well?");
-		negativeText = createTextWithLabel(container, "What does not work well?");
-		setControl(container);
-	}
-
-	private Text createTextWithLabel(Composite parent, String label) {
-		GridData gd = new GridData();
-		gd.horizontalAlignment = GridData.FILL;
-		gd.verticalAlignment = GridData.FILL;
-		gd.verticalSpan = 10;
-		Label searchLabel = new Label(parent, SWT.NONE);
-		searchLabel.setText(label);
-		Text t = new Text(parent, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
-		t.setLayoutData(gd);
-		return t;
-	}
-
-	private void finishedSelected() {
-		if (this.taskPerformedFeedback == null) {
-			this.taskPerformedFeedback = FIXED_BUGS;
-		}
-		if (this.mentalModelFeedback == null) {
-			this.mentalModelFeedback = WELL;
-		}
-		if (this.doiModelFeedback == null) {
-			this.doiModelFeedback = GOOD;
-		}
-		if (this.integrateFeedback == null) {
-			this.integrateFeedback = WELL;
-		}
-		positiveFeedback = positiveText.getText();
-		if (this.positiveFeedback == null) {
-			positiveFeedback = "none";
-		}
-		negativeFeedback = negativeText.getText();
-		if (this.negativeFeedback == null) {
-			negativeFeedback = "none";
-		}
-	}
-
-	public File createFeedbackFile() {
-		finishedSelected();
-		IPath rootPath = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		String path = rootPath.toString() + File.separator + "questionnaire.txt";
-		File questionnaireFile = new File(path);
-
-		if (questionnaireFile.exists()) {
-			questionnaireFile.delete();
-		}
-
-		OutputStream outputStream;
-		try {
-			outputStream = new FileOutputStream(questionnaireFile);
-
-			String buffer = "Tasks: " + getTaskPerformedFeedback() + "\r\n";
-			outputStream.write(buffer.getBytes());
-			buffer = "MentalModel: " + getMentalModelFeedback() + "\r\n";
-			outputStream.write(buffer.getBytes());
-			buffer = "DOI: " + getDoiModelFeedback() + "\r\n";
-			outputStream.write(buffer.getBytes());
-			buffer = "Integrate: " + getIntegrateFeedback() + "\r\n";
-			outputStream.write(buffer.getBytes());
-			buffer = "Positive: " + getPositiveFeedback() + "\r\n";
-			outputStream.write(buffer.getBytes());
-			buffer = "Negative: " + getNegativeFeedback() + "\r\n";
-			outputStream.write(buffer.getBytes());
-			outputStream.close();
-			return questionnaireFile;
-		} catch (FileNotFoundException e) {
-			StatusManager.log(e, "failed to submit");
-		} catch (IOException e) {
-			StatusManager.log(e, "failed to submit");
-		}
-		return null;
-	}
-
-	/***************************************************************************
-	 * getters Methods
-	 **************************************************************************/
-	public String getDoiModelFeedback() {
-		return doiModelFeedback;
-	}
-
-	public String getIntegrateFeedback() {
-		return integrateFeedback;
-	}
-
-	public String getMentalModelFeedback() {
-		return mentalModelFeedback;
-	}
-
-	public String getNegativeFeedback() {
-		return negativeFeedback;
-	}
-
-	public String getPositiveFeedback() {
-		return positiveFeedback;
-	}
-
-	public String getTaskPerformedFeedback() {
-		return taskPerformedFeedback;
-	}
-
-	@Override
-	public boolean isPageComplete() {
-		if (taskCombo.getText().equals(SELECT) || doiCombo.getText().equals(SELECT)
-				|| mentalModelCombo.getText().equals(SELECT) || integrateCombo.getText().equals(SELECT)) {
-			// setErrorMessage("Must complete answers");
-			return false;
-		} else {
-			// setErrorMessage(null);
-			return true;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SelectionMonitor.java b/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SelectionMonitor.java
deleted file mode 100644
index f1c82a8..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SelectionMonitor.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 10, 2005
- */
-package org.eclipse.mylyn.examples.monitor.study;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.actions.SelectionConverter;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.ui.AbstractUserInteractionMonitor;
-import org.eclipse.mylyn.monitor.ui.MonitorUiPlugin;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.part.EditorPart;
-
-/**
- * Limited to Java selections.
- * 
- * @author Mik Kersten
- */
-public class SelectionMonitor extends AbstractUserInteractionMonitor {
-
-	private static final String STRUCTURE_KIND_JAVA = "java";
-
-	private static final String ID_JAVA_UNKNOWN = "(non-source element)";
-
-	public static final String SELECTION_DEFAULT = "selected";
-
-	public static final String SELECTION_NEW = "new";
-
-	public static final String SELECTION_DECAYED = "decayed";
-
-	public static final String SELECTION_PREDICTED = "predicted";
-
-	private static final Object ID_JAVA_UNKNOW_OLD = "(non-existing element)";
-
-	private IJavaElement lastSelectedElement = null;
-
-	// private InteractionEventObfuscator obfuscator = new InteractionEventObfuscator();
-
-	@Override
-	protected void handleWorkbenchPartSelection(IWorkbenchPart part, ISelection selection, boolean contributeToContext) {
-		// ignored, since not using context monitoring facilities
-	}
-
-	@Override
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		String structureKind = InteractionEvent.ID_UNKNOWN;
-		// String obfuscatedElementHandle = InteractionEvent.ID_UNKNOWN;
-		String elementHandle = InteractionEvent.ID_UNKNOWN;
-		InteractionEvent.Kind interactionKind = InteractionEvent.Kind.SELECTION;
-		if (selection instanceof StructuredSelection) {
-			StructuredSelection structuredSelection = (StructuredSelection) selection;
-			Object selectedObject = structuredSelection.getFirstElement();
-			if (selectedObject == null)
-				return;
-			if (selectedObject instanceof IJavaElement) {
-				IJavaElement javaElement = (IJavaElement) selectedObject;
-				structureKind = STRUCTURE_KIND_JAVA;
-				elementHandle = javaElement.getHandleIdentifier();
-				// obfuscatedElementHandle =
-				// obfuscateJavaElementHandle(javaElement);
-				lastSelectedElement = javaElement;
-			} else {
-				structureKind = InteractionEvent.ID_UNKNOWN + ": " + selectedObject.getClass();
-				if (selectedObject instanceof IAdaptable) {
-					IResource resource = (IResource) ((IAdaptable) selectedObject).getAdapter(IResource.class);
-					if (resource != null) {
-						elementHandle = getHandleIdentifier(resource.getFullPath());
-						// obfuscatedElementHandle =
-						// obfuscator.obfuscateResourcePath(resource.getProjectRelativePath());
-					}
-				}
-			}
-		} else {
-			if (selection instanceof TextSelection && part instanceof JavaEditor) {
-				TextSelection textSelection = (TextSelection) selection;
-				IJavaElement javaElement;
-				try {
-					javaElement = SelectionConverter.resolveEnclosingElement((JavaEditor) part, textSelection);
-					if (javaElement != null) {
-						structureKind = STRUCTURE_KIND_JAVA;
-						// obfuscatedElementHandle =
-						// obfuscateJavaElementHandle(javaElement);
-						elementHandle = javaElement.getHandleIdentifier();
-						if (javaElement != null && javaElement.equals(lastSelectedElement)) {
-							interactionKind = InteractionEvent.Kind.EDIT;
-						}
-						lastSelectedElement = javaElement;
-					}
-				} catch (JavaModelException e) {
-					// ignore unresolved elements
-				}
-			} else if (part instanceof EditorPart) {
-				EditorPart editorPart = (EditorPart) part;
-				IEditorInput input = editorPart.getEditorInput();
-				if (input instanceof IPathEditorInput) {
-					structureKind = "file";
-					elementHandle = getHandleIdentifier(((IPathEditorInput) input).getPath());
-					// obfuscatedElementHandle =
-					// obfuscator.obfuscateResourcePath(((IPathEditorInput)
-					// input).getPath());
-				}
-			}
-		}
-		IInteractionElement node = ContextCorePlugin.getContextManager().getElement(elementHandle);
-		String delta = "";
-		float selectionFactor = InteractionContextManager.getScalingFactors().get(InteractionEvent.Kind.SELECTION).getValue();
-
-		if (node != null) {
-			if (node.getInterest().getEncodedValue() <= selectionFactor
-					&& node.getInterest().getValue() > selectionFactor) {
-				delta = SELECTION_PREDICTED;
-			} else if (node.getInterest().getEncodedValue() < selectionFactor
-					&& node.getInterest().getDecayValue() > selectionFactor) {
-				delta = SELECTION_DECAYED;
-			} else if (node.getInterest().getValue() == selectionFactor
-					&& node.getInterest().getDecayValue() < selectionFactor) {
-				delta = SELECTION_NEW;
-			} else {
-				delta = SELECTION_DEFAULT;
-			}
-		}
-
-		InteractionEvent event = new InteractionEvent(interactionKind, structureKind, elementHandle, part.getSite()
-				.getId(), "null", delta, 0);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(event);
-	}
-
-	// private String obfuscateJavaElementHandle(IJavaElement javaElement) {
-	// try {
-	// StringBuffer obfuscatedPath = new StringBuffer();
-	// IResource resource;
-	// resource = (IResource) javaElement.getUnderlyingResource();
-	// if (resource != null && (resource instanceof IFile)) {
-	// IFile file = (IFile) resource;
-	// obfuscatedPath.append(obfuscator.obfuscateResourcePath(file.getProjectRelativePath()));
-	// obfuscatedPath.append(':');
-	// obfuscatedPath.append(obfuscator.obfuscateString(javaElement.getElementName()));
-	// return obfuscatedPath.toString();
-	// } else {
-	// return obfuscator.obfuscateString(javaElement.getHandleIdentifier());
-	// }
-	// } catch (JavaModelException e) {
-	// // ignore non-existing element
-	// }
-	// return ID_JAVA_UNKNOWN;
-	// }
-
-	// NOTE: duplicated from ResourceStructureBridge
-	private String getHandleIdentifier(IPath path) {
-		if (path != null) {
-			return path.toPortableString();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Some events do not have a valid handle, e.g. hande is null or ?
-	 */
-	public static boolean isValidStructureHandle(InteractionEvent event) {
-		String handle = event.getStructureHandle();
-		return handle != null && !handle.trim().equals("") && !handle.equals(SelectionMonitor.ID_JAVA_UNKNOWN)
-				&& !handle.equals(SelectionMonitor.ID_JAVA_UNKNOW_OLD) && event.isValidStructureHandle();
-	}
-}
diff --git a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SubmitFeedbackPage.java b/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SubmitFeedbackPage.java
deleted file mode 100644
index 6a7bb7c..0000000
--- a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SubmitFeedbackPage.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2005 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.examples.monitor.study;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-import org.eclipse.mylyn.internal.monitor.usage.wizards.UsageSubmissionWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Page to submit feedback for the user study
- * 
- * @author Shawn Minto
- * @author Mik Kersten
- */
-public class SubmitFeedbackPage extends WizardPage {
-
-	private Text firstName;
-
-	private Text lastName;
-
-	private Text emailAddress;
-
-	private Text feedback;
-
-	private Text uid;
-
-	private Button totallyAnonymous;
-
-	private Button identifiedUserStudyId;
-
-	private Button identifiedNameEmail;
-
-	private String first;
-
-	private String last;
-
-	private String email;
-
-	private String feed;
-
-	private int id;
-
-	private boolean anon;
-
-	private boolean named;
-
-	private UsageSubmissionWizard uploadWizard;
-
-	/**
-	 * Constructor
-	 */
-	public SubmitFeedbackPage(UsageSubmissionWizard uploadWizard) {
-		super("Feedback Wizard");
-		setTitle("Submit feedback for Mylar User Study");
-		// setDescription(QuestionnaireWizardPage.FEEDBACK_REQUEST);
-		this.uploadWizard = uploadWizard;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-		layout.numColumns = 1;
-
-		Composite container2 = null;
-
-		if (uploadWizard == null) {
-			container2 = new Composite(container, SWT.NULL);
-			layout = new GridLayout(2, false);
-			container2.setLayout(layout);
-
-			container2 = addSubmissionStyleControls(container2);
-		} else {
-			container2 = new Composite(container, SWT.NULL);
-			layout = new GridLayout(2, true);
-			container2.setLayout(layout);
-		}
-
-		Label label = new Label(container2, SWT.NONE);
-		// HACK used to make the feedback column a nice width
-		label.setText("Feedback:                                                            ");
-		GridData gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_BOTH);
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-
-		feedback = new Text(container2, SWT.BORDER | SWT.V_SCROLL | SWT.WRAP);
-		gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_BOTH | GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 2;
-		gd.verticalSpan = 40;
-		feedback.setLayoutData(gd);
-		feedback.setEditable(true);
-		feedback.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				feed = feedback.getText();
-				SubmitFeedbackPage.this.setPageComplete(SubmitFeedbackPage.this.isPageComplete());
-			}
-		});
-
-		setControl(container);
-	}
-
-	private Composite addSubmissionStyleControls(Composite container) {
-		totallyAnonymous = new Button(container, SWT.RADIO);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		totallyAnonymous.setLayoutData(gd);
-		totallyAnonymous.setSelection(false);
-		totallyAnonymous.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				if (e.widget == totallyAnonymous) {
-					anon = true;
-					named = false;
-					boolean edit = !anon;
-					firstName.setEditable(edit);
-					lastName.setEditable(edit);
-					emailAddress.setEditable(edit);
-					SubmitFeedbackPage.this.setPageComplete(SubmitFeedbackPage.this.isPageComplete());
-				}
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// don't care about default selection
-			}
-		});
-
-		Group anonCont = new Group(container, SWT.SHADOW_ETCHED_IN);
-		GridLayout layout = new GridLayout(1, true);
-		layout.verticalSpacing = 9;
-		layout.horizontalSpacing = 4;
-		anonCont.setLayout(layout);
-		anonCont.setText("Anonymous");
-
-		identifiedUserStudyId = new Button(container, SWT.RADIO);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		identifiedUserStudyId.setLayoutData(gd);
-		identifiedUserStudyId.setSelection(false);
-		identifiedUserStudyId.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				if (e.widget == identifiedUserStudyId) {
-					anon = true;
-					named = false;
-					boolean edit = !anon;
-					firstName.setEditable(edit);
-					lastName.setEditable(edit);
-					emailAddress.setEditable(edit);
-					SubmitFeedbackPage.this.setPageComplete(SubmitFeedbackPage.this.isPageComplete());
-				}
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// don't care about default selection
-			}
-		});
-
-		Group idUserCont = new Group(container, SWT.SHADOW_ETCHED_IN);
-		layout = new GridLayout(2, true);
-		layout.verticalSpacing = 9;
-		layout.horizontalSpacing = 4;
-		idUserCont.setLayout(layout);
-		idUserCont.setText("Identified By User Study Id");
-
-		Label label = new Label(idUserCont, SWT.NULL);
-		label.setText("User Id:");
-
-		uid = new Text(idUserCont, SWT.BORDER | SWT.SINGLE);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.horizontalSpan = 1;
-		uid.setLayoutData(gd);
-		uid.setEditable(false);
-		id = UiUsageMonitorPlugin.getDefault().getPreferenceStore().getInt(UiUsageMonitorPlugin.PREF_USER_ID);
-		if (id == 0)
-			id = -1;
-		uid.setText(id + "");
-
-		identifiedNameEmail = new Button(container, SWT.RADIO);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		identifiedNameEmail.setLayoutData(gd);
-		identifiedNameEmail.setSelection(false);
-		identifiedNameEmail.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				if (e.widget == identifiedNameEmail) {
-					anon = false;
-					named = true;
-					boolean edit = !anon;
-					firstName.setEditable(edit);
-					lastName.setEditable(edit);
-					emailAddress.setEditable(edit);
-					SubmitFeedbackPage.this.setPageComplete(SubmitFeedbackPage.this.isPageComplete());
-				}
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// don't care about default selection
-			}
-		});
-
-		Group idCont = new Group(container, SWT.SHADOW_ETCHED_IN);
-		layout = new GridLayout(1, true);
-		layout.verticalSpacing = 9;
-		layout.horizontalSpacing = 4;
-		idCont.setLayout(layout);
-		idCont.setText("Identifed By Name and Email");
-
-		Composite names = new Composite(idCont, SWT.NULL);
-		layout = new GridLayout(6, true);
-		layout.verticalSpacing = 9;
-		layout.horizontalSpacing = 4;
-		names.setLayout(layout);
-
-		label = new Label(names, SWT.NULL);
-		label.setText("First Name:");
-
-		firstName = new Text(names, SWT.BORDER | SWT.SINGLE);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.horizontalSpan = 2;
-		firstName.setLayoutData(gd);
-		firstName.setEditable(true);
-		firstName.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				first = firstName.getText();
-				SubmitFeedbackPage.this.setPageComplete(SubmitFeedbackPage.this.isPageComplete());
-			}
-		});
-
-		label = new Label(names, SWT.NULL);
-		label.setText("Last Name:");
-
-		lastName = new Text(names, SWT.BORDER | SWT.SINGLE);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.horizontalSpan = 2;
-		lastName.setLayoutData(gd);
-		lastName.setEditable(true);
-		lastName.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				last = lastName.getText();
-				SubmitFeedbackPage.this.setPageComplete(SubmitFeedbackPage.this.isPageComplete());
-			}
-		});
-
-		label = new Label(names, SWT.NONE);
-		label.setText("Email Address:");
-
-		emailAddress = new Text(names, SWT.BORDER | SWT.SINGLE);
-		gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_BOTH);
-		gd.horizontalSpan = 5;
-		emailAddress.setLayoutData(gd);
-		emailAddress.setEditable(true);
-		emailAddress.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				email = emailAddress.getText();
-				boolean valid = vaidateEmail(email);
-				if (!valid)
-					SubmitFeedbackPage.this.setErrorMessage("Must be a valid e-mail address");
-				else
-					SubmitFeedbackPage.this.setErrorMessage(null);
-				SubmitFeedbackPage.this.setPageComplete(SubmitFeedbackPage.this.isPageComplete());
-			}
-		});
-
-		if (id == -1) {
-			identifiedUserStudyId.setEnabled(false);
-			identifiedNameEmail.setSelection(true);
-		} else {
-			identifiedUserStudyId.setSelection(true);
-			firstName.setEditable(false);
-			lastName.setEditable(false);
-			emailAddress.setEditable(false);
-		}
-		return container;
-	}
-
-	private boolean vaidateEmail(String emailToVerify) {
-		if (emailToVerify.contains("@")) {
-			emailToVerify = emailToVerify.substring(emailToVerify.indexOf("@"));
-			return emailToVerify.contains(".");
-		}
-		return false;
-	}
-
-	public boolean hasAllFields() {
-		if (uploadWizard != null)
-			return (((!firstName.getText().equals("") && !lastName.getText().equals("") && !emailAddress.getText()
-					.equals("")) || anon) && !feedback.getText().equals(""));
-		else
-			return !feedback.getText().equals("");
-	}
-
-	@Override
-	public boolean isPageComplete() {
-		if (hasAllFields() && this.getErrorMessage() == null)
-			return true;
-		else
-			return false;
-	}
-
-	@Override
-	public IWizardPage getNextPage() {
-		return super.getNextPage();
-
-	}
-
-	/** ONLY VALID IF WIZARD NOT STARTED FROM UPLOAD WIZARD */
-	public boolean isAnon() {
-		return anon;
-	}
-
-	public int getUid() {
-		if (anon || named)
-			return -1;
-		return id;
-	}
-
-	public String getStringUid() {
-		if (anon) {
-			return "anon";
-		} else if (named) {
-			return "named";
-		} else {
-			return "" + getUid();
-		}
-	}
-
-	/** ONLY VALID IF WIZARD NOT STARTED FROM UPLOAD WIZARD */
-	public String getEmailAddress() {
-		if (anon)
-			return "null";
-		return email;
-	}
-
-	/** ONLY VALID IF WIZARD NOT STARTED FROM UPLOAD WIZARD */
-	public String getFirstName() {
-		if (anon)
-			return "null";
-		return first;
-	}
-
-	/** ONLY VALID IF WIZARD NOT STARTED FROM UPLOAD WIZARD */
-	public String getLastName() {
-		if (anon)
-			return "null";
-		return last;
-	}
-
-	/** ONLY VALID IF WIZARD NOT STARTED FROM UPLOAD WIZARD */
-	public String getFeedback() {
-		return feed;
-	}
-
-	public File createFeedbackFile() {
-		IPath rootPath = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		String path = rootPath.toString() + File.separator + "feedback.txt";
-		File feedbackFile = new File(path);
-
-		if (feedbackFile.exists()) {
-			feedbackFile.delete();
-		}
-
-		OutputStream outputStream;
-		try {
-			outputStream = new FileOutputStream(feedbackFile);
-
-			String buffer = "First Name: " + getFirstName() + "\r\n";
-			outputStream.write(buffer.getBytes());
-			buffer = "Last Name: " + getLastName() + "\r\n";
-			outputStream.write(buffer.getBytes());
-			buffer = "E-mail Address: " + getEmailAddress() + "\r\n";
-			outputStream.write(buffer.getBytes());
-			buffer = "UID: " + getUid() + "\r\n";
-			outputStream.write(buffer.getBytes());
-			buffer = "Feedback: " + getFeedback() + "\r\n";
-			outputStream.write(buffer.getBytes());
-			outputStream.close();
-			return feedbackFile;
-		} catch (FileNotFoundException e) {
-			StatusManager.log(e, "failed to submit");
-		} catch (IOException e) {
-			StatusManager.log(e, "failed to submit");
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.reports/.classpath b/org.eclipse.mylyn.monitor.reports/.classpath
deleted file mode 100644
index c9c6503..0000000
--- a/org.eclipse.mylyn.monitor.reports/.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.monitor.reports/.cvsignore b/org.eclipse.mylyn.monitor.reports/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.monitor.reports/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.monitor.reports/.project b/org.eclipse.mylyn.monitor.reports/.project
deleted file mode 100644
index 6cc6c20..0000000
--- a/org.eclipse.mylyn.monitor.reports/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.monitor.reports</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4f6160a..0000000
--- a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,315 +0,0 @@
-#Wed Jun 06 17:09:48 EDT 2007
-eclipse.preferences.version=1
-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=disabled
-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.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.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-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.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-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.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-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=false
-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_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.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
\ No newline at end of file
diff --git a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 959876e..0000000
--- a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Feb 05 18:45:16 PST 2007
-eclipse.preferences.version=1
-formatter_profile=_Mylar based on Eclipse [built-in]
-formatter_settings_version=11
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><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><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 - 2006 University Of British Columbia 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 *     University Of British Columbia - 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></templates>
diff --git a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c5ceabe..0000000
--- a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:31:16 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.mylar.tasklist.prefs
deleted file mode 100644
index 672e994..0000000
--- a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.mylar.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 20 16:45:13 PDT 2006
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index bdb4468..0000000
--- a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:14:24 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 1c7f824..0000000
--- a/org.eclipse.mylyn.monitor.reports/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Thu Nov 03 15:47:00 PST 2005
-compilers.p.deprecated=2
-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-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.monitor.reports/META-INF/MANIFEST.MF b/org.eclipse.mylyn.monitor.reports/META-INF/MANIFEST.MF
deleted file mode 100644
index 62d2846..0000000
--- a/org.eclipse.mylyn.monitor.reports/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Monitor Reports
-Bundle-SymbolicName: org.eclipse.mylyn.monitor.reports; singleton:=true
-Bundle-Version: 0.4.1
-Bundle-Activator: org.eclipse.mylyn.internal.monitor.reports.MonitorReportsPlugin
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.ui,
- org.eclipse.ui.forms,
- org.eclipse.mylyn.context.core,
- org.eclipse.mylyn.monitor.usage,
- org.eclipse.mylyn.context.ui,
- org.eclipse.mylyn.tasks.ui,
- org.eclipse.mylyn.monitor.ui,
- org.eclipse.mylyn,
- org.eclipse.mylyn.monitor.core
-Eclipse-AutoStart: true
-Export-Package: org.eclipse.mylyn.internal.monitor.reports,
- org.eclipse.mylyn.internal.monitor.reports.collectors,
- org.eclipse.mylyn.internal.monitor.reports.preferences,
- org.eclipse.mylyn.internal.monitor.reports.ui.actions
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.monitor.reports/about.html b/org.eclipse.mylyn.monitor.reports/about.html
deleted file mode 100644
index 1aeb16b..0000000
--- a/org.eclipse.mylyn.monitor.reports/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>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.monitor.reports/build-user.xml b/org.eclipse.mylyn.monitor.reports/build-user.xml
deleted file mode 100644
index 6097713..0000000
--- a/org.eclipse.mylyn.monitor.reports/build-user.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<target name="help">
-    <echo message="Please run: $ ant -v -projecthelp"/>
-</target>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.monitor.reports/build.properties b/org.eclipse.mylyn.monitor.reports/build.properties
deleted file mode 100644
index 0a0e230..0000000
--- a/org.eclipse.mylyn.monitor.reports/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = META-INF/,\
-               plugin.xml,\
-               icons/,\
-               .
-src.includes = src/,\
-               plugin.xml,\
-               icons/,\
-               META-INF/
-jre.compilation.profile = J2SE-1.5
-source.. = src/
diff --git a/org.eclipse.mylyn.monitor.reports/icons/eview16/folder.gif b/org.eclipse.mylyn.monitor.reports/icons/eview16/folder.gif
deleted file mode 100644
index 51e703b..0000000
--- a/org.eclipse.mylyn.monitor.reports/icons/eview16/folder.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.monitor.reports/icons/eview16/monitor.gif b/org.eclipse.mylyn.monitor.reports/icons/eview16/monitor.gif
deleted file mode 100644
index 3ea4ad7..0000000
--- a/org.eclipse.mylyn.monitor.reports/icons/eview16/monitor.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.monitor.reports/plugin.xml b/org.eclipse.mylyn.monitor.reports/plugin.xml
deleted file mode 100644
index d83cce1..0000000
--- a/org.eclipse.mylyn.monitor.reports/plugin.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?eclipse version="3.0"?>
-<plugin>
-     <extension point = "org.eclipse.ui.popupMenus">
-     <viewerContribution
-        id="org.eclipse.mylyn.monitor.ui.commands"
-        targetID="org.eclipse.jdt.ui.PackageExplorer">
-	    <action  
-  		  	label="Reports: My Usage Summary" 
-	  		tooltip="Mylyn Reports: Usage Summary"
-	  		menubarPath="mylyn.monitor" 
-	  		id="org.eclipse.mylyn.monitor.ui.reports.ui.actions.ComputeSummaryAction" 
-	  		class="org.eclipse.mylyn.internal.monitor.reports.ui.actions.EclipseUsageSummaryAction"
-	  		icon="icons/eview16/monitor.gif"
-	  		enablesFor="*"/>   
-	  	<action  
-  		  	label="Reports: Mylyn User Analysis" 
-	  		tooltip="Mylyn Reports: User Analysis"
-	  		menubarPath="mylyn.monitor" 
-	  		id="org.eclipse.mylyn.monitor.ui.reports.ui.actions.ComputeSummaryAction" 
-	  		class="org.eclipse.mylyn.internal.monitor.reports.ui.actions.FocusedUiUserAnalysisAction"
-	  		icon="icons/eview16/monitor.gif"
-	  		enablesFor="*"/>   
-	 </viewerContribution> 
-	 <viewerContribution
-        id="org.eclipse.mylyn.monitor.ui.commands"
-        targetID="org.eclipse.ui.views.ResourceNavigator">
-	    <action  
-  		  	label="Reports: My Usage Summary" 
-	  		tooltip="Mylyn Reports: My Usage Summary"
-	  		menubarPath="mylyn.monitor" 
-	  		id="org.eclipse.mylyn.monitor.ui.reports.ui.actions.ComputeSummaryAction" 
-	  		class="org.eclipse.mylyn.internal.monitor.reports.ui.actions.EclipseUsageSummaryAction"
-	  		icon="icons/eview16/monitor.gif"
-	  		enablesFor="*"/>   
-	  		    <action  
-  		  	label="Reports: Mylyn User Analysis" 
-	  		tooltip="Mylyn Reports: User Analysis"
-	  		menubarPath="mylyn.monitor" 
-	  		id="org.eclipse.mylyn.monitor.ui.reports.ui.actions.ComputeSummaryAction" 
-	  		class="org.eclipse.mylyn.internal.monitor.reports.ui.actions.FocusedUiUserAnalysisAction"
-	  		icon="icons/eview16/monitor.gif"
-	  		enablesFor="*"/>   
-	 </viewerContribution> 
-   </extension>
-	  		
-	  		
-	<extension point="org.eclipse.ui.editors">
-        <editor
-           icon="icons/eview16/monitor.gif"
-           class="org.eclipse.mylyn.internal.monitor.usage.editors.UsageSummaryReportEditorPart"
-           name="Multi-user Analysis"
-           id="org.eclipse.mylyn.monitor.ui.reports.ui.actions.monitorUsersReport"/>
-  	</extension>
-  	
-</plugin>
-
diff --git a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/MonitorReportsPlugin.java b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/MonitorReportsPlugin.java
deleted file mode 100644
index f9f2846..0000000
--- a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/MonitorReportsPlugin.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.reports;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Mik Kersten
- */
-public class MonitorReportsPlugin extends AbstractUIPlugin {
-
-	public static final String REPORT_SUMMARY_ID = "org.eclipse.mylyn.monitor.ui.reports.ui.actions.monitorSummaryReport";
-
-	public static final String REPORT_USERS_ID = "org.eclipse.mylyn.monitor.ui.reports.ui.actions.monitorUsersReport";
-
-	public static final String SHARED_TASK_DATA_ROOT_DIR = "org.eclipse.mylyn.monitor.ui.reports.preferences.sharedTaskDataRootDir";
-
-	private static MonitorReportsPlugin plugin;
-
-	public MonitorReportsPlugin() {
-		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;
-	}
-
-	public static MonitorReportsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in
-	 * relative path.
-	 * 
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.mylyn.internal.monitor.reports", path);
-	}
-
-	/**
-	 * Returns the root directory of the shared location where task data files
-	 * are stored. Returns "" if the preference has not been set.
-	 */
-	public String getRootSharedDataDirectory() {
-		return getPreferenceStore().getString(SHARED_TASK_DATA_ROOT_DIR);
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/AbstractMylarUsageCollector.java b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/AbstractMylarUsageCollector.java
deleted file mode 100644
index 9c6e720..0000000
--- a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/AbstractMylarUsageCollector.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.reports.collectors;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.mylyn.internal.monitor.core.collection.CommandUsageCollector;
-import org.eclipse.mylyn.internal.monitor.core.collection.DelegatingUsageCollector;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public abstract class AbstractMylarUsageCollector extends DelegatingUsageCollector {
-
-	protected Set<Integer> userIds = new HashSet<Integer>();
-
-	protected Set<Integer> mylarUserIds = new HashSet<Integer>();
-
-	protected Set<Integer> mylarInactiveUserIds = new HashSet<Integer>();
-
-	protected CommandUsageCollector commandUsageCollector = new CommandUsageCollector();
-
-	public AbstractMylarUsageCollector() {
-		super.getDelegates().add(commandUsageCollector);
-	}
-
-	/**
-	 * Overriders must call super.consumeEvent(..)
-	 */
-	@Override
-	public void consumeEvent(InteractionEvent event, int userId) {
-		super.consumeEvent(event, userId);
-		userIds.add(userId);
-		if (FocusedUiUsageDetector.isAMylarActivateCommand(event)) {
-			mylarUserIds.add(userId);
-			mylarInactiveUserIds.remove(userId);
-		}
-		if (FocusedUiUsageDetector.isAMylarDeactivateCommand(event)) {
-			mylarInactiveUserIds.add(userId);
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageAnalysisCollector.java b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageAnalysisCollector.java
deleted file mode 100644
index 8e144b6..0000000
--- a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageAnalysisCollector.java
+++ /dev/null
@@ -1,574 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.reports.collectors;
-
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
-import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction;
-import org.eclipse.mylyn.internal.tasks.ui.actions.TaskDeactivateAction;
-import org.eclipse.mylyn.monitor.core.DateUtil;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.usage.ReportGenerator;
-
-/**
- * Delagates to other collectors for additional info.
- * 
- * @author Mik Kersten
- */
-public class FocusedUiUsageAnalysisCollector extends AbstractMylarUsageCollector {
-
-	// public static final int BASELINE_EDITS_THRESHOLD = 400;
-	// private static final int MYLAR_EDITS_THRESHOLD = 1200;
-
-	public static final int BASELINE_EDITS_THRESHOLD = 1000;
-
-	private static final int MYLAR_EDITS_THRESHOLD = 3000;
-
-	private static final int NUM_VIEWS_REPORTED = 5;
-
-	private float summaryEditRatioDelta = 0;
-
-	private final List<Integer> usersImproved = new ArrayList<Integer>();
-
-	private final List<Integer> usersDegraded = new ArrayList<Integer>();
-
-	private Map<Integer, Date> startDates = new HashMap<Integer, Date>();
-
-	private Map<Integer, Integer> numMylarActiveJavaEdits = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Date> endDates = new HashMap<Integer, Date>();
-
-	private Map<Integer, Integer> baselineSelections = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Integer> baselineEdits = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Integer> mylarInactiveSelections = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Integer> mylarInactiveEdits = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Integer> mylarSelections = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Integer> mylarEdits = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Integer> baselineCurrentNumSelectionsBeforeEdit = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Integer> baselineTotalSelectionsBeforeEdit = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Integer> baselineTotalEditsCounted = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Integer> mylarCurrentNumSelectionsBeforeEdit = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Integer> mylarTotalSelectionsBeforeEdit = new HashMap<Integer, Integer>();
-
-	private Map<Integer, Integer> mylarTotalEditsCounted = new HashMap<Integer, Integer>();
-
-	private Map<Integer, InteractionEvent> lastUserEvent = new HashMap<Integer, InteractionEvent>();
-
-	private Map<Integer, Long> timeMylarActive = new HashMap<Integer, Long>();
-
-	private Map<Integer, Long> timeMylarInactive = new HashMap<Integer, Long>();
-
-	private Map<Integer, Long> timeBaseline = new HashMap<Integer, Long>();
-
-	private FocusedUiViewUsageCollector viewUsageCollector = new FocusedUiViewUsageCollector();
-
-	public FocusedUiUsageAnalysisCollector() {
-		viewUsageCollector.setMaxViewsToReport(NUM_VIEWS_REPORTED);
-		super.getDelegates().add(viewUsageCollector);
-	}
-
-	@Override
-	public String getReportTitle() {
-		return "Mylar Usage";
-	}
-
-	@Override
-	public void consumeEvent(InteractionEvent event, int userId) {
-		super.consumeEvent(event, userId);
-		if (!startDates.containsKey(userId))
-			startDates.put(userId, event.getDate());
-		endDates.put(userId, event.getDate());
-
-		// Mylar is active
-		if (mylarUserIds.contains(userId) && !mylarInactiveUserIds.contains(userId)) {
-			accumulateDuration(event, userId, timeMylarActive);
-			if (isJavaEdit(event))
-				incrementCount(userId, numMylarActiveJavaEdits);
-			if (isSelection(event)) {
-				incrementCount(userId, mylarSelections);
-				incrementCount(userId, mylarCurrentNumSelectionsBeforeEdit);
-			} else if (isEdit(event)) {
-				incrementCount(userId, mylarEdits);
-
-				if (mylarCurrentNumSelectionsBeforeEdit.containsKey((userId))) {
-					int num = mylarCurrentNumSelectionsBeforeEdit.get(userId);
-					if (num > 0) {
-						incrementCount(userId, mylarTotalEditsCounted);
-						incrementCount(userId, mylarTotalSelectionsBeforeEdit, num);
-						mylarCurrentNumSelectionsBeforeEdit.put(userId, 0);
-					}
-				}
-			}
-			// Mylar is inactive
-		} else if (mylarInactiveUserIds.contains(userId)) {
-			accumulateDuration(event, userId, timeMylarInactive);
-			if (isSelection(event)) {
-				incrementCount(userId, mylarInactiveSelections);
-			} else if (isEdit(event)) {
-				incrementCount(userId, mylarInactiveEdits);
-			}
-			// Baseline
-		} else {
-			accumulateDuration(event, userId, timeBaseline);
-			if (isSelection(event)) {
-				incrementCount(userId, baselineSelections);
-
-				incrementCount(userId, baselineCurrentNumSelectionsBeforeEdit);
-			} else if (isEdit(event)) {
-				incrementCount(userId, baselineEdits);
-
-				if (baselineCurrentNumSelectionsBeforeEdit.containsKey((userId))) {
-					int num = baselineCurrentNumSelectionsBeforeEdit.get(userId);
-					if (num > 0) {
-						incrementCount(userId, baselineTotalEditsCounted);
-						incrementCount(userId, baselineTotalSelectionsBeforeEdit, num);
-						baselineCurrentNumSelectionsBeforeEdit.put(userId, 0);
-					}
-				}
-			}
-		}
-	}
-
-	private void accumulateDuration(InteractionEvent event, int userId, Map<Integer, Long> timeAccumulator) {
-		// Restart accumulation if greater than 5 min has elapsed between events
-		if (lastUserEvent.containsKey(userId)) {
-			long elapsed = event.getDate().getTime() - lastUserEvent.get(userId).getDate().getTime();
-
-			if (elapsed < 5 * 60 * 1000) {
-				if (!timeAccumulator.containsKey(userId)) {
-					timeAccumulator.put(userId, new Long(0));
-				}
-				timeAccumulator.put(userId, timeAccumulator.get(userId) + elapsed);
-			}
-		}
-		lastUserEvent.put(userId, event);
-	}
-
-	public static boolean isEdit(InteractionEvent event) {
-		return event.getKind().equals(InteractionEvent.Kind.EDIT)
-				|| (event.getKind().equals(InteractionEvent.Kind.SELECTION) && isSelectionInEditor(event));
-	}
-
-	public static boolean isSelection(InteractionEvent event) {
-		return event.getKind().equals(InteractionEvent.Kind.SELECTION) && !isSelectionInEditor(event);
-	}
-
-	public static boolean isSelectionInEditor(InteractionEvent event) {
-		return event.getOriginId().contains("Editor") || event.getOriginId().contains("editor")
-				|| event.getOriginId().contains("source");
-	}
-
-	public static boolean isJavaEdit(InteractionEvent event) {
-		return event.getKind().equals(InteractionEvent.Kind.EDIT)
-				&& (event.getOriginId().contains("java") || event.getOriginId().contains("jdt.ui"));
-	}
-
-	private void incrementCount(int userId, Map<Integer, Integer> map, int count) {
-		if (!map.containsKey(userId))
-			map.put(userId, 0);
-		map.put(userId, map.get(userId) + count);
-	}
-
-	private void incrementCount(int userId, Map<Integer, Integer> map) {
-		incrementCount(userId, map, 1);
-	}
-
-	@Override
-	public List<String> getReport() {
-		usersImproved.clear();
-		usersDegraded.clear();
-		int acceptedUsers = 0;
-		int rejectedUsers = 0;
-		summaryEditRatioDelta = 0;
-		List<String> report = new ArrayList<String>();
-		for (int id : userIds) {
-			if (acceptUser(id)) {
-				report.add("<h3>USER ID: " + id + " (from: " + getStartDate(id) + " to " + getEndDate(id) + ")</h3>");
-				acceptedUsers++;
-
-				float baselineRatio = getBaselineRatio(id);
-				float mylarInactiveRatio = getMylarInactiveRatio(id);
-				float mylarActiveRatio = getMylarRatio(id);
-				float combinedMylarRatio = mylarInactiveRatio + mylarActiveRatio;
-
-				float ratioPercentage = (combinedMylarRatio - baselineRatio) / baselineRatio;
-				if (ratioPercentage > 0) {
-					usersImproved.add(id);
-				} else {
-					usersDegraded.add(id);
-				}
-				summaryEditRatioDelta += ratioPercentage;
-				String baselineVsMylarRatio = "Baseline vs. Mylar edit ratio: " + baselineRatio + ", mylar: "
-						+ combinedMylarRatio + ",  ";
-				String ratioChange = ReportGenerator.formatPercentage(100 * ratioPercentage);
-				baselineVsMylarRatio += " <b>change: " + ratioChange + "%</b>";
-				report.add(baselineVsMylarRatio + "<br>");
-
-				report.add("<h4>Activity</h4>");
-				float editsActive = getNumMylarEdits(id);
-				float editsInactive = getNumInactiveEdits(id);
-				report.add("Proportion Mylar active (by edits): <b>"
-						+ ReportGenerator.formatPercentage(100 * ((editsActive) / (editsInactive + editsActive)))
-						+ "%</b><br>");
-
-				report.add("Elapsed time baseline: " + getTime(id, timeBaseline) + ", active: "
-						+ getTime(id, timeMylarActive) + ", inactive: " + getTime(id, timeMylarInactive) + "<br>");
-
-				report.add("Selections baseline: " + getNumBaselineSelections(id) + ", Mylar active: "
-						+ getNumMylarSelections(id) + ", inactive: " + getNumMylarInactiveSelections(id) + "<br>");
-				report.add("Edits baseline: " + getNumBaselineEdits(id) + ", Mylar active: " + getNumMylarEdits(id)
-						+ ", inactive: " + getNumInactiveEdits(id) + "<br>");
-
-				int numTaskActivations = commandUsageCollector.getCommands().getUserCount(id, TaskActivateAction.ID);
-				int numTaskDeactivations = commandUsageCollector.getCommands()
-						.getUserCount(id, TaskDeactivateAction.ID);
-				report.add("Task activations: " + numTaskActivations + ", ");
-				report.add("deactivations: " + numTaskDeactivations + "<br>");
-
-				int numIncrement = commandUsageCollector.getCommands().getUserCount(id,
-						"org.eclipse.mylyn.ui.interest.increment");
-				int numDecrement = commandUsageCollector.getCommands().getUserCount(id,
-						"org.eclipse.mylyn.ui.interest.decrement");
-				report.add("Interest increments: " + numIncrement + ", ");
-				report.add("Interest decrements: " + numDecrement + "<br>");
-
-				report.addAll(viewUsageCollector.getSummary(id, true));
-				report.add(ReportGenerator.SUMMARY_SEPARATOR);
-			} else {
-				rejectedUsers++;
-			}
-		}
-		report.add("<h3>Summary</h3>");
-		String acceptedSummary = " (based on " + acceptedUsers + " accepted, " + rejectedUsers + " rejected users)";
-		float percentage = summaryEditRatioDelta / acceptedUsers;
-		String ratioChange = ReportGenerator.formatPercentage(100 * (percentage - 1));
-		if (percentage >= 1) {
-			report.add("Overall edit ratio improved by: " + ratioChange + "% " + acceptedSummary + "<br>");
-		} else {
-			report.add("Overall edit ratio degraded by: " + ratioChange + "% " + acceptedSummary + "<br>");
-		}
-		report.add("degraded: " + usersDegraded.size() + ", improved: " + usersImproved.size() + "<br>");
-		report.add(ReportGenerator.SUMMARY_SEPARATOR);
-		return report;
-	}
-
-	@Override
-	public void exportAsCSVFile(String directory) {
-		FileWriter writer;
-		try {
-			writer = new FileWriter(directory + "/mylar-usage.csv");
-			writer
-					.write("userid, "
-							+ "ratio-baseline, ratio-mylar, "
-							+ "ratio-improvement, "
-							+ "filtered-explorer, "
-							+ "filtered-outline, "
-							+ "filtered-problems, "
-							+ "edits-active, "
-							+ "time-baseline, time-active, time-inactive, "
-							+ "task-activations, task-deactivations, sel-interesting, sel-predicted, sel-decayed, sel-new, sel-unknown\n");
-			// "filtered-explorer, filtered-outline, filtered-problems, ");
-
-			for (int userId : userIds) {
-				if (acceptUser(userId)) {
-					writer.write(userId + ", ");
-					float baselineRatio = getBaselineRatio(userId);
-					float mylarInactiveRatio = getMylarInactiveRatio(userId);
-					float mylarActiveRatio = getMylarRatio(userId);
-					float combinedMylarRatio = mylarInactiveRatio + mylarActiveRatio;
-
-					writer.write(baselineRatio + ", ");
-					writer.write(combinedMylarRatio + ", ");
-
-					float ratioPercentage = (combinedMylarRatio - baselineRatio) / baselineRatio;
-					writer.write(100 * ratioPercentage + ", ");
-
-					Map<String, Integer> filteredViewSelections = viewUsageCollector.usersFilteredViewSelections
-							.get(userId);
-					Map<String, Integer> normalViewSelections = viewUsageCollector.getUsersNormalViewSelections().get(
-							userId);
-
-					String[] views = new String[] { "org.eclipse.jdt.ui.PackageExplorer",
-							"org.eclipse.ui.views.ContentOutline", "org.eclipse.ui.views.ProblemView" };
-					for (int i = 0; i < views.length; i++) {
-						if (normalViewSelections.containsKey(views[i]) && filteredViewSelections.containsKey(views[i])) {
-							float normalSelections = normalViewSelections.get(views[i]);
-							float filteredSelections = filteredViewSelections.get(views[i]);
-							float ratio = filteredSelections / (normalSelections + filteredSelections);
-							// int unfilteredSelections = normalSelections -
-							// filteredSelections;
-							if (ratio >= 0.01) {
-								writer.write(ratio + ", ");
-							} else {
-								writer.write("0, ");
-							}
-						} else {
-							writer.write("0, ");
-						}
-					}
-
-					float editsActive = getNumMylarEdits(userId);
-					float editsInactive = getNumInactiveEdits(userId);
-					writer.write(100 * ((editsActive) / (editsInactive + editsActive)) + ", ");
-
-					writer.write(getTime(userId, timeBaseline) + ", ");
-					writer.write(getTime(userId, timeMylarActive) + ", ");
-					writer.write(getTime(userId, timeMylarInactive) + ", ");
-
-					int numTaskActivations = commandUsageCollector.getCommands().getUserCount(userId,
-							TaskActivateAction.ID);
-					int numTaskDeactivations = commandUsageCollector.getCommands().getUserCount(userId,
-							TaskDeactivateAction.ID);
-					writer.write(numTaskActivations + ", ");
-					writer.write(numTaskDeactivations + ", ");
-
-					int numNew = 0;
-					if (viewUsageCollector.usersNumNew.containsKey(userId))
-						numNew = viewUsageCollector.usersNumNew.get(userId);
-					int numPredicted = 0;
-					if (viewUsageCollector.usersNumPredicted.containsKey(userId))
-						numPredicted = viewUsageCollector.usersNumPredicted.get(userId);
-					int numInteresting = 0;
-					if (viewUsageCollector.usersNumDefault.containsKey(userId))
-						numInteresting = viewUsageCollector.usersNumDefault.get(userId);
-					int numDecayed = 0;
-					if (viewUsageCollector.usersNumDecayed.containsKey(userId))
-						numDecayed = viewUsageCollector.usersNumDecayed.get(userId);
-					int numUnknown = 0;
-					if (viewUsageCollector.usersNumUnknown.containsKey(userId))
-						numUnknown = viewUsageCollector.usersNumUnknown.get(userId);
-
-					// float numSelections = numNew + numPredicted +
-					// numInteresting + numDecayed + numUnknown;
-					// writer.write(numSelections + ", ");
-					writer.write(numInteresting + ", ");
-					writer.write(numPredicted + ", ");
-					writer.write(numDecayed + ", ");
-					writer.write(numNew + ", ");
-					writer.write(numUnknown + ", ");
-
-					writer.write("\n");
-				}
-			}
-			writer.close();
-		} catch (IOException e) {
-			StatusManager.fail(e, "could not generate csv file", true);
-		}
-	}
-
-	private String getTime(int id, Map<Integer, Long> timeMap) {
-		if (timeMap.containsKey(id)) {
-			long timeInSeconds = timeMap.get(id) / 1000;
-			long hours, minutes;
-			hours = timeInSeconds / 3600;
-			timeInSeconds = timeInSeconds - (hours * 3600);
-			minutes = timeInSeconds / 60;
-			timeInSeconds = timeInSeconds - (minutes * 60);
-			return hours + "." + minutes;
-		} else {
-			return "0";
-		}
-	}
-
-	public boolean acceptUser(int id) {
-		// XXX: delete
-		// int[] ACCEPTED = {
-		// 1922,
-		// 970,
-		// 1650,
-		// 1548,
-		// 1565,
-		// 1752,
-		// 2194,
-		// 2364,
-		// 1735,
-		// 936,
-		// 1803,
-		// 2007,
-		// 1208,
-		// 1684,
-		// 919,
-		// 2041,
-		// 1174
-		// };
-		// for (int i : ACCEPTED) {
-		// if (i == id) return true;
-		// }
-		// return false;
-		if (!numMylarActiveJavaEdits.containsKey(id)) {
-			return false;
-		} else {
-			return getNumBaselineEdits(id) > BASELINE_EDITS_THRESHOLD && getNumMylarEdits(id) > MYLAR_EDITS_THRESHOLD;
-		}
-	}
-
-	public String getStartDate(int id) {
-		Calendar start = Calendar.getInstance();
-		start.setTime(startDates.get(id));
-		return DateUtil.getFormattedDate(start);
-	}
-
-	public String getEndDate(int id) {
-		Calendar end = Calendar.getInstance();
-		end.setTime(endDates.get(id));
-		return DateUtil.getFormattedDate(end);
-	}
-
-	public int getNumBaselineSelections(int id) {
-		if (baselineSelections.containsKey(id)) {
-			return baselineSelections.get(id);
-		} else {
-			return 0;
-		}
-	}
-
-	public int getNumBaselineEdits(int id) {
-		if (baselineEdits.containsKey(id)) {
-			return baselineEdits.get(id);
-		} else {
-			return 0;
-		}
-	}
-
-	public int getNumMylarEdits(int id) {
-		if (mylarEdits.containsKey(id)) {
-			return mylarEdits.get(id);
-		} else {
-			return 0;
-		}
-	}
-
-	public int getNumMylarInactiveEdits(int id) {
-		if (mylarInactiveEdits.containsKey(id)) {
-			return mylarInactiveEdits.get(id);
-		} else {
-			return 0;
-		}
-	}
-
-	public int getNumInactiveEdits(int id) {
-		if (mylarInactiveEdits.containsKey(id)) {
-			return mylarInactiveEdits.get(id);
-		} else {
-			return 0;
-		}
-	}
-
-	public int getNumMylarInactiveSelections(int id) {
-		if (mylarInactiveSelections.containsKey(id)) {
-			return mylarInactiveSelections.get(id);
-		} else {
-			return 0;
-		}
-	}
-
-	public int getNumMylarSelections(int id) {
-		if (mylarSelections.containsKey(id)) {
-			return mylarSelections.get(id);
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Public for testing.
-	 */
-	public float getBaselineRatio(int id) {
-		return getEditRatio(id, baselineEdits, baselineSelections);
-	}
-
-	public float getMylarInactiveRatio(int id) {
-		return getEditRatio(id, mylarInactiveEdits, mylarInactiveSelections);
-	}
-
-	/**
-	 * Public for testing.
-	 */
-	public float getMylarRatio(int id) {
-		return getEditRatio(id, mylarEdits, mylarSelections);
-	}
-
-	private float getEditRatio(int id, Map<Integer, Integer> edits, Map<Integer, Integer> selections) {
-		if (edits.containsKey(id) && selections.containsKey(id)) {
-			return (float) edits.get(id) / (float) selections.get(id);
-		} else {
-			return 0f;
-		}
-	}
-}
-
-// int numIncrements = commandUsageCollector.getCommands().getUserCount(id,
-// "org.eclipse.mylyn.internal.ui.actions.InterestIncrementAction");
-// int numDecrements = commandUsageCollector.getCommands().getUserCount(id,
-// "org.eclipse.mylyn.internal.ui.actions.InterestDecrementAction");
-// report.add("Interest increments: " + numIncrements + ", decrements: " +
-// numDecrements + "<br>");
-
-// float inactivePercentage = (mylarActiveRatio-mylarInactiveRatio) /
-// mylarInactiveRatio;
-// String inactiveRatioChange = formatPercentage(100*(inactivePercentage));
-// mylarInactiveDelta += inactivePercentage;
-// String inactiveVsActiveRatio = "";
-// inactiveVsActiveRatio += "Inactive vs. Active edit ratio: " +
-// mylarInactiveRatio + ", mylar: " + mylarActiveRatio + ", ";
-// inactiveVsActiveRatio += " <b>change: " + inactiveRatioChange + "%</b>";
-// report.add(inactiveVsActiveRatio + "<br>");
-
-// if (baselineTotalSelectionsBeforeEdit.containsKey(id) &&
-// mylarTotalSelectionsBeforeEdit.containsKey(id)) {
-// float baselineRuns =
-// (float)baselineTotalSelectionsBeforeEdit.get(id) /
-// (float)baselineTotalEditsCounted.get(id);
-//	
-// float mylarRuns =
-// (float)mylarTotalSelectionsBeforeEdit.get(id) /
-// (float)mylarTotalEditsCounted.get(id);
-//	
-// float runsPercentage = (mylarRuns-baselineRuns) / baselineRuns;
-// String runsChange = formatPercentage(-100*runsPercentage);
-// report.add("Avg baseline selections before edit: " + baselineRuns
-// + " vs. mylar: " + mylarRuns
-// + " <b>change: " + runsChange + "</b><br>");;
-// }
-
-// String[] REJECTED_IDs = {
-// "org.eclipse.mylyn.java.ui.editor.MylarCompilationUnitEditor",
-// "org.eclipse.jdt.ui.CompilationUnitEditor",
-// "org.eclipse.jdt.ui.DefaultTextEditor",
-// "org.eclipse.jdt.ui.ClassFileEditor"
-// };
-
-// String[] ACCEPTED_EDITORS = {
-// "org.eclipse.mylyn.java.ui.editor.MylarCompilationUnitEditor",
-// "org.eclipse.jdt.ui.CompilationUnitEditor"
-// };
-// String originId = event.getOriginId();
-// if (originId == null) return false;
-
diff --git a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageDetector.java b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageDetector.java
deleted file mode 100644
index a2d79e3..0000000
--- a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageDetector.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.internal.monitor.reports.collectors;
-
-import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction;
-import org.eclipse.mylyn.internal.tasks.ui.actions.TaskDeactivateAction;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-public abstract class FocusedUiUsageDetector {
-
-	public static boolean isAMylarActivateCommand(InteractionEvent event) {
-		if (event.getKind().equals(InteractionEvent.Kind.COMMAND)) {
-			if (event.getOriginId().equals(TaskActivateAction.ID)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static boolean isAMylarDeactivateCommand(InteractionEvent event) {
-		if (event.getKind().equals(InteractionEvent.Kind.COMMAND)) {
-			if (event.getOriginId().equals(TaskDeactivateAction.ID)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiViewUsageCollector.java b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiViewUsageCollector.java
deleted file mode 100644
index c96056b..0000000
--- a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiViewUsageCollector.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.reports.collectors;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.mylyn.context.ui.AbstractFocusViewAction;
-import org.eclipse.mylyn.internal.monitor.core.collection.ViewUsageCollector;
-import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction;
-import org.eclipse.mylyn.internal.tasks.ui.actions.TaskDeactivateAction;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public class FocusedUiViewUsageCollector extends ViewUsageCollector {
-
-	private Set<Integer> mylarUserIds = new HashSet<Integer>();
-
-	Map<Integer, Map<String, Integer>> usersFilteredViewSelections = new HashMap<Integer, Map<String, Integer>>();
-
-	private Map<Integer, Set<String>> usersFilteredViews = new HashMap<Integer, Set<String>>();
-
-	Map<Integer, Integer> usersNumDecayed = new HashMap<Integer, Integer>();
-
-	Map<Integer, Integer> usersNumDefault = new HashMap<Integer, Integer>();
-
-	Map<Integer, Integer> usersNumNew = new HashMap<Integer, Integer>();
-
-	Map<Integer, Integer> usersNumPredicted = new HashMap<Integer, Integer>();
-
-	Map<Integer, Integer> usersNumUnknown = new HashMap<Integer, Integer>();
-
-	@Override
-	public void consumeEvent(InteractionEvent event, int userId) {
-		super.consumeEvent(event, userId);
-
-		if (event.getKind().equals(InteractionEvent.Kind.COMMAND)) {
-			if (event.getOriginId().equals(TaskActivateAction.ID)) {
-				mylarUserIds.add(userId);
-			} else if (event.getOriginId().equals(TaskDeactivateAction.ID)) {
-				mylarUserIds.remove(userId);
-			}
-		}
-
-		Set<String> filteredViews = usersFilteredViews.get(userId);
-		if (filteredViews == null) {
-			filteredViews = new HashSet<String>();
-			usersFilteredViews.put(userId, filteredViews);
-		}
-
-		Map<String, Integer> filteredViewSelections = usersFilteredViewSelections.get(userId);
-		if (filteredViewSelections == null) {
-			filteredViewSelections = new HashMap<String, Integer>();
-			usersFilteredViewSelections.put(userId, filteredViewSelections);
-		}
-
-		if (event.getKind().equals(InteractionEvent.Kind.SELECTION)) {
-			String viewId = event.getOriginId();
-
-			// TODO: put back?
-			// if (mylarUserIds.contains(userId)) {
-			// if (event.getDelta().equals(SelectionMonitor.SELECTION_DECAYED))
-			// {
-			// if (!usersNumDecayed.containsKey(userId))
-			// usersNumDecayed.put(userId, 0);
-			// int numDecayed = usersNumDecayed.get(userId) + 1;
-			// usersNumDecayed.put(userId, numDecayed);
-			// } else if
-			// (event.getDelta().equals(SelectionMonitor.SELECTION_PREDICTED)) {
-			// if (!usersNumPredicted.containsKey(userId))
-			// usersNumPredicted.put(userId, 0);
-			// int numPredicted = usersNumPredicted.get(userId) + 1;
-			// usersNumPredicted.put(userId, numPredicted);
-			// } else if
-			// (event.getDelta().equals(SelectionMonitor.SELECTION_NEW)) {
-			// if (!usersNumNew.containsKey(userId))
-			// usersNumNew.put(userId, 0);
-			// int numNew = usersNumNew.get(userId) + 1;
-			// usersNumNew.put(userId, numNew);
-			// } else if
-			// (event.getDelta().equals(SelectionMonitor.SELECTION_DEFAULT)) {
-			// if (!usersNumDefault.containsKey(userId))
-			// usersNumDefault.put(userId, 0);
-			// int numDefault = usersNumDefault.get(userId) + 1;
-			// usersNumDefault.put(userId, numDefault);
-			// } else {
-			// if (!usersNumUnknown.containsKey(userId))
-			// usersNumUnknown.put(userId, 0);
-			// int numUnknownNew = usersNumUnknown.get(userId) + 1;
-			// usersNumUnknown.put(userId, numUnknownNew);
-			// }
-			// }
-
-			if (filteredViews.contains(viewId)) {
-				if (!filteredViewSelections.containsKey(viewId))
-					filteredViewSelections.put(viewId, 0);
-				int filtered = filteredViewSelections.get(viewId) + 1;
-				filteredViewSelections.put(viewId, filtered);
-			}
-
-		} else if (event.getKind().equals(InteractionEvent.Kind.PREFERENCE)) {
-			if (event.getOriginId().startsWith(AbstractFocusViewAction.PREF_ID_PREFIX)) {
-				String viewId = event.getOriginId().substring(AbstractFocusViewAction.PREF_ID_PREFIX.length());
-				if (event.getDelta().equals("true")) {
-					filteredViews.add(viewId);
-				} else {
-					filteredViews.remove(viewId);
-				}
-			}
-		}
-	}
-
-	public int getFilteredSelections(int userId, String viewId) {
-		Map<String, Integer> filteredViewSelections = usersFilteredViewSelections.get(userId);
-		if (filteredViewSelections.containsKey(viewId)) {
-			return filteredViewSelections.get(viewId);
-		} else {
-			return 0;
-		}
-	}
-
-	@Override
-	public List<String> getSummary(int userId, boolean html) {
-
-		List<String> summaries = new ArrayList<String>();
-		Map<String, Integer> filteredViewSelections = usersFilteredViewSelections.get(userId);
-		Map<String, Integer> normalViewSelections = usersNormalViewSelections.get(userId);
-
-		if (!filteredViewSelections.keySet().isEmpty()) {
-			if (html) {
-				summaries.add("<h4>Interest Filtering</h4>");
-			} else {
-				summaries.add("Interest Filtering");
-			}
-
-		}
-
-		for (String view : filteredViewSelections.keySet()) {
-			int normalSelections = normalViewSelections.get(view);
-			int filteredSelections = filteredViewSelections.get(view);
-			int unfilteredSelections = normalSelections - filteredSelections;
-			summaries.add(view + " filtered: " + filteredSelections + " vs. unfiltered: ");
-			if (html) {
-				summaries.add(unfilteredSelections + "<br>");
-			} else {
-				summaries.add(unfilteredSelections + "");
-			}
-		}
-
-		if (html) {
-			summaries.add("<h4>View Usage ");
-		} else {
-			summaries.add("View Usage ");
-		}
-
-		List<String> allSummaries = super.getSummary(userId, true);
-		if (maxViewsToReport != -1 && allSummaries.size() == maxViewsToReport) {
-			summaries.add("(top " + maxViewsToReport + ")");
-		}
-		if (html) {
-			summaries.add("</h4>");
-		}
-		summaries.addAll(allSummaries);
-
-		// summaries.add("<h4>Interest Model</h4>");
-		// int numNew = 0;
-		// if (usersNumNew.containsKey(userId))
-		// numNew = usersNumNew.get(userId);
-		// int numPredicted = 0;
-		// if (usersNumPredicted.containsKey(userId))
-		// numPredicted = usersNumPredicted.get(userId);
-		// int numInteresting = 0;
-		// if (usersNumDefault.containsKey(userId))
-		// numInteresting = usersNumDefault.get(userId);
-		// int numDecayed = 0;
-		// if (usersNumDecayed.containsKey(userId))
-		// numDecayed = usersNumDecayed.get(userId);
-		// int numUnknown = 0;
-		// if (usersNumUnknown.containsKey(userId))
-		// numUnknown = usersNumUnknown.get(userId);
-		//
-		// float numSelections = numNew + numPredicted + numInteresting +
-		// numDecayed + numUnknown;
-		// float inModel = (numPredicted + numInteresting + numDecayed);
-		// float notInModel = numNew;
-		// float hitRatio = inModel / (inModel + notInModel);
-		// summaries.add("In model (inModel / (inModel + notInModel): " +
-		// ReportGenerator.formatPercentage(hitRatio) + "<br>");
-		// 
-		// summaries.add("New: " + ReportGenerator.formatPercentage(numNew /
-		// numSelections) + "(" + numNew + ")" + "; ");
-		// summaries.add("Predicted: " +
-		// ReportGenerator.formatPercentage(numPredicted / numSelections) + " ("
-		// + numPredicted + ")"
-		// + "; ");
-		// summaries.add("Interesting: " +
-		// ReportGenerator.formatPercentage(numInteresting / numSelections) + "
-		// (" + numInteresting
-		// + ")" + "; ");
-		// summaries.add("Decayed: " +
-		// ReportGenerator.formatPercentage(numDecayed / numSelections) + " (" +
-		// numDecayed + ")" + "; ");
-		// summaries.add("Unknown: " +
-		// ReportGenerator.formatPercentage(numUnknown / numSelections) + " (" +
-		// numUnknown + ")" + "<br>");
-
-		return summaries;
-	}
-
-	@Override
-	public List<String> getReport() {
-		List<String> summaries = new ArrayList<String>();
-		for (int userId : usersNormalViewSelections.keySet()) {
-			summaries.addAll(getSummary(userId, true));
-		}
-		return summaries;
-	}
-
-	@Override
-	public List<String> getPlainTextReport() {
-		List<String> summaries = new ArrayList<String>();
-		for (int userId : usersNormalViewSelections.keySet()) {
-			summaries.addAll(getSummary(userId, false));
-		}
-		return summaries;
-	}
-
-	@Override
-	public String getReportTitle() {
-		return "Mylar View Usage";
-	}
-
-	/**
-	 * For testing.
-	 */
-	public Map<String, Integer> getFilteredViewSelections() {
-		Map<String, Integer> filteredViewSelections = new HashMap<String, Integer>();
-		for (int userId : usersFilteredViewSelections.keySet()) {
-			filteredViewSelections.putAll(usersFilteredViewSelections.get(userId));
-		}
-		return filteredViewSelections;
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/preferences/UiUsageReportsPreferencePage.java b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/preferences/UiUsageReportsPreferencePage.java
deleted file mode 100644
index 9079f96..0000000
--- a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/preferences/UiUsageReportsPreferencePage.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2005 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.internal.monitor.reports.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.mylyn.internal.monitor.reports.MonitorReportsPlugin;
-import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * Preference page for reporting preferences
- * 
- * @author Wesley Coelho
- */
-public class UiUsageReportsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	private Text mylarDataDirectory = null;
-
-	private Button browse = null;
-
-	public UiUsageReportsPreferencePage() {
-		super();
-		setPreferenceStore(MonitorReportsPlugin.getDefault().getPreferenceStore());
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout(1, false);
-		container.setLayout(layout);
-		createTaskDirectoryControl(container);
-		return container;
-	}
-
-	public void init(IWorkbench workbench) {
-		// No initialization required
-	}
-
-	@Override
-	public boolean performOk() {
-		String taskDirectory = mylarDataDirectory.getText();
-		taskDirectory = taskDirectory.replaceAll("\\\\", "/");
-		getPreferenceStore().setValue(MonitorReportsPlugin.SHARED_TASK_DATA_ROOT_DIR, taskDirectory);
-		return true;
-	}
-
-	@Override
-	public void performDefaults() {
-		super.performDefaults();
-
-		// IPath rootPath =
-		// ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		// String taskDirectory = rootPath.toString() + "/" +
-		// ContextCorePlugin.DATA_DIR_NAME;
-		mylarDataDirectory.setText(TasksUiPlugin.getDefault().getDataDirectory());
-	}
-
-	private void createTaskDirectoryControl(Composite parent) {
-		Group taskDirComposite = new Group(parent, SWT.SHADOW_ETCHED_IN);
-		taskDirComposite.setText("Shared Task Data Root Directory");
-		taskDirComposite.setLayout(new GridLayout(2, false));
-		taskDirComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		String taskDirectory = getPreferenceStore().getString(MonitorReportsPlugin.SHARED_TASK_DATA_ROOT_DIR);
-		if (taskDirectory.trim().equals("")) {
-			taskDirectory = TasksUiPlugin.getDefault().getDataDirectory();
-			// getPreferenceStore().getString(ContextCorePlugin.PREF_DATA_DIR);
-		}
-		taskDirectory = taskDirectory.replaceAll("\\\\", "/");
-		mylarDataDirectory = new Text(taskDirComposite, SWT.BORDER);
-		mylarDataDirectory.setText(taskDirectory);
-		mylarDataDirectory.setEditable(false);
-		mylarDataDirectory.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		browse = createButton(taskDirComposite, "Browse...");
-		browse.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				DirectoryDialog dialog = new DirectoryDialog(getShell());
-				dialog.setText("Folder Selection");
-				dialog.setMessage("Specify the root folder where shared task data is stored");
-				String dir = mylarDataDirectory.getText();
-				dir = dir.replaceAll("\\\\", "/");
-				dialog.setFilterPath(dir);
-
-				dir = dialog.open();
-				if (dir == null || dir.equals(""))
-					return;
-				mylarDataDirectory.setText(dir);
-			}
-		});
-	}
-
-	private Button createButton(Composite parent, String text) {
-		Button button = new Button(parent, SWT.TRAIL);
-		button.setText(text);
-		button.setVisible(true);
-		return button;
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/EclipseUsageSummaryAction.java b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/EclipseUsageSummaryAction.java
deleted file mode 100644
index e1e9da5..0000000
--- a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/EclipseUsageSummaryAction.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.reports.ui.actions;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.internal.monitor.core.collection.CommandUsageCollector;
-import org.eclipse.mylyn.internal.monitor.core.collection.DelegatingUsageCollector;
-import org.eclipse.mylyn.internal.monitor.core.collection.IUsageCollector;
-import org.eclipse.mylyn.internal.monitor.core.collection.SummaryCollector;
-import org.eclipse.mylyn.internal.monitor.core.collection.ViewUsageCollector;
-import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
-import org.eclipse.mylyn.internal.monitor.reports.MonitorReportsPlugin;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-import org.eclipse.mylyn.internal.monitor.usage.collectors.PerspectiveUsageCollector;
-import org.eclipse.mylyn.internal.monitor.usage.editors.UsageStatsEditorInput;
-import org.eclipse.mylyn.monitor.usage.ReportGenerator;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.ViewPluginAction;
-
-/**
- * @author Mik Kersten
- */
-public class EclipseUsageSummaryAction implements IViewActionDelegate {
-	ReportGenerator generator = null;
-
-	public void init(IViewPart view) {
-		// ignore
-	}
-
-	public void run(IAction action) {
-		if (action instanceof ViewPluginAction) {
-			ViewPluginAction objectAction = (ViewPluginAction) action;
-			final List<File> files = getStatsFilesFromSelection(objectAction);
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-
-					List<IUsageCollector> delegates = new ArrayList<IUsageCollector>();
-					delegates.add(new ViewUsageCollector());
-					delegates.add(new PerspectiveUsageCollector());
-					delegates.add(new CommandUsageCollector());
-					// delegates.add(new CsvOutputCollector());
-					delegates.add(new SummaryCollector());
-
-					DelegatingUsageCollector collector = new DelegatingUsageCollector();
-					collector.setReportTitle("Usage Summary");
-					collector.setDelegates(delegates);
-					generator = new ReportGenerator(UiUsageMonitorPlugin.getDefault().getInteractionLogger(),
-							collector, new JobChangeAdapter() {
-								public void done(IJobChangeEvent event) {
-									try {
-										IWorkbenchPage page = MonitorReportsPlugin.getDefault().getWorkbench()
-												.getActiveWorkbenchWindow().getActivePage();
-										if (page == null)
-											return;
-										IEditorInput input = new UsageStatsEditorInput(files, generator);
-										page.openEditor(input, MonitorReportsPlugin.REPORT_SUMMARY_ID);
-									} catch (PartInitException ex) {
-										StatusManager.log(ex, "couldn't open summary editor");
-									}
-								}
-							});
-
-				}
-			});
-		}
-	}
-
-	/**
-	 * TODO: move
-	 */
-	public static List<File> getStatsFilesFromSelection(ViewPluginAction objectAction) {
-		final List<File> files = new ArrayList<File>();
-		if (objectAction.getSelection() instanceof StructuredSelection) {
-			StructuredSelection structuredSelection = (StructuredSelection) objectAction.getSelection();
-			for (Object object : structuredSelection.toList()) {
-				if (object instanceof IFile) {
-					IFile file = (IFile) object;
-					if (file.getFileExtension().equals("zip"))
-						files.add(new File(file.getLocation().toString()));
-				}
-			}
-		}
-		Collections.sort(files); // ensure that they are sorted by date
-
-		if (files.isEmpty()) {
-			files.add(UiUsageMonitorPlugin.getDefault().getMonitorLogFile());
-		}
-		return files;
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// TODO Auto-generated method stub
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/FocusedUiUserAnalysisAction.java b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/FocusedUiUserAnalysisAction.java
deleted file mode 100644
index df1760b..0000000
--- a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/FocusedUiUserAnalysisAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.reports.ui.actions;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.mylyn.internal.monitor.core.collection.IUsageCollector;
-import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
-import org.eclipse.mylyn.internal.monitor.reports.MonitorReportsPlugin;
-import org.eclipse.mylyn.internal.monitor.reports.collectors.FocusedUiUsageAnalysisCollector;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-import org.eclipse.mylyn.internal.monitor.usage.editors.UsageStatsEditorInput;
-import org.eclipse.mylyn.monitor.usage.ReportGenerator;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.ViewPluginAction;
-
-/**
- * @author Mik Kersten
- */
-public class FocusedUiUserAnalysisAction implements IViewActionDelegate {
-
-	public void init(IViewPart view) {
-		// ignore
-	}
-
-	public void run(IAction action) {
-		if (action instanceof ViewPluginAction) {
-			ViewPluginAction objectAction = (ViewPluginAction) action;
-			final List<File> files = EclipseUsageSummaryAction.getStatsFilesFromSelection(objectAction);
-			if (files.isEmpty()) {
-				files.add(UiUsageMonitorPlugin.getDefault().getMonitorLogFile());
-			}
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					try {
-						List<IUsageCollector> collectors = new ArrayList<IUsageCollector>();
-						collectors.add(new FocusedUiUsageAnalysisCollector());
-						ReportGenerator generator = new ReportGenerator(UiUsageMonitorPlugin.getDefault()
-								.getInteractionLogger(), collectors);
-
-						IWorkbenchPage page = MonitorReportsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow()
-								.getActivePage();
-						if (page == null)
-							return;
-						IEditorInput input = new UsageStatsEditorInput(files, generator);
-						page.openEditor(input, MonitorReportsPlugin.REPORT_USERS_ID);
-					} catch (PartInitException ex) {
-						StatusManager.log(ex, "couldn't open summary editor");
-					}
-				}
-			});
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// TODO Auto-generated method stub
-	}
-}
diff --git a/org.eclipse.mylyn.sandbox.dev-feature/.project b/org.eclipse.mylyn.sandbox.dev-feature/.project
deleted file mode 100644
index 08ed650..0000000
--- a/org.eclipse.mylyn.sandbox.dev-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.sandbox.dev-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.sandbox.dev-feature/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.sandbox.dev-feature/.settings/org.eclipse.mylar.tasklist.prefs
deleted file mode 100644
index c38f544..0000000
--- a/org.eclipse.mylyn.sandbox.dev-feature/.settings/org.eclipse.mylar.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 20 16:54:16 PDT 2006
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.sandbox.dev-feature/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.sandbox.dev-feature/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 30df717..0000000
--- a/org.eclipse.mylyn.sandbox.dev-feature/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:14:51 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.sandbox.dev-feature/about.html b/org.eclipse.mylyn.sandbox.dev-feature/about.html
deleted file mode 100644
index 1aeb16b..0000000
--- a/org.eclipse.mylyn.sandbox.dev-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>May 2, 2006</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.sandbox.dev-feature/build.properties b/org.eclipse.mylyn.sandbox.dev-feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/org.eclipse.mylyn.sandbox.dev-feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/org.eclipse.mylyn.sandbox.dev-feature/epl-v10.html b/org.eclipse.mylyn.sandbox.dev-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.mylyn.sandbox.dev-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.sandbox.dev-feature/feature.xml b/org.eclipse.mylyn.sandbox.dev-feature/feature.xml
deleted file mode 100644
index cf82a6f..0000000
--- a/org.eclipse.mylyn.sandbox.dev-feature/feature.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.mylyn.sandbox.dev_feature"
-      label="Developer and Experimental Tools"
-      version="2.0.0.v20070607-1200"
-      provider-name="Eclipse.org"
-      plugin="org.eclipse.mylyn">
-
-   <description>
-      Mylar Sandbox Tools: http://wiki.eclipse.org/index.php/Mylar_Contributor_Reference#Sandbox
-   </description>
-
-   <copyright>
-      Copyright (c) 2004 - 2006 Mylar project committers and others.
-   </copyright>
-
-   <license>
-      Eclipse Public License - v 1.0
-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&apos;S ACCEPTANCE
-OF THIS AGREEMENT.
-1. DEFINITIONS
-&quot;Contribution&quot; means:
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate
-from and are distributed by that particular Contributor. A Contribution
-&apos;originates&apos; from a Contributor if it was added to the Program
-by such Contributor itself or anyone acting on such Contributor&apos;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.
-&quot;Contributor&quot; means any person or entity that distributes the
-Program.
-&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.
-&quot;Program&quot; means the Contributions distributed in accordance with
-this Agreement.
-&quot;Recipient&quot; means anyone who receives the Program under this
-Agreement, including all Contributors.
-2. GRANT OF RIGHTS
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to 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.
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, 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.
-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&apos;s responsibility to acquire
-that license before distributing the Program.
-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.
-3. REQUIREMENTS
-A Contributor may choose to distribute the Program in object
-code form under its own license agreement, provided that:
-a) it complies with the terms and conditions of this Agreement;
-and
-b) its license agreement:
-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;
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental
-and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement
-are offered by that Contributor alone and not by any other party;
-and
-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.
-When the Program is made available in source code form:
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of
-the Program.
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-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.
-4. COMMERCIAL DISTRIBUTION
-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.
-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&apos;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.
-5. NO WARRANTY
-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.
-6. DISCLAIMER OF LIABILITY
-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.
-7. GENERAL
-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.
-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&apos;s patent(s),
-then such Recipient&apos;s rights granted under Section 2(b) shall
-terminate as of the date such litigation is filed.
-All Recipient&apos;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&apos;s rights under this Agreement terminate, Recipient
-agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient&apos;s obligations under
-this Agreement and any licenses granted by Recipient relating
-to the Program shall continue and survive.
-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.
-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.
-   </license>
-
-   <url>
-      <update label="Mylar for Eclipse 3.3" url="http://download.eclipse.org/technology/mylar/update-site/e3.3"/>
-   </url>
-
-   <requires>
-      <import feature="org.eclipse.mylyn_feature" version="2.0.0.v20070513-1500" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.mylyn.sandbox.dev"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.mylyn.sandbox.dev-feature/license.html b/org.eclipse.mylyn.sandbox.dev-feature/license.html
deleted file mode 100644
index 3259fb9..0000000
--- a/org.eclipse.mylyn.sandbox.dev-feature/license.html
+++ /dev/null
@@ -1,73 +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>January 28, 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>
-
-<p>Content may be apportioned into plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. 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 a Feature.   Plug-ins and Fragments are located in directories
-   named &quot;plugins&quot; and Features are located in directories named &quot;features&quot;.</p>
-  
-<p>Features may also include other Features (&quot;Included Features&quot;). Files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</p>
-  
-<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>Subdirectories 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;.
-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>
-</body>
-</html>
diff --git a/org.eclipse.mylyn.sandbox.dev/.classpath b/org.eclipse.mylyn.sandbox.dev/.classpath
deleted file mode 100644
index 45ae018..0000000
--- a/org.eclipse.mylyn.sandbox.dev/.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="**/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.sandbox.dev/.cvsignore b/org.eclipse.mylyn.sandbox.dev/.cvsignore
deleted file mode 100644
index 4a98758..0000000
--- a/org.eclipse.mylyn.sandbox.dev/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-.fbwarnings
diff --git a/org.eclipse.mylyn.sandbox.dev/.project b/org.eclipse.mylyn.sandbox.dev/.project
deleted file mode 100644
index 86a5287..0000000
--- a/org.eclipse.mylyn.sandbox.dev/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.sandbox.dev</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4f6160a..0000000
--- a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,315 +0,0 @@
-#Wed Jun 06 17:09:48 EDT 2007
-eclipse.preferences.version=1
-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=disabled
-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.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.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-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.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-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.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-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=false
-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_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.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
\ No newline at end of file
diff --git a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 7842faf..0000000
--- a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Feb 05 18:45:19 PST 2007
-eclipse.preferences.version=1
-formatter_profile=_Mylar based on Eclipse [built-in]
-formatter_settings_version=11
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><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><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 - 2006 Mylar committers 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\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">${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}</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></templates>
diff --git a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 52cdd70..0000000
--- a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:31:36 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.mylar.tasklist.prefs
deleted file mode 100644
index 270ff89..0000000
--- a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.mylar.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 20 16:54:42 PDT 2006
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 66d9c80..0000000
--- a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:14:49 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 3076fc8..0000000
--- a/org.eclipse.mylyn.sandbox.dev/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Thu Feb 16 13:46:11 PST 2006
-compilers.p.build=1
-compilers.p.deprecated=2
-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-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.sandbox.dev/META-INF/MANIFEST.MF b/org.eclipse.mylyn.sandbox.dev/META-INF/MANIFEST.MF
deleted file mode 100644
index aab1cce..0000000
--- a/org.eclipse.mylyn.sandbox.dev/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Sandbox Developer Tools
-Bundle-SymbolicName: org.eclipse.mylyn.sandbox.dev;singleton:=true
-Bundle-Version: 2.0.0.v20070607-1200
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.mylyn.context.core,
- org.eclipse.mylyn.tasks.core,
- org.eclipse.core.resources,
- org.eclipse.mylyn.monitor.core,
- org.eclipse.mylyn.context.ui,
- org.eclipse.mylyn.tasks.ui
-Eclipse-AutoStart: true
-Bundle-Vendor: Eclipse.org
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.sandbox.dev/about.html b/org.eclipse.mylyn.sandbox.dev/about.html
deleted file mode 100644
index 0dd939c..0000000
--- a/org.eclipse.mylyn.sandbox.dev/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 7, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.sandbox.dev/build.properties b/org.eclipse.mylyn.sandbox.dev/build.properties
deleted file mode 100644
index 26bd441..0000000
--- a/org.eclipse.mylyn.sandbox.dev/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = plugin.xml,\
-               META-INF/,\
-               about.html,\
-               .
-src.includes = plugin.xml,\
-               src/,\
-               META-INF/,\
-               about.html
-jre.compilation.profile = J2SE-1.5
-source.. = src/
diff --git a/org.eclipse.mylyn.sandbox.dev/plugin.xml b/org.eclipse.mylyn.sandbox.dev/plugin.xml
deleted file mode 100644
index f830d15..0000000
--- a/org.eclipse.mylyn.sandbox.dev/plugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-  
-   <extension point = "org.eclipse.ui.popupMenus">
-     <objectContribution
-        id="org.eclipse.mylyn.ui.instrospection"
-        objectClass="java.lang.Object">
-	    <action  
-  		  	label="Sanbox: Introspect Object" 
-	  		menubarPath="additions" 
-	  		id="org.eclipse.mylyn.sandbox.actions.introspect" 
-	  		class="org.eclipse.mylyn.internal.sandbox.dev.IntrospectObjectAction"
-	  		enablesFor="1"/>
-	 </objectContribution>
-	</extension>
-  
-     <extension point="org.eclipse.ui.decorators">
-      <decorator
-            lightweight="true"
-            label="Sandbox: Interest Level Decorator"
-            class="org.eclipse.mylyn.internal.sandbox.dev.InterestDebuggingDecorator"
-            state="false"
-            id="org.eclipse.mylyn.sandbox.ui.decorator.interest">
-         <description>
-			Appends interest level to nodes
-		 </description>
-         <enablement>
-            <objectClass name="java.lang.Object"/>
-         </enablement>
-      </decorator>
-   </extension>
-  
-</plugin>
diff --git a/org.eclipse.mylyn.sandbox.dev/src/org/eclipse/mylyn/internal/sandbox/dev/InterestDebuggingDecorator.java b/org.eclipse.mylyn.sandbox.dev/src/org/eclipse/mylyn/internal/sandbox/dev/InterestDebuggingDecorator.java
deleted file mode 100644
index 024627e..0000000
--- a/org.eclipse.mylyn.sandbox.dev/src/org/eclipse/mylyn/internal/sandbox/dev/InterestDebuggingDecorator.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.sandbox.dev;
-
-import java.util.ConcurrentModificationException;
-
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.InteractionContextRelation;
-import org.eclipse.mylyn.internal.context.ui.ColorMap;
-import org.eclipse.mylyn.internal.monitor.core.util.StatusManager;
-
-/**
- * @author Mik Kersten
- */
-public class InterestDebuggingDecorator implements ILightweightLabelDecorator {
-
-	public InterestDebuggingDecorator() {
-		super();  
-	}
- 
-	public void decorate(Object element, IDecoration decoration) {
-		AbstractContextStructureBridge bridge = null;
-		try {
-			if (ContextCorePlugin.getDefault() == null)
-				return;
-			bridge = ContextCorePlugin.getDefault().getStructureBridge(element);
-		} catch (ConcurrentModificationException cme) {
-			// ignored, because we can add structure bridges during decoration
-		}
-		try {
-			IInteractionElement node = null;
-			if (element instanceof InteractionContextRelation) {
-				decoration.setForegroundColor(ColorMap.RELATIONSHIP);
-			} else if (element instanceof IInteractionElement) {
-				node = (IInteractionElement) element;
-			} else {
-				if (bridge != null && bridge.getContentType() != null) {
-					node = ContextCorePlugin.getContextManager().getElement(bridge.getHandleIdentifier(element));
-				}
-			}
-			if (node != null) {
-				decoration.addSuffix(" {" + node.getInterest().getValue() + "}");
-			}
-		} catch (Exception e) {
-			StatusManager.log(e, "decoration failed");
-		}
-	}
-
-	public void addListener(ILabelProviderListener listener) {
-		// don't care about listeners
-	}
-
-	public void dispose() {
-		// don't care when we are disposed
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-		// don't care about listeners
-	}
-
-}
diff --git a/org.eclipse.mylyn.sandbox.dev/src/org/eclipse/mylyn/internal/sandbox/dev/IntrospectObjectAction.java b/org.eclipse.mylyn.sandbox.dev/src/org/eclipse/mylyn/internal/sandbox/dev/IntrospectObjectAction.java
deleted file mode 100644
index 7aa8b27..0000000
--- a/org.eclipse.mylyn.sandbox.dev/src/org/eclipse/mylyn/internal/sandbox/dev/IntrospectObjectAction.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.sandbox.dev;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.tasks.core.AbstractTask;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-
-/**
- * @author Mik Kersten
- */
-public class IntrospectObjectAction implements IViewActionDelegate {
-
-	private ISelection currentSelection;
-
-	public void init(IViewPart view) {
-
-	}
-
-	public void run(IAction action) {
-		if (currentSelection instanceof StructuredSelection) {
-			StructuredSelection selection = (StructuredSelection) currentSelection;
-			Object object = selection.getFirstElement();
-
-			String text = "Object class: " + object.getClass() + "\n\n";
-
-			try {
-				AbstractContextStructureBridge bridge = ContextCorePlugin.getDefault().getStructureBridge(object);
-				IInteractionElement node = ContextCorePlugin.getContextManager().getElement(
-						bridge.getHandleIdentifier(object));
-				if (node != null) {
-					text += "Interest value: " + node.getInterest().getValue() + "\n";
-					text += node.getInterest().toString();
-				}
-			} catch (Throwable t) {
-				text += "<no structure bridge>";
-			}
-
-			if (object instanceof IAdaptable) {
-				Object resourceAdapter = ((IAdaptable) object).getAdapter(IResource.class);
-				if (resourceAdapter != null) {
-					text += "\nResource adapter: " + ((IResource) resourceAdapter).getFullPath().toOSString();
-				}
-			}
-
-			if (object instanceof AbstractTask) {
-
-				AbstractTask task = null;
-				if (object instanceof AbstractTask) {
-					task = (AbstractTask) object;
-				}
-				if (task != null) {
-					TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
-							task.getRepositoryKind(), task.getRepositoryUrl());
-					text += "\nLast time in SYNCHRONIZED state: " + task.getLastSyncDateStamp();
-					text += "\nRepository synch time stamp: " + repository.getSyncTimeStamp();
-					text += "\nSync state: " + task.getSyncState();
-					text += "\nParents: " + task.getParentContainers();
-					if (task.getChildren() != null && !task.getChildren().isEmpty()) {
-						text += "\nChildren: ";
-						for (AbstractTask subTask : task.getChildren()) {
-							text += "\n" + subTask;
-						}
-					}
-				}
-			}
-			text += "\n\nNum tasks: " + TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks().size();
-			text += "\nNum queries: " + TasksUiPlugin.getTaskListManager().getTaskList().getQueries().size();
-
-			MessageDialog.openInformation(null, "Mylar Sandbox", text);
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.currentSelection = selection;
-	}
-
-}
diff --git a/org.eclipse.mylyn.sandbox.tests/.classpath b/org.eclipse.mylyn.sandbox.tests/.classpath
deleted file mode 100644
index cc69b55..0000000
--- a/org.eclipse.mylyn.sandbox.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.sandbox.tests/.cvsignore b/org.eclipse.mylyn.sandbox.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.sandbox.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.sandbox.tests/.project b/org.eclipse.mylyn.sandbox.tests/.project
deleted file mode 100644
index 666f7d2..0000000
--- a/org.eclipse.mylyn.sandbox.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.sandbox.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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4f6160a..0000000
--- a/org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,315 +0,0 @@
-#Wed Jun 06 17:09:48 EDT 2007
-eclipse.preferences.version=1
-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=disabled
-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.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.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-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.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-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.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-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=false
-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_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.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
\ No newline at end of file
diff --git a/org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.mylar.tasklist.prefs b/org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.mylar.tasklist.prefs
deleted file mode 100644
index 407161f..0000000
--- a/org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.mylar.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 20 16:54:24 PDT 2006
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 5a3bb9b..0000000
--- a/org.eclipse.mylyn.sandbox.tests/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:14:53 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.sandbox.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.sandbox.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index b484d42..0000000
--- a/org.eclipse.mylyn.sandbox.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Sandbox Tests
-Bundle-SymbolicName: org.eclipse.mylyn.sandbox.tests
-Bundle-Version: 0.0.0
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.mylyn.context.core,
- org.eclipse.mylyn.context.ui,
- org.eclipse.mylyn.java.ui,
- org.eclipse.jdt.core,
- org.eclipse.mylyn.tasks.ui,
- org.eclipse.core.resources,
- org.eclipse.ui.browser,
- org.junit,
- org.eclipse.mylyn.bugzilla.core,
- org.eclipse.mylyn.bugzilla.ui,
- org.eclipse.jface.text,
- org.eclipse.ui.ide,
- org.eclipse.mylyn.java.tests,
- org.eclipse.mylyn.tasks.core,
- org.eclipse.mylyn.monitor.ui,
- org.eclipse.ui.forms,
- org.eclipse.mylyn.sandbox.ui,
- org.eclipse.mylyn.monitor.core,
- org.eclipse.mylyn.monitor.reports,
- org.eclipse.mylyn.monitor.usage,
- org.eclipse.jdt.ui,
- org.eclipse.mylyn.monitor.tests
-Eclipse-LazyStart: true
diff --git a/org.eclipse.mylyn.sandbox.tests/build.properties b/org.eclipse.mylyn.sandbox.tests/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/org.eclipse.mylyn.sandbox.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/AllSandboxTests.java b/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/AllSandboxTests.java
deleted file mode 100644
index 92dc313..0000000
--- a/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/AllSandboxTests.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 Mylar committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.sandbox.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllSandboxTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.mylyn.sandbox.tests");
-		//$JUnit-BEGIN$
-		suite.addTestSuite(StatisticsReportingTest.class);
-		suite.addTestSuite(SharedTaskFolderTest.class);
-		suite.addTestSuite(BugzillaActiveSearchTest.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-}
diff --git a/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/BugzillaActiveSearchTest.java b/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/BugzillaActiveSearchTest.java
deleted file mode 100644
index 81c1f46..0000000
--- a/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/BugzillaActiveSearchTest.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 19, 2004
- */
-package org.eclipse.mylyn.sandbox.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
-import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
-import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
-import org.eclipse.mylyn.internal.context.core.IActiveSearchListener;
-import org.eclipse.mylyn.internal.sandbox.bridge.bugs.BugzillaMylarSearch;
-import org.eclipse.mylyn.internal.sandbox.bridge.bugs.BugzillaReportInfo;
-import org.eclipse.mylyn.internal.sandbox.bridge.bugs.MylarBugsManager;
-import org.eclipse.mylyn.java.tests.search.SearchPluginTestHelper;
-import org.eclipse.mylyn.java.tests.search.WorkspaceSetupHelper;
-import org.eclipse.mylyn.tasks.core.TaskCategory;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.TaskListManager;
-import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
-
-/*
- * TEST CASES TO HANDLE 1. what is here 2. different scopes ( local and remote )
- * 3. no bugs 4. offline bugs
- * 
- * DEGREE OF SEPARATIONS 1 Local bug, qualified reference 2 local bug,
- * unqualified reference 3 remote bug, qualified reference 4 remote bug,
- * unqualified reference 5 NONE
- */
-
-/**
- * Test the bugzilla search functionality of the bridge
- * 
- * @author Shawn Minto
- */
-public class BugzillaActiveSearchTest extends TestCase {
-
-	private TaskRepository repository;
-
-	// SHAWNTODO Add tests for the different types of searches (local qual,
-	// local unqual, fully qual, unqual) and mock up a bugs db for testing
-
-	/** The expected number of results when searching for astNode */
-	// SHAWNTODO add back in when we have a test server mocked up
-	// private static final int NUM_AST_RESULTS = 302;
-	//	
-	// private static final int NUM_AST_SETSOURCERANGE_RESULTS = 15;
-	/** list to add collectors to when notified */
-	private List<List<?>> lists = new ArrayList<List<?>>();
-
-	private IType astNodeType;
-
-	@Override
-	protected void setUp() throws Exception {
-		WorkspaceSetupHelper.setupWorkspace();
-		repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.ECLIPSE_BUGZILLA_URL);
-		TasksUiPlugin.getRepositoryManager().addRepository(repository,
-				TasksUiPlugin.getDefault().getRepositoriesFilePath());
-
-		IJavaProject jp = WorkspaceSetupHelper.getJdtCoreDomProject();
-		astNodeType = WorkspaceSetupHelper.getType(jp, "org.eclipse.jdt.core.dom.ASTNode");
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		WorkspaceSetupHelper.clearDoiModel();
-		TasksUiPlugin.getRepositoryManager().removeRepository(repository,
-				TasksUiPlugin.getDefault().getRepositoriesFilePath());
-	}
-
-	/**
-	 * Test adding and removing ISearchCompletedListeners
-	 */
-	public void testSearchCompletedListenerAddAndRemove() {
-		lists.clear();
-
-		// create 2 listeners
-		IActiveSearchListener l1 = new IActiveSearchListener() {
-			private boolean gathered = false;
-
-			public void searchCompleted(List<?> l) {
-				lists.add(l);
-				gathered = true;
-			}
-
-			public boolean resultsGathered() {
-				return gathered;
-			}
-		};
-		IActiveSearchListener l2 = new IActiveSearchListener() {
-			private boolean gathered = false;
-
-			public void searchCompleted(List<?> l) {
-				lists.add(l);
-				gathered = true;
-			}
-
-			public boolean resultsGathered() {
-				return gathered;
-			}
-		};
-
-		BugzillaMylarSearch s = new BugzillaMylarSearch(BugzillaMylarSearch.UNQUAL, astNodeType,
-				IBugzillaConstants.ECLIPSE_BUGZILLA_URL);
-
-		// add the first listener
-		s.addListener(l1);
-		// remove the first listener
-		s.removeListener(l1);
-
-		// perform the search
-		SearchPluginTestHelper.search(s, l2);
-
-		// make sure that only the second listener added has any results left
-		assertTrue("listener was not removed", lists.size() >= 1 && !l1.resultsGathered());
-		assertTrue("listener was not added", lists.size() == 1);
-
-		// display the time it took for the search
-		MylarBugsManager.getBridge().removeFromLandmarksHash(astNodeType);
-	}
-
-	/**
-	 * Tests that the bridge gets the right data for us This test is wierd because it waits on results.
-	 */
-	public void testBridge() {
-		lists.clear();
-		BugzillaMylarSearch s = new BugzillaMylarSearch(BugzillaMylarSearch.UNQUAL, astNodeType,
-				IBugzillaConstants.ECLIPSE_BUGZILLA_URL);
-
-		IActiveSearchListener l = new IActiveSearchListener() {
-			private boolean gathered = false;
-
-			public void searchCompleted(List<?> results) {
-				lists.add(results);
-				gathered = true;
-			}
-
-			public boolean resultsGathered() {
-				return gathered;
-			}
-		};
-
-		// perform the search
-		SearchPluginTestHelper.search(s, l);
-
-		// make sure we got the right number of bugs back
-		assertTrue("No collector returned", lists.size() != 0);
-		List<?> c = lists.get(0);
-		assertTrue("Results not the right size", c.size() > 0); // TODO should
-		// be
-		// assertEquals
-		// on expected
-		// size
-
-		// display the time it took for the search and the results returned
-		MylarBugsManager.getBridge().removeFromLandmarksHash(astNodeType);
-
-	}
-
-	/**
-	 * Tests that the bridge saves the results of a search so that it can be used later
-	 */
-	public void testSaveResults() {
-		lists.clear();
-		BugzillaMylarSearch s = new BugzillaMylarSearch(BugzillaMylarSearch.UNQUAL, astNodeType,
-				IBugzillaConstants.ECLIPSE_BUGZILLA_URL);
-
-		IActiveSearchListener l = new IActiveSearchListener() {
-			private boolean gathered = false;
-
-			public void searchCompleted(List<?> results) {
-				lists.add(results);
-				gathered = true;
-			}
-
-			public boolean resultsGathered() {
-				return gathered;
-			}
-		};
-
-		// perform the search
-		SearchPluginTestHelper.search(s, l);
-
-		// do an inital search
-		assertTrue("No collectors returned", lists.size() != 0);
-		List<?> c = lists.get(0);
-		assertTrue("Results not the right size", c.size() > 0);
-		// TODO should be assertEquals on expected size
-
-		// check that the search has been saved
-		List<BugzillaReportInfo> saved = MylarBugsManager.getBridge().getFromLandmarksHash(astNodeType,
-				BugzillaMylarSearch.UNQUAL);
-		assertTrue("Results not cached", saved != null);
-		if (saved == null) {
-			fail();
-		} else {
-			assertTrue("Results not the right size", saved.size() > 0);
-			// TODO should be assertEquals on expected size
-
-			assertTrue(c.containsAll(saved) && saved.containsAll(c));
-			MylarBugsManager.getBridge().removeFromLandmarksHash(astNodeType);
-		}
-	}
-
-	public void testLocalBugUnqual() throws InterruptedException {
-		lists.clear();
-
-		String bugPrefix = "<server>-";
-
-		// TaskList t = MylarTaskListPlugin.getTaskListManager().getTaskList();
-		// MylarTaskListPlugin.getTaskListManager().setTaskList(t);
-		TaskListManager manager = TasksUiPlugin.getTaskListManager();
-		TaskCategory cat = new TaskCategory("Testing Category");
-		manager.getTaskList().addCategory(cat);
-		BugzillaTask bugTask1 = new BugzillaTask(bugPrefix, "" + 94185, "<bugzilla info>");
-
-		manager.getTaskList().moveToContainer(bugTask1, cat);
-		// cat.addTask(bugTask1);
-		while (bugTask1.isSynchronizing()) {
-			Thread.sleep(500);
-		}
-		BugzillaTask bugTask2 = new BugzillaTask(bugPrefix, "" + 3692, "<bugzilla info>");
-		manager.getTaskList().moveToContainer(bugTask2, cat);
-		// cat.addTask(bugTask2);
-		while (bugTask2.isSynchronizing()) {
-			Thread.sleep(500);
-		}
-		BugzillaTask bugTask3 = new BugzillaTask(bugPrefix, "" + 3693, "<bugzilla info>");
-		manager.getTaskList().moveToContainer(bugTask3, cat);
-		// cat.addTask(bugTask3);
-		while (bugTask3.isSynchronizing()) {
-			Thread.sleep(500);
-		}
-
-		BugzillaTask bugTask4 = new BugzillaTask(bugPrefix, "" + 9583, "<bugzilla info>");
-		manager.getTaskList().moveToContainer(bugTask4, cat);
-		// cat.addTask(bugTask4);
-		while (bugTask4.isSynchronizing()) {
-			Thread.sleep(500);
-		}
-
-		BugzillaMylarSearch s = new BugzillaMylarSearch(BugzillaMylarSearch.LOCAL_UNQUAL, astNodeType,
-				IBugzillaConstants.ECLIPSE_BUGZILLA_URL);
-
-		IActiveSearchListener l = new IActiveSearchListener() {
-			private boolean gathered = false;
-
-			public void searchCompleted(List<?> results) {
-				lists.add(results);
-				gathered = true;
-			}
-
-			public boolean resultsGathered() {
-				return gathered;
-			}
-		};
-
-		// perform the search
-		SearchPluginTestHelper.search(s, l);
-
-		// do an inital search
-		assertTrue("No collectors returned", lists.size() != 0);
-		List<?> c = lists.get(0);
-		assertEquals("Results not the right size", 3, c.size());
-
-		MylarBugsManager.getBridge().removeFromLandmarksHash(astNodeType);
-		TasksUiPlugin.getTaskListManager().getTaskList().deleteCategory(cat);
-	}
-
-	// TODO need to test a bug that wraps...should fail since we can only search
-	// on a single line
-	public void testLocalBugFullyQual() throws InterruptedException {
-		lists.clear();
-
-		String bugPrefix = "Bugzilla-";
-
-		// TaskList t = MylarTaskListPlugin.getTaskListManager().getTaskList();
-		// MylarTaskListPlugin.getTaskListManager().setTaskList(t);
-		TaskListManager manager = TasksUiPlugin.getTaskListManager();
-		TaskCategory cat = new TaskCategory("Testing Category");
-		manager.getTaskList().addCategory(cat);
-		BugzillaTask bugTask1 = new BugzillaTask(bugPrefix, "" + 94185, "<bugzilla info>");
-		manager.getTaskList().moveToContainer(bugTask1, cat);
-		// cat.addTask(bugTask1);
-		while (bugTask1.isSynchronizing()) {
-			Thread.sleep(500);
-		}
-
-		BugzillaTask bugTask2 = new BugzillaTask(bugPrefix, "" + 9583, "<bugzilla info>");
-		manager.getTaskList().moveToContainer(bugTask2, cat);
-		// cat.addTask(bugTask2);
-		while (bugTask2.isSynchronizing()) {
-			Thread.sleep(500);
-		}
-		BugzillaTask bugTask3 = new BugzillaTask(bugPrefix, "" + 3693, "<bugzilla info>");
-		manager.getTaskList().moveToContainer(bugTask3, cat);
-		// cat.addTask(bugTask3);
-		while (bugTask3.isSynchronizing()) {
-			Thread.sleep(500);
-		}
-
-		BugzillaMylarSearch s = new BugzillaMylarSearch(BugzillaMylarSearch.LOCAL_QUAL, astNodeType,
-				IBugzillaConstants.ECLIPSE_BUGZILLA_URL);
-
-		IActiveSearchListener l = new IActiveSearchListener() {
-			private boolean gathered = false;
-
-			public void searchCompleted(List<?> results) {
-				lists.add(results);
-				gathered = true;
-			}
-
-			public boolean resultsGathered() {
-				return gathered;
-			}
-		};
-
-		// perform the search
-		SearchPluginTestHelper.search(s, l);
-
-		// do an inital search
-		assertTrue("No collectors returned", lists.size() != 0);
-		List<?> c = lists.get(0);
-		assertEquals("Results not the right size", 1, c.size());
-
-		MylarBugsManager.getBridge().removeFromLandmarksHash(astNodeType);
-		TasksUiPlugin.getTaskListManager().getTaskList().deleteCategory(cat);
-	}
-
-}
diff --git a/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/SharedTaskFolderTest.java b/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/SharedTaskFolderTest.java
deleted file mode 100644
index 64157dd..0000000
--- a/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/SharedTaskFolderTest.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package org.eclipse.mylyn.sandbox.tests;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Calendar;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.sandbox.ui.SandboxUiPlugin;
-import org.eclipse.mylyn.internal.sandbox.ui.actions.SwitchTaskDataFolderAction;
-import org.eclipse.mylyn.internal.tasks.core.LocalTask;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.tasks.core.AbstractTask;
-import org.eclipse.mylyn.tasks.ui.TaskListManager;
-import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
-
-/**
- * Tests changing the shared task directory
- * currently in use.
- * 
- * @author Wesley Coelho
- */
-public class SharedTaskFolderTest extends TestCase{
-
-	private File sharedDataRootDir = null;
-	private File bobsDataDir = null;
-	private File jillsDataDir = null;
-	private String originalMainDataDir = null;
-	private String originalSharedDataDir = null;
-	private TaskListManager manager = TasksUiPlugin.getTaskListManager(); 
-	
-	/**
-	 * Set up a shared task directory structure by creating some data
-	 * in the main directory and copying it to the shared directories.
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		//Get the original main data directory so that it can be reset later
-		originalMainDataDir = TasksUiPlugin.getDefault().getDataDirectory();
-		
-		//Create a task to make sure there is some data in the main directory
-		createAndSaveTask("Task1");
-		
-		//Create the shared data directory structure
-		sharedDataRootDir = new File(TasksUiPlugin.getDefault().getDataDirectory() + File.separator + "SharedDataDir");
-		sharedDataRootDir.mkdir();
-		assertTrue(sharedDataRootDir.exists());	
-		
-		bobsDataDir = new File(sharedDataRootDir.getPath() + File.separator + "Bob");
-		bobsDataDir.mkdir();
-		assertTrue(bobsDataDir.exists());
-		
-		jillsDataDir = new File(sharedDataRootDir.getPath() + File.separator + "Jill");
-		jillsDataDir.mkdir();
-		assertTrue(jillsDataDir.exists());
-
-		//Start the shared data dirs off with copies of the main data
-		File mainDataDir = new File(originalMainDataDir);
-		for ( File currFile : mainDataDir.listFiles()) {
-			File destFile = new File(bobsDataDir.getPath() + File.separator + currFile.getName());
-			copy(currFile, destFile);
-			destFile = new File(jillsDataDir.getPath() + File.separator + currFile.getName());
-			copy(currFile, destFile);
-		}
-		
-		//Set the shared data dir
-		originalSharedDataDir = SandboxUiPlugin.getDefault().getSharedDataDirectoryManager().getSharedDataDirectory();
-//		MylarReportsPlugin.getDefault().getPreferenceStore().setValue(MylarReportsPlugin.SHARED_TASK_DATA_ROOT_DIR, sharedDataRootDir.getPath());
-		SandboxUiPlugin.getDefault().getSharedDataDirectoryManager().setSharedDataDirectory(sharedDataRootDir.getPath());
-		assertFalse(TasksUiPlugin.getDefault().getDataDirectory().equals(sharedDataRootDir.getPath()));
-	}
-	
-	/**
-	 * Tests moving the main mylar data directory to another location
-	 */
-	public void testSharedDataDirSwitching(){
-		SwitchTaskDataFolderAction switchAction = new SwitchTaskDataFolderAction();
-		
-		//Create a task to appear in the main data dir only
-		AbstractTask mainDataDirTask = createAndSaveTask("Main Dir Task");
-		
-		//Check the options of folders to switch to
-		String[] sharedDataFolderOptions = switchAction.getFolderStrings();
-		//Note that index 0 is a string indicating a switch back to the main data directory
-		assertTrue(sharedDataFolderOptions[0].equals("Bob"));
-		assertTrue(sharedDataFolderOptions[1].equals("Jill"));
-		
-		//Switch to Bob's folder
-		switchAction.switchTaskDataFolder(sharedDataFolderOptions[0]);
-		
-		//Check that the task created in the main data dir isn't there
-		File mainDataDirTaskFile = ContextCorePlugin.getContextManager().getFileForContext(mainDataDirTask.getHandleIdentifier());
-//		File mainDataDirTaskFile = new File(ContextCorePlugin.getDefault().getDataDirectory() + File.separator + mainDataDirTask.getContextPath() + MylarTaskListPlugin.FILE_EXTENSION);
-		assertFalse(mainDataDirTaskFile.exists());
-		assertNull(manager.getTaskList().getTask(mainDataDirTask.getHandleIdentifier()));
-		
-		fail(); // uncomment below
-		//Create a new task in bob's task data folder only and check that it exists in the right place
-//		ITask bobsTask = createAndSaveTask("Bob's Task");
-//		
-//		File bobsTaskFile = new File(bobsDataDir.getPath() + File.separator + 
-//				ContextCorePlugin.getContextManager().getFileForContext(mainDataDirTask.getHandleIdentifier()).getName());
-//		assertTrue(bobsTaskFile.exists());
-//		bobsTaskFile = new File(ContextCorePlugin.getDefault().getDataDirectory() + File.separator + bobsTask.getContextPath() + MylarTaskListPlugin.FILE_EXTENSION);
-//		assertTrue(bobsTaskFile.exists());
-//		assertNotNull(manager.getTaskForHandle(bobsTask.getHandleIdentifier(), false));
-//		
-//		//Switch to Jill's folder
-//		switchAction.switchTaskDataFolder(sharedDataFolderOptions[1]);
-//		
-//		//Check that Bob's task isn't there
-//		bobsTaskFile = new File(ContextCorePlugin.getDefault().getDataDirectory() + File.separator + bobsTask.getContextPath() + MylarTaskListPlugin.FILE_EXTENSION);
-//		assertFalse(bobsTaskFile.exists());
-//		assertNull(manager.getTaskForHandle(bobsTask.getHandleIdentifier(), false));		
-//		
-//		//Switch back to Bob's folder
-//		switchAction.switchTaskDataFolder(sharedDataFolderOptions[0]);
-//		
-//		//Check that bob's task is still there
-//		bobsTaskFile = new File(ContextCorePlugin.getDefault().getDataDirectory() + File.separator + bobsTask.getContextPath() + MylarTaskListPlugin.FILE_EXTENSION);
-//		assertTrue(bobsTaskFile.exists());
-//		assertNotNull(manager.getTaskForHandle(bobsTask.getHandleIdentifier(), false));			
-//		
-//		//Switch back to the main data folder
-//		sharedDataFolderOptions = switchAction.getFolderStrings();
-//		switchAction.switchTaskDataFolder(sharedDataFolderOptions[0]);
-//		
-//		//Check that the main task is there
-//		mainDataDirTaskFile = new File(ContextCorePlugin.getDefault().getDataDirectory() + File.separator + mainDataDirTask.getContextPath() + MylarTaskListPlugin.FILE_EXTENSION);
-//		assertTrue(mainDataDirTaskFile.exists());
-//		assertNotNull(manager.getTaskForHandle(mainDataDirTask.getHandleIdentifier(), false));			
-		
-	}
-		
-	/**
-	 * Creates a task with an interaction event and checks that it has
-	 * been properly saved in the currently active data directory
-	 */
-	protected AbstractTask createAndSaveTask(String taskName){
-		
-		//Create the task and add it to the root of the task list
-		AbstractTask newTask = new LocalTask("" + Calendar.getInstance().getTimeInMillis(), taskName);
-		manager.getTaskList().moveToContainer(newTask, manager.getTaskList().getDefaultCategory());
-		InteractionContext mockContext = ContextCorePlugin.getContextManager().loadContext(newTask.getHandleIdentifier());//, newTask.getContextPath());
-		InteractionEvent event = new InteractionEvent(InteractionEvent.Kind.EDIT,"structureKind","handle","originId");
-		mockContext.parseEvent(event);
-		ContextCorePlugin.getContextManager().activateContext(mockContext);
-
-		fail(); // uncomment below
-//		//Save the context file and check that it exists
-//		ContextCorePlugin.getContextManager().saveContext(mockContext.getId());//, newTask.getContextPath());
-//		File taskFile = new File(ContextCorePlugin.getDefault().getDataDirectory() + File.separator + newTask.getContextPath() + MylarContextManager.CONTEXT_FILE_EXTENSION);
-//		assertTrue(ContextCorePlugin.getContextManager().hasContext(newTask.getContextPath()));
-//		assertTrue(taskFile.exists());			
-		
-		return newTask;
-	}
-		
-	protected void tearDown() throws Exception{
-		
-		//Reset the shared directory to the original value
-		SandboxUiPlugin.getDefault().getSharedDataDirectoryManager().setSharedDataDirectory(originalSharedDataDir);
-//		MylarReportsPlugin.getDefault().getPreferenceStore().setValue(MylarReportsPlugin.SHARED_TASK_DATA_ROOT_DIR, originalSharedDataDir);
-		
-		//Delete the test shared data directories
-		deleteDir(bobsDataDir);
-		deleteDir(jillsDataDir);
-		deleteDir(sharedDataRootDir);
-		
-		super.tearDown();
-	}
-	
-	private void deleteDir(File targetDir){
-		File[] files = targetDir.listFiles();
-		for (File file : files) {
-			file.delete();
-		}
-		
-		targetDir.delete();
-		assertFalse(targetDir.exists());
-	}
-	
-	// Note: Copied from MylarTaskListPlugin
-	private boolean copy(File src, File dst) {
-		try {
-			InputStream in = new FileInputStream(src);
-			OutputStream out = new FileOutputStream(dst);
-
-			// Transfer bytes from in to out
-			byte[] buf = new byte[1024];
-			int len;
-			while ((len = in.read(buf)) > 0) {
-				out.write(buf, 0, len);
-			}
-			in.close();
-			out.close();
-			return true;
-		} catch (IOException ioe) {
-			return false;
-		}
-	}
-	
-}
diff --git a/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/StatisticsReportingTest.java b/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/StatisticsReportingTest.java
deleted file mode 100644
index 2629d38..0000000
--- a/org.eclipse.mylyn.sandbox.tests/src/org/eclipse/mylyn/sandbox/tests/StatisticsReportingTest.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     University Of British Columbia - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.sandbox.tests;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.mylyn.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.context.ui.ContextUiPlugin;
-import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
-import org.eclipse.mylyn.internal.java.ui.actions.FocusPackageExplorerAction;
-import org.eclipse.mylyn.internal.monitor.core.collection.IUsageCollector;
-import org.eclipse.mylyn.internal.monitor.reports.collectors.FocusedUiUsageAnalysisCollector;
-import org.eclipse.mylyn.internal.monitor.reports.collectors.FocusedUiViewUsageCollector;
-import org.eclipse.mylyn.internal.monitor.usage.InteractionEventLogger;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.ui.MonitorUiPlugin;
-import org.eclipse.mylyn.monitor.usage.ReportGenerator;
-import org.eclipse.mylyn.monitor.usage.UsageStatisticsSummary;
-
-/**
- * @author Mik Kersten
- */
-public class StatisticsReportingTest extends TestCase {
-
-	private InteractionEventLogger logger;
-
-	private FocusedUiViewUsageCollector viewCollector = new FocusedUiViewUsageCollector();
-
-	private FocusedUiUsageAnalysisCollector editRatioCollector = new FocusedUiUsageAnalysisCollector();;
-
-	private ReportGenerator report;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		assertNotNull(ContextCorePlugin.getDefault());
-		assertNotNull(JavaUiBridgePlugin.getDefault());
-		assertNotNull(PackageExplorerPart.openInActivePerspective());
-
-		UiUsageMonitorPlugin.getDefault().startMonitoring();
-		assertTrue(UiUsageMonitorPlugin.getDefault().isMonitoringEnabled());
-		logger = UiUsageMonitorPlugin.getDefault().getInteractionLogger();
-		logger.clearInteractionHistory();
-
-		List<IUsageCollector> collectors = new ArrayList<IUsageCollector>();
-		collectors.add(viewCollector);
-		collectors.add(editRatioCollector);
-		report = new ReportGenerator(logger, collectors);
-		report.forceSyncForTesting(true);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	protected InteractionEvent mockExplorerSelection(String handle) {
-		InteractionEvent event = new InteractionEvent(InteractionEvent.Kind.SELECTION, "java", handle,
-				JavaUI.ID_PACKAGES);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(event);
-		return event;
-	}
-
-	protected void mockEdit(String handle) {
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(
-				new InteractionEvent(InteractionEvent.Kind.EDIT, "java", handle, JavaUI.ID_PACKAGES));
-	}
-
-	protected void mockTypesSelection(String handle) {
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(
-				new InteractionEvent(InteractionEvent.Kind.SELECTION, "java", handle, JavaUI.ID_TYPES_VIEW));
-	}
-
-	public void testEditRatio() throws InvocationTargetException, InterruptedException {
-		logger.stopMonitoring();
-		PackageExplorerPart part = PackageExplorerPart.openInActivePerspective();
-		assertNotNull(part.getTreeViewer());
-		part.setFocus();
-
-		logger.startMonitoring();
-		final InteractionEvent first = mockExplorerSelection("A.java");
-		mockUserDelay();
-		mockUserDelay();
-		final InteractionEvent second = mockExplorerSelection("A.java");
-
-		assertTrue(!first.getDate().equals(second.getDelta()));
-
-		try {
-			// XXX: this is a hack and sensitive to CPU speeds
-			Thread.sleep(3000);
-		} catch (InterruptedException ie) {
-			fail();
-		}
-
-		mockEdit("A.java");
-
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(
-				InteractionEvent.makeCommand(TaskActivateAction.ID, ""));
-
-		mockExplorerSelection("A.java");
-		mockEdit("A.java");
-		mockUserDelay();
-		mockEdit("A.java");
-
-		logger.stopMonitoring();
-		report.getStatisticsFromInteractionHistory(logger.getOutputFile(), null);
-
-		// TODO: these are off from expected when test run alone, due to unknown
-		// element selections
-		assertEquals(0.5f, editRatioCollector.getBaselineRatio(-1));
-		assertEquals(2f, editRatioCollector.getMylarRatio(-1));
-	}
-
-	@SuppressWarnings("unused")
-	public void testSimpleSelection() {
-		mockExplorerSelection("A.java");
-		report.getStatisticsFromInteractionHistory(logger.getOutputFile(), new JobChangeAdapter() {
-			public void done() {
-				UsageStatisticsSummary summary = report.getLastParsedSummary();
-				assertTrue(summary.getSingleSummaries().size() > 0);
-			}
-		});
-
-	}
-
-	@SuppressWarnings("unused")
-	public void testFilteredModeDetection() throws IOException {
-		UiUsageMonitorPlugin.getDefault().addMonitoredPreferences(
-				ContextUiPlugin.getDefault().getPluginPreferences());
-
-		UiUsageMonitorPlugin.getDefault().getInteractionLogger().clearInteractionHistory();
-		mockExplorerSelection("A.java");
-		mockUserDelay();
-		mockExplorerSelection("A.java");
-		mockUserDelay();
-		mockTypesSelection("A.java");
-
-		assertNotNull(ContextUiPlugin.getDefault().getPreferenceStore());
-		String prefId = FocusPackageExplorerAction.PREF_ID_PREFIX + JavaUI.ID_PACKAGES;
-		assertNotNull(prefId);
-
-		PackageExplorerPart part = PackageExplorerPart.openInActivePerspective();
-		assertNotNull(part);
-		// AbstractFocusViewAction action =
-		// FocusPackageExplorerAction.getActionForPart(part);
-		// assertNotNull(action);
-
-		ContextUiPlugin.getDefault().getPreferenceStore().setValue(prefId, true);
-
-		mockExplorerSelection("A.java");
-		mockUserDelay();
-		mockExplorerSelection("A.java");
-		mockUserDelay();
-		mockTypesSelection("A.java");
-
-		ContextUiPlugin.getDefault().getPreferenceStore().setValue(prefId, false);
-
-		mockExplorerSelection("A.java");
-
-		logger.stopMonitoring();
-		report.getStatisticsFromInteractionHistory(logger.getOutputFile(), new JobChangeAdapter() {
-
-			public void done() {
-				int normal = viewCollector.getNormalViewSelections().get(JavaUI.ID_PACKAGES);
-				assertEquals(5, normal);
-
-				int filtered = viewCollector.getFilteredViewSelections().get(JavaUI.ID_PACKAGES);
-				assertEquals(2, filtered);
-
-				UiUsageMonitorPlugin.getDefault().removeMonitoredPreferences(
-						ContextUiPlugin.getDefault().getPluginPreferences());
-			}
-		});
-
-	}
-
-	/**
-	 * Delay enough to make replicated events different
-	 */
-	private void mockUserDelay() {
-		// TODO: Refactor into mylar.core.tests
-		try {
-			// XXX: this could be sensitive to CPU speeds
-			Thread.sleep(100);
-		} catch (InterruptedException ie) {
-			fail();
-		}
-	}
-}