Revert "Bug 338845 - [Help] Upgrade org.eclipse.help.base to Java 1.5"

This reverts commit c378586f7a02ff73f86dffa690ba462e83ff83d5.

41 files changed, 729 insertions, 748 deletions

diff --git a/org.eclipse.help.base/.classpath b/org.eclipse.help.base/.classpath
index 5100de58b..2e51f1c6d 100644
--- a/org.eclipse.help.base/.classpath
+++ b/org.eclipse.help.base/.classpath
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="src" output="bin2" path="src_ant"/>

-	<classpathentry kind="src" path="src_demo"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry output="bin2" kind="src" path="src_ant"/>
+	<classpathentry kind="src" path="src_demo"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs
index b2ceb7be9..62bfe1744 100644
--- a/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs
@@ -1,326 +1,301 @@
-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.compliance=1.5

-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.comparingIdentical=warning

-org.eclipse.jdt.core.compiler.problem.deadCode=warning

-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.fallthroughCase=ignore

-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled

-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.includeNullInfoFromAsserts=disabled

-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.missingHashCodeMethod=ignore

-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore

-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error

-org.eclipse.jdt.core.compiler.problem.nullReference=ignore

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore

-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore

-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore

-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore

-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore

-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore

-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore

-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled

-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.unavoidableGenericTypeProblems=enabled

-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=warning

-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.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=16

-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=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1

-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=0

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-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.format_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=true

-org.eclipse.jdt.core.formatter.comment.format_html=true

-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=100

-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_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=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_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_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=110

-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=4

-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

+#Thu May 04 15:21:36 EDT 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+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=error
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.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.3
+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=16
+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=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+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=0
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+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.format_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+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=100
+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_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_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_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=110
+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=4
+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
diff --git a/org.eclipse.help.base/META-INF/MANIFEST.MF b/org.eclipse.help.base/META-INF/MANIFEST.MF
index 9d199492a..7fb6e76f5 100644
--- a/org.eclipse.help.base/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.base/META-INF/MANIFEST.MF
@@ -47,5 +47,5 @@ Require-Bundle: org.apache.lucene;bundle-version="[2.9.0,3.0.0)";visibility:=ree
  org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)"
 Import-Package: com.ibm.icu.text,
  org.eclipse.equinox.http.jetty;resolution:=optional
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java
index 4f7843e6e..6a1351f2d 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java
@@ -45,7 +45,7 @@ public class BookmarkManager extends Observable {
 	// everything changed (by the webapp)
 	public static final int WORLD_CHANGED = 5;
 	
-	private ArrayList<Bookmark> bookmarks;
+	private ArrayList bookmarks;
 
 	public static class Bookmark implements IHelpResource {
 		private String label;
@@ -166,7 +166,7 @@ public class BookmarkManager extends Observable {
 		if (bookmarks==null) {
 			String value = readBookmarks();
 			StringTokenizer tokenizer = new StringTokenizer(value, ","); //$NON-NLS-1$
-			bookmarks = new ArrayList<Bookmark>();
+			bookmarks = new ArrayList();
 			while (tokenizer.hasMoreTokens()) {
 				String bookmark = tokenizer.nextToken();
 				// url and title are separated by vertical bar
@@ -177,7 +177,7 @@ public class BookmarkManager extends Observable {
 				bookmarks.add(new Bookmark(label, href));
 			}
 		}
-		return bookmarks.toArray(new IHelpResource[bookmarks.size()]);
+		return (IHelpResource[])bookmarks.toArray(new IHelpResource[bookmarks.size()]);
 	}
 
 	/**
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/MissingContentManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/MissingContentManager.java
index 04cf02f2d..af5f66d7b 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/MissingContentManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/MissingContentManager.java
@@ -54,7 +54,7 @@ public class MissingContentManager {
 	 * A place holder defines a page to be shown when a documentation page

 	 * which matches the specified path not installed

 	 */

-	public static class Placeholder implements Comparable<Placeholder> {

+	public static class Placeholder implements Comparable {

 		public String path;

 		public String bundle;

 		public String placeholderPage;

@@ -65,14 +65,19 @@ public class MissingContentManager {
 			this.placeholderPage = placeholderPage;

 		}

 

-		public int compareTo(Placeholder o) {

-			return o.path.compareTo(path);

+		public int compareTo(Object arg0) {

+			// Sort in reverse order so more qualified strings appear before

+			// less qualified substrings

+			if (arg0 instanceof Placeholder) {

+				return((Placeholder)arg0).path.compareTo(path);

+			}

+			return 0;

 		}

 	}

 	

 	private static MissingContentManager instance;

-	private List<Placeholder> placeholders;

-    private Set<String> bundlesToIgnore; // A set of bundles the user does not want to see reference to

+	private List placeholders;

+    private Set bundlesToIgnore; // A set of bundles the user does not want to see reference to

 	

 	public static MissingContentManager getInstance() {

 		if ( instance == null ) {

@@ -86,8 +91,8 @@ public class MissingContentManager {
 	 */

 	private MissingContentManager() {

         IExtensionRegistry registry = Platform.getExtensionRegistry();

-        placeholders = new ArrayList<Placeholder>();

-        bundlesToIgnore = new HashSet<String>();

+        placeholders = new ArrayList();

+        bundlesToIgnore = new HashSet();

         if ( BaseHelpSystem.getMode() == BaseHelpSystem.MODE_INFOCENTER ) {

         	return; // Placeholders are not shown for infocenters

         }

@@ -128,8 +133,8 @@ public class MissingContentManager {
 	 * @return a place holder page if defined, otherwise an error page

 	 */

 	public String getPageNotFoundPage(String path, boolean showPlaceholderPage) {

-		for (Iterator<Placeholder> iter = placeholders.iterator(); iter.hasNext(); ) {

-			Placeholder placeholder = iter.next();

+		for (Iterator iter = placeholders.iterator(); iter.hasNext(); ) {

+			Placeholder placeholder = (Placeholder) iter.next();

 			if (path.startsWith(placeholder.path) && Platform.getBundle(placeholder.bundle) == null) {

 				if ( showPlaceholderPage) {

 				    return placeholder.placeholderPage;

@@ -181,10 +186,10 @@ public class MissingContentManager {
 	}

 

 	public Placeholder[] getUnresolvedPlaceholders() {

-		List<Placeholder> unresolved;

-		unresolved = new ArrayList<Placeholder>();

-		for (Iterator<Placeholder> iter = placeholders.iterator(); iter.hasNext(); ) {			

-			Placeholder ph = iter.next();

+		List unresolved;

+		unresolved = new ArrayList();

+		for (Iterator iter = placeholders.iterator(); iter.hasNext(); ) {			

+			Placeholder ph = (Placeholder) iter.next();

 			String bundle = ph.bundle;

 			if (bundle != null && !bundlesToIgnore.contains(bundle) ) {

 			    if (Platform.getBundle(bundle) == null ) {

@@ -192,7 +197,7 @@ public class MissingContentManager {
 			    }

 			}

 		}

-		return unresolved.toArray(new Placeholder[unresolved.size()]);

+		return (Placeholder[]) unresolved.toArray(new Placeholder[unresolved.size()]);

 	}

 	

 	// Modifies the preferences to ignore any bundles that are currently unresolved placeholders

diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java
index d0913a4ea..04ea073c2 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2011 IBM Corporation and others.
+ * Copyright (c) 2008, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -192,8 +192,8 @@ public class PreferenceFileHandler {
 	 * This method returns an ArrayList containing all RemoteIC entries in the preferences
 	 * 
 	 */
-	public ArrayList<RemoteIC> getRemoteICList() {
-		ArrayList<RemoteIC> remoteICList = new ArrayList<RemoteIC>();
+	public ArrayList getRemoteICList() {
+		ArrayList remoteICList = new ArrayList();
 
 		// Load the preferences in org.eclipse.help.base/preferences.ini
 		RemoteIC initRemoteIC;
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContentLocator.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContentLocator.java
index fc7740855..08efb26b0 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContentLocator.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContentLocator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2011 IBM Corporation and others.
+ * Copyright (c) 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,12 +10,13 @@
  *******************************************************************************/
 package org.eclipse.help.internal.base.remote;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
 public class RemoteContentLocator {
 
-	private static Map<String, String> InfoCenterMap = null; // hash table
+	private static Map InfoCenterMap = null; // hash table
 
 	public RemoteContentLocator() {
 		
@@ -24,7 +25,8 @@ public class RemoteContentLocator {
 	public static void addContentPage(String contributorID, String InfoCenterUrl) {
 		
 		if (InfoCenterMap == null){
-			InfoCenterMap = new TreeMap<String, String>(); // sorted map
+			InfoCenterMap = new HashMap();
+			InfoCenterMap = new TreeMap(); // sorted map
 		}
 		
 		InfoCenterMap.put(contributorID, InfoCenterUrl);
@@ -39,7 +41,7 @@ public class RemoteContentLocator {
 		return (String)key;
 	}
 
-	public static Map<String, String> getInfoCenterMap() {
+	public static Map getInfoCenterMap() {
 		return InfoCenterMap;
 	}
 
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
index 4b0388b53..eff6866fe 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -41,7 +41,7 @@ public class RemoteExtensionProvider extends AbstractContentExtensionProvider {
 	
 	public IContentExtension[] getContentExtensions(String locale) {
 		if (RemoteHelp.isEnabled()) {
-			List<IContentExtension> contributions = new ArrayList<IContentExtension>();
+			List contributions = new ArrayList();
 			PreferenceFileHandler handler = new PreferenceFileHandler();
 			String isEnabled[] = handler.isEnabled();
 			for (int ic = 0; ic < handler.getTotalRemoteInfocenters(); ic++) {
@@ -85,7 +85,7 @@ public class RemoteExtensionProvider extends AbstractContentExtensionProvider {
 					}
 				}
 			}
-			return contributions.toArray(new IContentExtension[contributions.size()]);
+			return (IContentExtension[]) contributions.toArray(new IContentExtension[contributions.size()]);
 		}
 		return new IContentExtension[0];
 	}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchParser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchParser.java
index a76074e11..27c0c4602 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchParser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -35,15 +35,15 @@ import org.xml.sax.helpers.DefaultHandler;
 public class RemoteSearchParser extends DefaultHandler {
 
 	private SAXParser parser;
-	private Stack<SearchHit> stack;
-	private List<SearchHit> hits;
+	private Stack stack;
+	private List hits;
 	private StringBuffer summary;
 
 	/*
 	 * Parses the given serialized search hits and returns generated model
 	 * objects (SearchHit objects).
 	 */
-	public List<SearchHit> parse(InputStream in, IProgressMonitor monitor) throws ParserConfigurationException, SAXException, IOException {
+	public List parse(InputStream in, IProgressMonitor monitor) throws ParserConfigurationException, SAXException, IOException {
 		monitor.beginTask("", 1); //$NON-NLS-1$
 		init();
 		parser.parse(in, this);
@@ -58,13 +58,13 @@ public class RemoteSearchParser extends DefaultHandler {
 	 */
 	private void init() throws ParserConfigurationException, SAXException {
 		if (hits == null) {
-			hits = new ArrayList<SearchHit>();
+			hits = new ArrayList();
 		}
 		else if (!hits.isEmpty()) {
 			hits.clear();
 		}
 		if (stack == null) {
-			stack = new Stack<SearchHit>();
+			stack = new Stack();
 		}
 		else if (!stack.isEmpty()) {
 			stack.clear();
@@ -96,7 +96,7 @@ public class RemoteSearchParser extends DefaultHandler {
 		}
 		else if (qName.equals("summary") && summary != null) { //$NON-NLS-1$
 			// collect the summary from the buffer
-			SearchHit hit = stack.peek();
+			SearchHit hit = (SearchHit)stack.peek();
 			hit.setSummary(summary.toString());
 			summary = null;
 		}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java
index 966f01cec..0657be97c 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2011 IBM Corporation and others.
+ * Copyright (c) 2009, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,12 +34,12 @@ public class RemoteStatusData {
 	 */
 	public static boolean isAnyRemoteHelpUnavailable()
 	{
-		ArrayList<URL> sites = getRemoteSites();
+		ArrayList sites = getRemoteSites();
 		if (sites.isEmpty())
 			return false;
 
 		for (int s=0;s<sites.size();s++)
-			if (!isConnected(sites.get(s)))
+			if (!isConnected((URL)sites.get(s)))
 				return true;
 		
 		return false;
@@ -85,9 +85,9 @@ public class RemoteStatusData {
 	 * 
 	 * Returns the ArrayList with sites in URL form
 	 */
-	public static ArrayList<URL> getRemoteSites()
+	public static ArrayList getRemoteSites()
 	{
-		ArrayList<URL> sites = new ArrayList<URL>();
+		ArrayList sites = new ArrayList();
 		
 		boolean remoteHelpEnabled = 
 			Platform.getPreferencesService().getBoolean(
@@ -132,12 +132,12 @@ public class RemoteStatusData {
 	{
 		private static ConnectionCache instance;
 		
-		private Hashtable<URL, Boolean> cache;
+		private Hashtable cache;
 		private long start;
 		
 		private ConnectionCache(){
 		
-			cache = new Hashtable<URL, Boolean>();
+			cache = new Hashtable();
 			resetTimer();
 		}
 		
@@ -169,7 +169,7 @@ public class RemoteStatusData {
 		
 		public boolean isConnected(URL url) throws CoreException
 		{
-			Boolean b = cache.get(url);
+			Boolean b = (Boolean)cache.get(url);
 			if (b==null)
 				throw new CoreException(new Status(IStatus.ERROR,HelpBasePlugin.PLUGIN_ID,"Cache Unavailable")); //$NON-NLS-1$
 			
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/CriteriaHelpScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/CriteriaHelpScope.java
index 2db667840..03b1475b8 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/CriteriaHelpScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/CriteriaHelpScope.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
+ * Copyright (c) 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -72,18 +72,18 @@ public class CriteriaHelpScope extends AbstractHelpScope {
 		if(null == criteriaScope){
 			return true;
 		}
-		Map<String, Set> ownCriteria = getCriteriaInfo(criteriaOfTopic);
-		Map<String, Set> scope = getCriteriaInfo(criteriaScope);
-		outer: for (Iterator<String> keyIterator = scope.keySet().iterator(); keyIterator.hasNext();) {
+		Map ownCriteria = getCriteriaInfo(criteriaOfTopic);
+		Map scope = getCriteriaInfo(criteriaScope);
+		outer: for (Iterator keyIterator = scope.keySet().iterator(); keyIterator.hasNext();) {
 			String key = String.valueOf(keyIterator.next());
-			for (Iterator valueIterator = scope.get(key).iterator(); valueIterator.hasNext();) {
+			for (Iterator valueIterator = ((Set)scope.get(key)).iterator(); valueIterator.hasNext();) {
 				String value = String.valueOf(valueIterator.next());
 				if (value.equals(UNCATEGORIZED)) {
 					if (!ownCriteria.containsKey(key)) {
 						continue outer;						
 					}
 				} else {
-					if (null != ownCriteria.get(key) && ownCriteria.get(key).contains(value))
+					if (null != ownCriteria.get(key) && ((Set)ownCriteria.get(key)).contains(value))
 						continue outer;					
 				}
 			}
@@ -92,14 +92,14 @@ public class CriteriaHelpScope extends AbstractHelpScope {
 		return true;
 	}
 
-	private Map<String, Set> getCriteriaInfo(CriterionResource[] criteria) {
-		Map<String, Set> criteriaMap = new HashMap<String, Set>();
+	private Map getCriteriaInfo(CriterionResource[] criteria) {
+		Map criteriaMap = new HashMap();
 		CriteriaUtilities.addCriteriaToMap(criteriaMap, criteria);
 		return criteriaMap;
 	}
 	
-	private Map<String, Set> getCriteriaInfo(ICriteria[] criteria) {
-		Map<String, Set> criteriaMap = new HashMap<String, Set>();
+	private Map getCriteriaInfo(ICriteria[] criteria) {
+		Map criteriaMap = new HashMap();
 		CriteriaUtilities.addCriteriaToMap(criteriaMap, criteria);
 	    return criteriaMap;
 	}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java
index 87697fab3..596f4fe27 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
+ * Copyright (c) 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,7 +34,7 @@ public class ScopeRegistry {
 	public static final String SCOPE_AND = "^"; //$NON-NLS-1$
 	public static final String SCOPE_OR = "|"; //$NON-NLS-1$
 
-	private static List<IScopeHandle> scopes = null;
+	private static List scopes = null;
 	
 	private static ScopeRegistry instance;
 
@@ -57,8 +57,8 @@ public class ScopeRegistry {
 		
 		
 		// Lookup in scope registry
-		for (Iterator<IScopeHandle> iter = scopes.iterator(); iter.hasNext();) {
-			IScopeHandle handle = iter.next();
+		for (Iterator iter = scopes.iterator(); iter.hasNext();) {
+			IScopeHandle handle = (IScopeHandle) iter.next();
 			if (id.equals(handle.getId())) {
 				return handle.getScope();
 			}
@@ -70,7 +70,7 @@ public class ScopeRegistry {
 		if (initialized ) {
 			return;
 		}	
-		scopes = new ArrayList<IScopeHandle>();
+		scopes = new ArrayList();
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
 		IConfigurationElement[] elements = registry
 				.getConfigurationElementsFor(SCOPE_XP_NAME);
@@ -100,7 +100,7 @@ public class ScopeRegistry {
 	
 	public IScopeHandle[] getScopes() {
 		readScopes();
-		return scopes.toArray(new IScopeHandle[scopes.size()]);
+		return (IScopeHandle[]) scopes.toArray(new IScopeHandle[scopes.size()]);
 	}
 
 	/**
@@ -112,7 +112,7 @@ public class ScopeRegistry {
 	 */
 	public AbstractHelpScope parseScopePhrases(String phrases[])
 	{
-		ArrayList<AbstractHelpScope> scopes = new ArrayList<AbstractHelpScope>();
+		ArrayList scopes = new ArrayList();
 		
 		for (int p=0;p<phrases.length;p++)
 		{
@@ -124,9 +124,9 @@ public class ScopeRegistry {
 		if (scopes.size()==0)
 			return null;
 		if (scopes.size()==1)
-			return scopes.get(0);
+			return (AbstractHelpScope)scopes.get(0);
 		return new IntersectionScope(
-				scopes.toArray(
+				(AbstractHelpScope[])scopes.toArray(
 						new AbstractHelpScope[scopes.size()]));
 	}
 	
@@ -142,7 +142,7 @@ public class ScopeRegistry {
 		if (!(phrase.startsWith("(") && !phrase.startsWith("("))) //$NON-NLS-1$ //$NON-NLS-2$
 			phrase = '('+phrase+')';
 		
-		Stack<TempScope> scopeStack = new Stack<TempScope>();
+		Stack scopeStack = new Stack();
 		ScopePhrase scopePhrase = new ScopePhrase(phrase);
 		
 		String elem;
@@ -157,27 +157,27 @@ public class ScopeRegistry {
 			}
 			else if (elem.equals(")")) //$NON-NLS-1$
 			{
-				TempScope scope = scopeStack.pop();
+				TempScope scope = (TempScope)scopeStack.pop();
 				if (scopeStack.isEmpty())
 					return scope.getScope();
 				else{
-					TempScope parent = scopeStack.peek();
+					TempScope parent = (TempScope)scopeStack.peek();
 					parent.add(scope.getScope());
 				}
 			}
 			else if (elem.equals(SCOPE_AND))
 			{
-				TempScope scope = scopeStack.peek();
+				TempScope scope = (TempScope)scopeStack.peek();
 				scope.setType(TempScope.INTERSECTION);
 			}
 			else if (elem.equals(SCOPE_OR))
 			{
-				TempScope scope = scopeStack.peek();
+				TempScope scope = (TempScope)scopeStack.peek();
 				scope.setType(TempScope.UNION);
 			}
 			else
 			{
-				TempScope scope = scopeStack.peek();
+				TempScope scope = (TempScope)scopeStack.peek();
 				AbstractHelpScope helpScope = getScope(elem);
 				if (helpScope!=null)
 					scope.add(helpScope);
@@ -247,7 +247,7 @@ public class ScopeRegistry {
 		public final static int UNION=1;
 		public final static int INTERSECTION=2;
 		
-		private ArrayList<AbstractHelpScope> kids = new ArrayList<AbstractHelpScope>();
+		private ArrayList kids = new ArrayList();
 		private int type;
 		
 		public void setType(int type)
@@ -265,15 +265,15 @@ public class ScopeRegistry {
 			switch (type){
 			case UNION:
 				return new UnionScope(
-						kids.toArray(
+						(AbstractHelpScope[])kids.toArray(
 								new AbstractHelpScope[kids.size()]));
 			case INTERSECTION:
 				return new IntersectionScope(
-						kids.toArray(
+						(AbstractHelpScope[])kids.toArray(
 								new AbstractHelpScope[kids.size()]));
 			default:
 				if (kids.size()>=1)
-					return kids.get(0);
+					return (AbstractHelpScope)kids.get(0);
 				else
 					return null;
 			}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeUtils.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeUtils.java
index 0b96055ed..cef148219 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeUtils.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
+ * Copyright (c) 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -179,13 +179,13 @@ public class ScopeUtils {
 	public static IIndexEntry[] inScopeEntries(IIndexEntry[] entries, AbstractHelpScope scope) {
 		for (int i=0;i<entries.length;++i) {
 			if (!scope.inScope(entries[i])) {
-				List<IIndexEntry> list = new ArrayList<IIndexEntry>(entries.length);
+				List list = new ArrayList(entries.length);
 				for (int j=0;j<entries.length;++j) {
 					if (j < i || scope.inScope(entries[j])) {
 						list.add(entries[j]);
 					}
 				}
-				return list.toArray(new IIndexEntry[list.size()]);
+				return (IIndexEntry[])list.toArray(new IIndexEntry[list.size()]);
 			}
 		}
 		return entries;
@@ -200,13 +200,13 @@ public class ScopeUtils {
 	public static ITopic[] inScopeTopics(ITopic[] topics, AbstractHelpScope scope) {
 		for (int i=0;i<topics.length;++i) {
 			if (!scope.inScope(topics[i])) {
-				List<ITopic> list = new ArrayList<ITopic>(topics.length);
+				List list = new ArrayList(topics.length);
 				for (int j=0;j<topics.length;++j) {
 					if (j < i || scope.inScope(topics[j])) {
 						list.add(topics[j]);
 					}
 				}
-				return list.toArray(new ITopic[list.size()]);
+				return (ITopic[])list.toArray(new ITopic[list.size()]);
 			}
 		}
 		return topics;
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java
index 30f5d4da7..ecc9c281a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java
@@ -24,7 +24,6 @@ import org.eclipse.help.IIndexEntry;
 import org.eclipse.help.IIndexSee;
 import org.eclipse.help.IToc;
 import org.eclipse.help.ITopic;
-import org.eclipse.help.IUAElement;
 import org.eclipse.help.base.AbstractHelpScope;
 import org.eclipse.help.internal.HelpPlugin;
 import org.eclipse.help.internal.UAElement;
@@ -99,18 +98,18 @@ public class WorkingSetScope extends AbstractHelpScope {
 		if(null ==criteria){
 			return true;
 		}
-		Map<String, Set> ownCriteria = getCriteriaInfo(criteriaOfTopic);
-		Map<String, Set> scope = getCriteriaInfo(criteria);
-		outer: for (Iterator<String> keyIterator = scope.keySet().iterator(); keyIterator.hasNext();) {
+		Map ownCriteria = getCriteriaInfo(criteriaOfTopic);
+		Map scope = getCriteriaInfo(criteria);
+		outer: for (Iterator keyIterator = scope.keySet().iterator(); keyIterator.hasNext();) {
 			String key = String.valueOf(keyIterator.next());
-			for (Iterator valueIterator = scope.get(key).iterator(); valueIterator.hasNext();) {
+			for (Iterator valueIterator = ((Set)scope.get(key)).iterator(); valueIterator.hasNext();) {
 				String value = String.valueOf(valueIterator.next());
 				if (value.equals(UNCATEGORIZED)) {
 					if (!ownCriteria.containsKey(key)) {
 						continue outer;						
 					}
 				} else {
-					if (null != ownCriteria.get(key) && ownCriteria.get(key).contains(value))
+					if (null != ownCriteria.get(key) && ((Set)ownCriteria.get(key)).contains(value))
 						continue outer;					
 				}
 			}
@@ -119,14 +118,14 @@ public class WorkingSetScope extends AbstractHelpScope {
 		return true;
 	}
 	
-	private Map<String, Set> getCriteriaInfo(CriterionResource[] criteria) {
-		Map<String, Set> criteriaMap = new HashMap<String, Set>();
+	private Map getCriteriaInfo(CriterionResource[] criteria) {
+		Map criteriaMap = new HashMap();
 		CriteriaUtilities.addCriteriaToMap(criteriaMap, criteria);
 		return criteriaMap;
 	}
 	
-	private Map<String, Set> getCriteriaInfo(ICriteria[] criteria) {
-		Map<String, Set> criteriaMap = new HashMap<String, Set>();
+	private Map getCriteriaInfo(ICriteria[] criteria) {
+		Map criteriaMap = new HashMap();
 		CriteriaUtilities.addCriteriaToMap(criteriaMap, criteria);
 	    return criteriaMap;
 	}
@@ -140,7 +139,7 @@ public class WorkingSetScope extends AbstractHelpScope {
 	}
 	
 	private boolean inContentScope(ITopic topic) {
-		Set<IUAElement> topics = new HashSet<IUAElement>();
+		Set topics = new HashSet();
 		IToc toc = null;
 		topics.add(topic);
 		if (topic instanceof UAElement) {
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/CriteriaUtilities.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/CriteriaUtilities.java
index b4e55f415..82a996872 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/CriteriaUtilities.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/CriteriaUtilities.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
+ * Copyright (c) 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -22,8 +22,8 @@ import org.eclipse.help.internal.criteria.CriterionResource;
 
 public class CriteriaUtilities {
 	
-    public static List<String> getCriteriaValues(String rawValues) {
-    	List<String> result = new ArrayList<String>();
+    public static List getCriteriaValues(String rawValues) {
+    	List result = new ArrayList();
     	if (rawValues != null) {
     		String[] values = rawValues.split(","); //$NON-NLS-1$
     		for(int j = 0; j < values.length; ++j){
@@ -36,16 +36,16 @@ public class CriteriaUtilities {
 		return result;
     }
     
-    public static void addCriteriaToMap(Map<String, Set> map, ICriteria[] criteria) {
+    public static void addCriteriaToMap(Map map, ICriteria[] criteria) {
     	for (int i = 0; i < criteria.length; ++i) {
 			ICriteria criterion = criteria[i];
 			String name = criterion.getName();
-			List<String> values = CriteriaUtilities.getCriteriaValues(criterion.getValue());
+			List values = CriteriaUtilities.getCriteriaValues(criterion.getValue());
 			if (name != null && name.length() > 0 && values.size() > 0) {
 				name = name.toLowerCase();
-				Set<String> existingValueSet = map.get(name);
+				Set existingValueSet = (Set) map.get(name);
 				if (null == existingValueSet) {
-					existingValueSet = new HashSet<String>();
+					existingValueSet = new HashSet();
 				}
 				existingValueSet.addAll(values);
 				map.put(name, existingValueSet);
@@ -53,13 +53,13 @@ public class CriteriaUtilities {
 		}
     }
     
-    public static void addCriteriaToMap(Map<String, Set> map, CriterionResource[] criteria) {
+    public static void addCriteriaToMap(Map map, CriterionResource[] criteria) {
     	for(int i = 0; i < criteria.length; ++ i){
 			CriterionResource criterion = criteria[i];
 			String criterionName = criterion.getCriterionName();
 			List criterionValues = criterion.getCriterionValues();
 			
-			Set existedValueSet = map.get(criterionName);
+			Set existedValueSet = (Set)map.get(criterionName);
 			if (null == existedValueSet)
 				existedValueSet = new HashSet();
 			existedValueSet.addAll(criterionValues);
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
index 3fc1fd725..1608b0984 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
@@ -65,7 +65,7 @@ public class BrowserManager {
 
 	private BrowserDescriptor internalBrowserDesc;
 
-	private Collection<IBrowser> browsers = new ArrayList<IBrowser>();
+	private Collection browsers = new ArrayList();
 
 	private boolean alwaysUseExternal = false;
 
@@ -201,7 +201,7 @@ public class BrowserManager {
 	private BrowserDescriptor[] createBrowserDescriptors() {
 		if (this.browsersDescriptors != null)
 			return this.browsersDescriptors;
-		Collection<BrowserDescriptor> bDescriptors = new ArrayList<BrowserDescriptor>();
+		Collection bDescriptors = new ArrayList();
 		IConfigurationElement configElements[] = Platform
 				.getExtensionRegistry().getConfigurationElementsFor(
 						HelpBasePlugin.PLUGIN_ID, "browser"); //$NON-NLS-1$
@@ -231,7 +231,7 @@ public class BrowserManager {
 			} catch (CoreException ce) {
 			}
 		}
-		this.browsersDescriptors = bDescriptors
+		this.browsersDescriptors = (BrowserDescriptor[]) bDescriptors
 				.toArray(new BrowserDescriptor[bDescriptors.size()]);
 		return this.browsersDescriptors;
 	}
@@ -378,8 +378,8 @@ public class BrowserManager {
 			// nothing to do, do not initialize
 			return;
 		}
-		for (Iterator<IBrowser> it = browsers.iterator(); it.hasNext();) {
-			IBrowser browser = it.next();
+		for (Iterator it = browsers.iterator(); it.hasNext();) {
+			IBrowser browser = (IBrowser) it.next();
 			browser.close();
 		}
 	}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java
index 954899a9d..0e9e24eca 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -101,7 +101,7 @@ public class CustomBrowser implements IBrowser {
 	 * @return String[]
 	 */
 	private String[] prepareCommand(String path, String url) {
-		ArrayList<String> tokenList = new ArrayList<String>();
+		ArrayList tokenList = new ArrayList();
 		//Divide along quotation marks
 		StringTokenizer qTokenizer = new StringTokenizer(path.trim(),
 				"\"", true); //$NON-NLS-1$
@@ -137,7 +137,7 @@ public class CustomBrowser implements IBrowser {
 		// substitute %1 by url
 		boolean substituted = false;
 		for (int i = 0; i < tokenList.size(); i++) {
-			String token = tokenList.get(i);
+			String token = (String) tokenList.get(i);
 			String newToken = doSubstitutions(token, url);
 			if (newToken != null) {
 				tokenList.set(i, newToken);
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
index c12e02f17..412af056f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
@@ -50,7 +50,7 @@ public class HelpURLConnection extends URLConnection {
 	private final static String PATH_RTOPIC = "/rtopic"; //$NON-NLS-1$
 	private static final String PROTOCOL_HTTP = "http://"; //$NON-NLS-1$
 	
-	private static Hashtable<String, String[]> templates = new Hashtable<String, String[]>();
+	private static Hashtable templates = new Hashtable();
 	
 	// document caching - disabled if running in dev mode
 	protected static boolean cachingEnabled = true;
@@ -66,7 +66,7 @@ public class HelpURLConnection extends URLConnection {
 
 	protected String pluginAndFile; // plugin/file
 	protected String query; // after ?
-	protected HashMap<String, Object> arguments;
+	protected HashMap arguments;
 	protected Bundle plugin;
 	// file in a plug-in
 	protected String file;
@@ -172,7 +172,7 @@ public class HelpURLConnection extends URLConnection {
 		return isCacheable() ? new Date().getTime() + 10000 : 0;
 	}
 
-	public static void parseQuery(String query, HashMap<String, Object> arguments) {
+	public static void parseQuery(String query, HashMap arguments) {
 		StringTokenizer stok = new StringTokenizer(query, "&"); //$NON-NLS-1$
 		while (stok.hasMoreTokens()) {
 			String aQuery = stok.nextToken();
@@ -184,10 +184,10 @@ public class HelpURLConnection extends URLConnection {
 				if (existing == null)
 					arguments.put(arg, val);
 				else if (existing instanceof Vector) {
-					((Vector<String>) existing).add(val);
+					((Vector) existing).add(val);
 					arguments.put(arg, existing);
 				} else {
-					Vector<Object> v = new Vector<Object>(2);
+					Vector v = new Vector(2);
 					v.add(existing);
 					v.add(val);
 					arguments.put(arg, v);
@@ -203,7 +203,7 @@ public class HelpURLConnection extends URLConnection {
 	protected void parseQuery() {
 		if (query != null && !"".equals(query)) { //$NON-NLS-1$
 			if (arguments == null) {
-				arguments = new HashMap<String, Object>(5);
+				arguments = new HashMap(5);
 			}
 			parseQuery(query, arguments);
 		}
@@ -427,7 +427,7 @@ public class HelpURLConnection extends URLConnection {
 	private InputStream openRemoteStream(String remoteURL, String pathSuffix)  {
 		InputStream in = getUnverifiedStream(remoteURL,pathSuffix);	
 
-		String errPage[] = templates.get(remoteURL);
+		String errPage[] = (String[])templates.get(remoteURL);
 		if (errPage==null)
 		{
 			String error = getPageText(getUnverifiedStream(remoteURL,"/rtopic/fakeurltogetatestpage/_ACEGIKMOQ246.html")); //$NON-NLS-1$
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/IndexingOperation.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/IndexingOperation.java
index 3ea0bbc9e..0340dbd96 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/IndexingOperation.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/IndexingOperation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -83,9 +83,9 @@ class IndexingOperation {
 	protected void execute(IProgressMonitor pm)
 			throws OperationCanceledException, IndexingException {
 		checkCancelled(pm);
-		Collection<URL> staleDocs = getRemovedDocuments(index);
+		Collection staleDocs = getRemovedDocuments(index);
 		numRemoved = staleDocs.size();
-		Collection<URL> newDocs = getAddedDocuments(index);
+		Collection newDocs = getAddedDocuments(index);
 		numAdded = newDocs.size();
 
 		// if collection is empty, we may return right away
@@ -110,7 +110,7 @@ class IndexingOperation {
 		BaseHelpSystem.getLocalSearchManager().clearSearchParticipants();
 	}
 
-	private Map calculateNewToRemove(Collection<URL> newDocs, Map prebuiltDocs) {
+	private Map calculateNewToRemove(Collection newDocs, Map prebuiltDocs) {
 		// Calculate document that were in prebuilt indexes, but are not in
 		// TOCs. (prebuiltDocs - newDocs)
 		/*
@@ -119,9 +119,9 @@ class IndexingOperation {
 		 * document
 		 */
 		Map docsToDelete = prebuiltDocs;
-		ArrayList<String> prebuiltHrefs = new ArrayList<String>(prebuiltDocs.keySet());
+		ArrayList prebuiltHrefs = new ArrayList(prebuiltDocs.keySet());
 		for (int i = 0; i < prebuiltHrefs.size(); i++) {
-			String href = prebuiltHrefs.get(i);
+			String href = (String) prebuiltHrefs.get(i);
 			URL u = SearchIndex.getIndexableURL(index.getLocale(), href);
 			if (u == null) {
 				// should never be here
@@ -147,11 +147,11 @@ class IndexingOperation {
 	/**
 	 * Returns documents that must be deleted
 	 */
-	private Map addNewDocuments(IProgressMonitor pm, Collection<URL> newDocs,
+	private Map addNewDocuments(IProgressMonitor pm, Collection newDocs,
 			boolean opened) throws IndexingException {
 		Map prebuiltDocs = mergeIndexes(pm, opened);
 		checkCancelled(pm);
-		Collection<URL> docsToIndex = calculateDocsToAdd(newDocs, prebuiltDocs);
+		Collection docsToIndex = calculateDocsToAdd(newDocs, prebuiltDocs);
 		checkCancelled(pm);
 		Map docsToDelete = calculateNewToRemove(newDocs, prebuiltDocs);
 		pm.beginTask("", 10 * docsToIndex.size() + docsToDelete.size()); //$NON-NLS-1$
@@ -165,16 +165,16 @@ class IndexingOperation {
 		return docsToDelete;
 	}
 
-	private Collection<URL> calculateDocsToAdd(Collection<URL> newDocs, Map prebuiltDocs) {
+	private Collection calculateDocsToAdd(Collection newDocs, Map prebuiltDocs) {
 		// Calculate documents that were not in prebuilt indexes, and still need
 		// to be added
 		// (newDocs minus prebuiltDocs)
-		Collection<URL> docsToIndex = null;
+		Collection docsToIndex = null;
 		int newDocSize = newDocs.size();
 		if (prebuiltDocs.size() > 0) {
-			docsToIndex = new HashSet<URL>(newDocs);
-			for (Iterator<String> it = prebuiltDocs.keySet().iterator(); it.hasNext();) {
-				String href = it.next();
+			docsToIndex = new HashSet(newDocs);
+			for (Iterator it = prebuiltDocs.keySet().iterator(); it.hasNext();) {
+				String href = (String) it.next();
 				URL u = SearchIndex.getIndexableURL(index.getLocale(), href);
 				if (u != null) {
 					docsToIndex.remove(u);
@@ -201,14 +201,14 @@ class IndexingOperation {
 		pm = new LazyProgressMonitor(pm);
 		pm.beginTask("", docsToDelete.size()); //$NON-NLS-1$
 		checkCancelled(pm);
-		Set<String> keysToDelete = docsToDelete.keySet();
+		Set keysToDelete = docsToDelete.keySet();
 		if (keysToDelete.size() > 0) {
 			if (!index.beginRemoveDuplicatesBatch()) {
 				throw new IndexingException();
 			}
 			MultiStatus multiStatus = null;
-			for (Iterator<String> it = keysToDelete.iterator(); it.hasNext();) {
-				String href = it.next();
+			for (Iterator it = keysToDelete.iterator(); it.hasNext();) {
+				String href = (String) it.next();
 				String[] indexIds = (String[]) docsToDelete.get(href);
 				if (indexIds == null) {
 					// delete all copies
@@ -239,7 +239,7 @@ class IndexingOperation {
 		pm.done();
 	}
 
-	private void addDocuments(IProgressMonitor pm, Collection<URL> addedDocs,
+	private void addDocuments(IProgressMonitor pm, Collection addedDocs,
 			boolean lastOperation) throws IndexingException {
 		pm = new LazyProgressMonitor(pm);
 		// beginAddBatch()) called when processing prebuilt indexes
@@ -247,8 +247,8 @@ class IndexingOperation {
 		checkCancelled(pm);
 		pm.subTask(HelpBaseResources.UpdatingIndex);
 		MultiStatus multiStatus = null;
-		for (Iterator<URL> it = addedDocs.iterator(); it.hasNext();) {
-			URL doc = it.next();
+		for (Iterator it = addedDocs.iterator(); it.hasNext();) {
+			URL doc = (URL) it.next();
 			IStatus status = index.addDocument(getName(doc), doc);
 			if (status.getCode() != IStatus.OK) {
 				if (multiStatus == null) {
@@ -273,7 +273,7 @@ class IndexingOperation {
 	}
 
 	private void removeStaleDocuments(IProgressMonitor pm,
-			Collection<URL> removedDocs) throws IndexingException {
+			Collection removedDocs) throws IndexingException {
 		pm = new LazyProgressMonitor(pm);
 		pm.beginTask("", removedDocs.size()); //$NON-NLS-1$
 		pm.subTask(HelpBaseResources.Preparing_for_indexing);
@@ -286,8 +286,8 @@ class IndexingOperation {
 			checkCancelled(pm);
 			pm.subTask(HelpBaseResources.UpdatingIndex);
 			MultiStatus multiStatus = null;
-			for (Iterator<URL> it = removedDocs.iterator(); it.hasNext();) {
-				URL doc = it.next();
+			for (Iterator it = removedDocs.iterator(); it.hasNext();) {
+				URL doc = (URL) it.next();
 				IStatus status = index.removeDocument(getName(doc));
 				if (status.getCode() != IStatus.OK) {
 					if (multiStatus == null) {
@@ -345,17 +345,17 @@ class IndexingOperation {
 	 * Returns the documents to be added to index. The collection consists of
 	 * the associated PluginURL objects.
 	 */
-	private Collection<URL> getAddedDocuments(SearchIndex index) {
+	private Collection getAddedDocuments(SearchIndex index) {
 		// Get the list of added plugins
 		Collection addedPlugins = getAddedPlugins(index);
 		if (HelpPlugin.DEBUG_SEARCH) {
 			traceAddedContributors(addedPlugins);
 		}
 		// get the list of all navigation urls.
-		Set<String> urls = getAllDocuments(index.getLocale());
-		Set<URL> addedDocs = new HashSet<URL>(urls.size());
-		for (Iterator<String> docs = urls.iterator(); docs.hasNext();) {
-			String doc = docs.next();
+		Set urls = getAllDocuments(index.getLocale());
+		Set addedDocs = new HashSet(urls.size());
+		for (Iterator docs = urls.iterator(); docs.hasNext();) {
+			String doc = (String) docs.next();
 			// Assume the url is /pluginID/path_to_topic.html
 			if (doc.startsWith("//")) { //$NON-NLS-1$  Bug 225592
 				doc = doc.substring(1);
@@ -400,7 +400,7 @@ class IndexingOperation {
 				if (qloc!= -1) {
 					String query = doc.substring(qloc+1);
 					doc = doc.substring(0, qloc);
-					HashMap<String, Object> arguments = new HashMap<String, Object>();
+					HashMap arguments = new HashMap();
 					HelpURLConnection.parseQuery(query, arguments);
 					id = (String)arguments.get("id"); //$NON-NLS-1$
 				}
@@ -431,14 +431,14 @@ class IndexingOperation {
 	 * Returns the documents to be removed from index. The collection consists
 	 * of the associated PluginURL objects.
 	 */
-	private Collection<URL> getRemovedDocuments(SearchIndex index) {
+	private Collection getRemovedDocuments(SearchIndex index) {
 		// Get the list of removed plugins
 		Collection removedPlugins = index.getDocPlugins().getRemoved();
 		if (removedPlugins == null || removedPlugins.isEmpty())
-			return new ArrayList<URL>(0);
+			return new ArrayList(0);
 		// get the list of indexed docs. This is a hashtable (url, plugin)
 		HelpProperties indexedDocs = index.getIndexedDocs();
-		Set<URL> removedDocs = new HashSet<URL>(indexedDocs.size());
+		Set removedDocs = new HashSet(indexedDocs.size());
 		for (Iterator docs = indexedDocs.keySet().iterator(); docs.hasNext();) {
 			String doc = (String) docs.next();
 			// Assume the url is /pluginID/path_to_topic.html
@@ -459,7 +459,7 @@ class IndexingOperation {
 	/**
 	 * Adds the topic and its subtopics to the list of documents
 	 */
-	private void add(ITopic topic, Set<String> hrefs) {
+	private void add(ITopic topic, Set hrefs) {
 		String href = topic.getHref();
 		add(href, hrefs);
 		ITopic[] subtopics = topic.getSubtopics();
@@ -467,7 +467,7 @@ class IndexingOperation {
 			add(subtopics[i], hrefs);
 	}
 	
-	private void add(String href, Set<String> hrefs) {
+	private void add(String href, Set hrefs) {
 		if (href != null
 				&& !href.equals("") && !href.startsWith("http://") && !href.startsWith("https://")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			hrefs.add(href);
@@ -476,9 +476,9 @@ class IndexingOperation {
 	/**
 	 * Returns the collection of href's for all the help topics.
 	 */
-	private Set<String> getAllDocuments(String locale) {
+	private Set getAllDocuments(String locale) {
 		// Add documents from TOCs
-		HashSet<String> hrefs = new HashSet<String>();
+		HashSet hrefs = new HashSet();
 		Toc[] tocs = index.getTocManager().getTocs(locale);
 		for (int i = 0; i < tocs.length; i++) {
 			ITopic[] topics = tocs[i].getTopics();
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java
index 942184e37..c4687e303 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -46,7 +46,7 @@ import org.xml.sax.*;
  */
 
 public final class InfoCenter implements ISearchEngine {
-	private Hashtable<String, IHelpResource> tocs;
+	private Hashtable tocs;
 
 	public static class Scope implements ISearchScope {
 		String url;
@@ -79,7 +79,7 @@ public final class InfoCenter implements ISearchEngine {
 			final String href = node.getAttribute("toc"); //$NON-NLS-1$
 			final String label = node.getAttribute("toclabel"); //$NON-NLS-1$
 			if (href != null && label != null) {
-				category = tocs.get(href);
+				category = (IHelpResource) tocs.get(href);
 				if (category == null) {
 					category = new IHelpResource() {
 						public String getLabel() {
@@ -140,7 +140,7 @@ public final class InfoCenter implements ISearchEngine {
 	 * The default constructor.
 	 */
 	public InfoCenter() {
-		tocs = new Hashtable<String, IHelpResource>();
+		tocs = new Hashtable();
 	}
 
 	/*
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LocalSearchManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LocalSearchManager.java
index b507b3a9d..525653134 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LocalSearchManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LocalSearchManager.java
@@ -54,11 +54,11 @@ public class LocalSearchManager {
 	private static final String SEARCH_PARTICIPANT_XP_NAME = "searchParticipant"; //$NON-NLS-1$
 	private static final String BINDING_XP_NAME = "binding"; //$NON-NLS-1$
 	private static final Object PARTICIPANTS_NOT_FOUND = new Object();
-	private Map<String, Object> indexes = new HashMap<String, Object>();
-	private Map<String, AnalyzerDescriptor> analyzerDescriptors = new HashMap<String, AnalyzerDescriptor>();
-	private Map<String, ParticipantDescriptor> searchParticipantsById = new HashMap<String, ParticipantDescriptor>();
-	private Map<String, Object> searchParticipantsByPlugin = new HashMap<String, Object>();
-	private ArrayList<ParticipantDescriptor> globalSearchParticipants;
+	private Map indexes = new HashMap();
+	private Map analyzerDescriptors = new HashMap();
+	private Map searchParticipantsById = new HashMap();
+	private Map searchParticipantsByPlugin = new HashMap();
+	private ArrayList globalSearchParticipants;
 
 	private static class ParticipantDescriptor implements IHelpResource {
 
@@ -154,8 +154,8 @@ public class LocalSearchManager {
 	 * @return a List of raw SearchHits
 	 */
 
-	public static List<SearchHit> asList(TopDocs topDocs, IndexSearcher searcher) {
-		List<SearchHit> list = new ArrayList<SearchHit>(topDocs.scoreDocs.length);
+	public static List asList(TopDocs topDocs, IndexSearcher searcher) {
+		List list = new ArrayList(topDocs.scoreDocs.length);
 		
 		for (int i=0; i<topDocs.scoreDocs.length; ++i) {
 			try {
@@ -200,7 +200,7 @@ public class LocalSearchManager {
 	 */
 	private AnalyzerDescriptor getAnalyzer(String locale) {
 		// get an analyzer from cache
-		AnalyzerDescriptor analyzerDesc = analyzerDescriptors.get(locale);
+		AnalyzerDescriptor analyzerDesc = (AnalyzerDescriptor) analyzerDescriptors.get(locale);
 		if (analyzerDesc != null)
 			return analyzerDesc;
 
@@ -290,7 +290,7 @@ public class LocalSearchManager {
 			createGlobalSearchParticipants();
 		}
 		for (int i = 0; i < globalSearchParticipants.size(); i++) {
-			ParticipantDescriptor desc = globalSearchParticipants.get(i);
+			ParticipantDescriptor desc = (ParticipantDescriptor) globalSearchParticipants.get(i);
 			if (desc.getId().equals(participantId)) {
 				return desc;
 			}
@@ -306,7 +306,7 @@ public class LocalSearchManager {
 	 * @return the participant with the given id
 	 */
 	public SearchParticipant getParticipant(String participantId) {
-		ParticipantDescriptor desc = searchParticipantsById.get(participantId);
+		ParticipantDescriptor desc = (ParticipantDescriptor)searchParticipantsById.get(participantId);
 		if (desc != null) {
 			return desc.getParticipant();
 		}
@@ -363,14 +363,14 @@ public class LocalSearchManager {
 	 * @return a set of plug-in Ids
 	 */
 
-	public Set<String> getPluginsWithSearchParticipants() {
-		HashSet<String> set = new HashSet<String>();
+	public Set getPluginsWithSearchParticipants() {
+		HashSet set = new HashSet();
 		addSearchBindings(set);
 		addLuceneSearchBindings(set);
 		// must ask global search participants directly
 	    SearchParticipant[] gps = getGlobalParticipants();
 		for (int i = 0; i < gps.length; i++) {
-			Set<String> ids;
+			Set ids;
 			try {
 				ids = gps[i].getContributingPlugins();
 			}
@@ -383,7 +383,7 @@ public class LocalSearchManager {
 		return set;
 	}
 
-	private void addSearchBindings(HashSet<String> set) {
+	private void addSearchBindings(HashSet set) {
 		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(
 				SEARCH_PARTICIPANT_XP_FULLNAME);
 
@@ -394,7 +394,7 @@ public class LocalSearchManager {
 		}
 	}
 	
-	private void addLuceneSearchBindings(HashSet<String> set) {
+	private void addLuceneSearchBindings(HashSet set) {
 		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(
 				LUCENE_SEARCH_PARTICIPANT_XP_FULLNAME);
 
@@ -410,24 +410,24 @@ public class LocalSearchManager {
 	 * cached data to reduce runtime memory footprint.
 	 */
 	public void clearSearchParticipants() {
-		Iterator<ParticipantDescriptor> iter = searchParticipantsById.values().iterator();
+		Iterator iter = searchParticipantsById.values().iterator();
 		while (iter.hasNext()) {
-			ParticipantDescriptor desc = iter.next();
+			ParticipantDescriptor desc = (ParticipantDescriptor)iter.next();
 			desc.clear();
 		}
 	}
 
-	private ArrayList<ParticipantDescriptor> createSearchParticipants(String pluginId) {
-		ArrayList<ParticipantDescriptor> list = null;
+	private ArrayList createSearchParticipants(String pluginId) {
+		ArrayList list = null;
 		list = getBindingsForPlugin(pluginId, list, SEARCH_PARTICIPANT_XP_FULLNAME);
 		list = getBindingsForPlugin(pluginId, list, LUCENE_SEARCH_PARTICIPANT_XP_FULLNAME);
 		return list;
 	}
 
-	private ArrayList<ParticipantDescriptor> getBindingsForPlugin(String pluginId, ArrayList<ParticipantDescriptor> list, String extensionPointName) {
+	private ArrayList getBindingsForPlugin(String pluginId, ArrayList list, String extensionPointName) {
 		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(
 				extensionPointName);
-		ArrayList<IConfigurationElement> binding = null;
+		ArrayList binding = null;
 		for (int i = 0; i < elements.length; i++) {
 			IConfigurationElement element = elements[i];
 			if (!element.getContributor().getName().equals(pluginId)) {
@@ -447,7 +447,7 @@ public class LocalSearchManager {
 					if (id != null && id.equals(refId)) {
 						// match
 						if (binding == null)
-							binding = new ArrayList<IConfigurationElement>();
+							binding = new ArrayList();
 						binding.add(rel);
 						break;
 					}
@@ -459,7 +459,7 @@ public class LocalSearchManager {
 				if (!isParticipantEnabled(String.valueOf(true).equals(element.getAttribute("headless")))) //$NON-NLS-1$
 					continue;
 				if (list == null)
-					list = new ArrayList<ParticipantDescriptor>();
+					list = new ArrayList();
 				ParticipantDescriptor desc = new ParticipantDescriptor(element); 
 				list.add(desc);
 				searchParticipantsById.put(desc.getId(), desc);
@@ -478,12 +478,12 @@ public class LocalSearchManager {
 	 * @return
 	 */
 
-	private ArrayList<ParticipantDescriptor> addBoundDescriptors(ArrayList<ParticipantDescriptor> list, ArrayList<IConfigurationElement> binding) {
+	private ArrayList addBoundDescriptors(ArrayList list, ArrayList binding) {
 		for (int i = 0; i < binding.size(); i++) {
-			IConfigurationElement refEl = binding.get(i);
-			Collection<Object> collection = searchParticipantsByPlugin.values();
+			IConfigurationElement refEl = (IConfigurationElement) binding.get(i);
+			Collection collection = searchParticipantsByPlugin.values();
 			boolean found = false;
-			for (Iterator<Object> iter = collection.iterator(); iter.hasNext();) {
+			for (Iterator iter = collection.iterator(); iter.hasNext();) {
 				if (found)
 					break;
 				Object entry = iter.next();
@@ -495,7 +495,7 @@ public class LocalSearchManager {
 					if (desc.contains(refEl)) {
 						// found the matching descriptor - add it to the list
 						if (list == null)
-							list = new ArrayList<ParticipantDescriptor>();
+							list = new ArrayList();
 						list.add(desc);
 						found = true;
 						break;
@@ -504,7 +504,7 @@ public class LocalSearchManager {
 			}
 			if (!found) {
 				if (list == null)
-					list = new ArrayList<ParticipantDescriptor>();
+					list = new ArrayList();
 				ParticipantDescriptor d = new ParticipantDescriptor(refEl);
 				list.add(d);
 				searchParticipantsById.put(d.getId(), d);
@@ -523,18 +523,18 @@ public class LocalSearchManager {
 		if (globalSearchParticipants == null) {
 			createGlobalSearchParticipants();
 		}
-		ArrayList<SearchParticipant> result = new ArrayList<SearchParticipant>();
+		ArrayList result = new ArrayList();
 		for (int i = 0; i < globalSearchParticipants.size(); i++) {
-			ParticipantDescriptor desc = globalSearchParticipants.get(i);
+			ParticipantDescriptor desc = (ParticipantDescriptor) globalSearchParticipants.get(i);
 			SearchParticipant p = desc.getParticipant();
 			if (p != null)
 				result.add(p);
 		}
-		return result.toArray(new SearchParticipant[result.size()]);
+		return (SearchParticipant[]) result.toArray(new SearchParticipant[result.size()]);
 	}
 
 	private void createGlobalSearchParticipants() {
-		globalSearchParticipants = new ArrayList<ParticipantDescriptor>();
+		globalSearchParticipants = new ArrayList();
 		addSearchParticipants();
 		addLuceneSearchParticipants();
 	}
@@ -686,18 +686,18 @@ public class LocalSearchManager {
 	 */
 	public void close() {
 		synchronized (indexes) {
-			for (Iterator<Object> it = indexes.values().iterator(); it.hasNext();) {
+			for (Iterator it = indexes.values().iterator(); it.hasNext();) {
 				((SearchIndex) it.next()).close();
 			}
 		}
 	}
 
 	public synchronized void tocsChanged() {
-		Collection<Object> activeIndexes = new ArrayList<Object>();
+		Collection activeIndexes = new ArrayList();
 		synchronized (indexes) {
 			activeIndexes.addAll(indexes.values());
 		}
-		for (Iterator<Object> it = activeIndexes.iterator(); it.hasNext();) {
+		for (Iterator it = activeIndexes.iterator(); it.hasNext();) {
 			SearchIndexWithIndexingProgress ix = (SearchIndexWithIndexingProgress) it.next();
 			ix.close();
 			synchronized (indexes) {
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
index 5998af7fb..239582db6 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
@@ -42,13 +42,13 @@ public class PluginIndex {
 	/**
 	 * path prefixes where index is found e.g. "", "nl/en/US", "ws/gtk"
 	 */
-	private List<String> indexIDs;
+	private List indexIDs;
 
 	/**
 	 * resolved directory paths (Strings) corresponding to indexes at given
 	 * prefixes, e.g. //d/eclipse/...../os/linux/index,
 	 */
-	private List<String> resolvedPaths;
+	private List resolvedPaths;
 
 	public PluginIndex(String pluginId, String path, SearchIndex targetIndex) {
 		super();
@@ -62,8 +62,8 @@ public class PluginIndex {
 			// resolved
 			return;
 		}
-		indexIDs = new ArrayList<String>();
-		resolvedPaths = new ArrayList<String>();
+		indexIDs = new ArrayList();
+		resolvedPaths = new ArrayList();
 		Bundle bundle = Platform.getBundle(pluginId);
 		if (bundle == null) {
 			return;
@@ -218,7 +218,7 @@ public class PluginIndex {
 		return ret.toString();
 	}
 
-	public List<String> getIDs() {
+	public List getIDs() {
 		resolve();
 		return indexIDs;
 	}
@@ -227,7 +227,7 @@ public class PluginIndex {
 	 * @return list of paths (string) to an index directory. Paths are ordered
 	 *         from
 	 */
-	public List<String> getPaths() {
+	public List getPaths() {
 		resolve();
 		return resolvedPaths;
 	}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java
index 25890a225..cc059dd99 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -42,9 +42,9 @@ public class PluginVersionInfo extends HelpProperties {
 
 	boolean ignoreSavedVersions;
 
-	Collection<String> added = new ArrayList<String>();
+	Collection added = new ArrayList();
 
-	Collection<String> removed = new ArrayList<String>();
+	Collection removed = new ArrayList();
 
 	/**
 	 * Creates table of current contributing plugins and their fragments with
@@ -121,7 +121,7 @@ public class PluginVersionInfo extends HelpProperties {
 		}
 		// check if contributions changed
 		hasChanged = false;
-		for (Enumeration<Object> keysEnum = this.keys(); keysEnum.hasMoreElements();) {
+		for (Enumeration keysEnum = this.keys(); keysEnum.hasMoreElements();) {
 			String oneContr = (String) keysEnum.nextElement();
 			if (!oldContrs.containsKey(oneContr)) {
 				// plugin has been added
@@ -153,7 +153,7 @@ public class PluginVersionInfo extends HelpProperties {
 	 * @return String - Collection of IDs of contributions that were added or
 	 *         upgraded
 	 */
-	public Collection<String> getAdded() {
+	public Collection getAdded() {
 		if (doComparison)
 			detectChange();
 		return added;
@@ -163,7 +163,7 @@ public class PluginVersionInfo extends HelpProperties {
 	 * @return String - Collection of IDs of contributions that were removed or
 	 *         upgraded
 	 */
-	public Collection<String> getRemoved() {
+	public Collection getRemoved() {
 		if (doComparison)
 			detectChange();
 		return removed;
@@ -180,8 +180,8 @@ public class PluginVersionInfo extends HelpProperties {
 			doComparison = false;
 			hasChanged = false;
 			ignoreSavedVersions = false;
-			added = new ArrayList<String>();
-			removed = new ArrayList<String>();
+			added = new ArrayList();
+			removed = new ArrayList();
 			return true;
 		}
 		return false;
@@ -195,7 +195,7 @@ public class PluginVersionInfo extends HelpProperties {
 	 * @return true if plugins and versions match
 	 */
 	private boolean compare(String versions, String oldVersions) {
-		Map<String, String> versionMap = new HashMap<String, String>();
+		Map versionMap = new HashMap();
 		for (StringTokenizer t = new StringTokenizer(versions, SEPARATOR, false); t
 				.hasMoreTokens();) {
 			String pluginOrFragment = t.nextToken();
@@ -203,7 +203,7 @@ public class PluginVersionInfo extends HelpProperties {
 				versionMap.put(pluginOrFragment, t.nextToken());
 			}
 		}
-		Map<String, String> oldVersionMap = new HashMap<String, String>();
+		Map oldVersionMap = new HashMap();
 		for (StringTokenizer t = new StringTokenizer(oldVersions, SEPARATOR,
 				false); t.hasMoreTokens();) {
 			String pluginOrFragment = t.nextToken();
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PrebuiltIndexes.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PrebuiltIndexes.java
index 531266825..ad43a0a05 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PrebuiltIndexes.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PrebuiltIndexes.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@ public class PrebuiltIndexes {
 	/**
 	 * Set of PluginIndex
 	 */
-	private Set<PluginIndex> set = new HashSet<PluginIndex>();
+	private Set set = new HashSet();
 
 	PrebuiltIndexes(SearchIndex targetIndex) {
 		super();
@@ -40,9 +40,9 @@ public class PrebuiltIndexes {
 	 * Removes Plugin indexes with no index
 	 */
 	private void trim() {
-		List<PluginIndex> indexes = new ArrayList<PluginIndex>(set);
+		List indexes = new ArrayList(set);
 		for (int i = 0; i < indexes.size();) {
-			PluginIndex index = indexes.get(i);
+			PluginIndex index = (PluginIndex) indexes.get(i);
 			if (index.getPaths().size() == 0) {
 				set.remove(index);
 			}
@@ -52,6 +52,6 @@ public class PrebuiltIndexes {
 
 	public PluginIndex[] getIndexes() {
 		trim();
-		return set.toArray(new PluginIndex[set.size()]);
+		return (PluginIndex[]) set.toArray(new PluginIndex[set.size()]);
 	}
 }
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java
index cb32876e3..60d21b52b 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ public class ProgressDistributor implements IProgressMonitor {
 	/**
 	 * Map work indexed by montitor
 	 */
-	private Collection<IProgressMonitor> monitors = new ArrayList<IProgressMonitor>();
+	private Collection monitors = new ArrayList();
 
 	/**
 	 * @see IProgressMonitor#beginTask(String, int)
@@ -37,8 +37,8 @@ public class ProgressDistributor implements IProgressMonitor {
 		this.totalWork = totalWork;
 		this.worked = 0;
 		this.done = false;
-		for (Iterator<IProgressMonitor> it = monitors.iterator(); it.hasNext();) {
-			IProgressMonitor m = it.next();
+		for (Iterator it = monitors.iterator(); it.hasNext();) {
+			IProgressMonitor m = (IProgressMonitor) it.next();
 			m.beginTask(name, totalWork);
 		}
 	}
@@ -48,8 +48,8 @@ public class ProgressDistributor implements IProgressMonitor {
 	 */
 	public synchronized void done() {
 		done = true;
-		for (Iterator<IProgressMonitor> it = monitors.iterator(); it.hasNext();) {
-			IProgressMonitor m = it.next();
+		for (Iterator it = monitors.iterator(); it.hasNext();) {
+			IProgressMonitor m = (IProgressMonitor) it.next();
 			m.done();
 		}
 	}
@@ -59,8 +59,8 @@ public class ProgressDistributor implements IProgressMonitor {
 	 */
 	public void internalWorked(double work) {
 		worked += work;
-		for (Iterator<IProgressMonitor> it = monitors.iterator(); it.hasNext();) {
-			IProgressMonitor m = it.next();
+		for (Iterator it = monitors.iterator(); it.hasNext();) {
+			IProgressMonitor m = (IProgressMonitor) it.next();
 			m.internalWorked(work);
 		}
 	}
@@ -69,8 +69,8 @@ public class ProgressDistributor implements IProgressMonitor {
 	 * @see IProgressMonitor#isCanceled()
 	 */
 	public synchronized boolean isCanceled() {
-		for (Iterator<IProgressMonitor> it = monitors.iterator(); it.hasNext();) {
-			IProgressMonitor m = it.next();
+		for (Iterator it = monitors.iterator(); it.hasNext();) {
+			IProgressMonitor m = (IProgressMonitor) it.next();
 			if (m.isCanceled()) {
 				return true;
 			}
@@ -89,8 +89,8 @@ public class ProgressDistributor implements IProgressMonitor {
 	 */
 	public synchronized void setTaskName(String name) {
 		taskName = name;
-		for (Iterator<IProgressMonitor> it = monitors.iterator(); it.hasNext();) {
-			IProgressMonitor m = it.next();
+		for (Iterator it = monitors.iterator(); it.hasNext();) {
+			IProgressMonitor m = (IProgressMonitor) it.next();
 			m.setTaskName(name);
 		}
 	}
@@ -100,8 +100,8 @@ public class ProgressDistributor implements IProgressMonitor {
 	 */
 	public synchronized void subTask(String name) {
 		subTaskName = name;
-		for (Iterator<IProgressMonitor> it = monitors.iterator(); it.hasNext();) {
-			IProgressMonitor m = it.next();
+		for (Iterator it = monitors.iterator(); it.hasNext();) {
+			IProgressMonitor m = (IProgressMonitor) it.next();
 			m.subTask(name);
 		}
 	}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
index e39c29e2a..c0fea1833 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
@@ -40,9 +40,9 @@ public class QueryBuilder {
 	// Analyzer to process the query words
 	private Analyzer analyzer;
 	// List of QueryWordsToken
-	private List<QueryWordsToken> analyzedTokens;
+	private List analyzedTokens;
 	// List of words to highlight
-	private List<String> highlightWords = new ArrayList<String>();
+	private List highlightWords = new ArrayList();
 	private Locale locale;
 	/**
 	 * Creates a query builder for the search word. The search word is processed
@@ -63,8 +63,8 @@ public class QueryBuilder {
 	/**
 	 * Splits user query into tokens and returns a list of QueryWordsToken's.
 	 */
-	private List<QueryWordsToken> tokenizeUserQuery(String searchWords) {
-	    List<QueryWordsToken> tokenList = new ArrayList<QueryWordsToken>();
+	private List tokenizeUserQuery(String searchWords) {
+	    List tokenList = new ArrayList();
 		//Divide along quotation marks
 		//StringTokenizer qTokenizer = new StringTokenizer(searchWords.trim(),
 		//		"\"", true); //$NON-NLS-1$
@@ -137,12 +137,12 @@ public class QueryBuilder {
 	 * Apply the Analyzer to the search tokens and return the list of processed
 	 * QueryWordsToken's.
 	 */
-	private List<QueryWordsToken> analyzeTokens(List<QueryWordsToken> tokens) {
+	private List analyzeTokens(List tokens) {
 		boolean isTokenAfterNot = false;
-		List<QueryWordsToken> newTokens = new ArrayList<QueryWordsToken>();
+		List newTokens = new ArrayList();
 		int wildCardTermCount = 0;
 		for (int i = 0; i < tokens.size(); i++) {
-			QueryWordsToken token = tokens.get(i);
+			QueryWordsToken token = (QueryWordsToken) tokens.get(i);
 			if (token.type == QueryWordsToken.WORD) {
 				int questionMIndex = token.value.indexOf('?');
 				int starIndex = token.value.indexOf('*');
@@ -158,7 +158,7 @@ public class QueryBuilder {
 						highlightWords.add(token.value);
 					}
 				} else {
-					List<String> wordList = analyzeText(analyzer, "contents", //$NON-NLS-1$
+					List wordList = analyzeText(analyzer, "contents", //$NON-NLS-1$
 							token.value);
 					if (wordList.size() > 0) {
 						if (!isTokenAfterNot && !highlightWords.contains(token.value)) {
@@ -167,7 +167,7 @@ public class QueryBuilder {
 							highlightWords.add(token.value);
 						}
 						if (wordList.size() == 1) {
-							String word = wordList.get(0);
+							String word = (String) wordList.get(0);
 							newTokens.add(QueryWordsToken.word(word));
 							// add analyzed word to the list of words to
 							// highlight
@@ -177,9 +177,9 @@ public class QueryBuilder {
 							}
 						} else {
 							QueryWordsPhrase phrase = QueryWordsToken.phrase();
-							for (Iterator<String> it = wordList.iterator(); it
+							for (Iterator it = wordList.iterator(); it
 									.hasNext();) {
-								String word = it.next();
+								String word = (String) it.next();
 								phrase.addWord(word);
 								// add each analyzed word to the list of words
 								// to highlight
@@ -210,7 +210,7 @@ public class QueryBuilder {
 					|| token.type == QueryWordsToken.NOT)
 				newTokens.add(token);
 			else if (token.type == QueryWordsToken.EXACT_PHRASE) {
-				List<String> wordList = analyzeText(analyzer, "exact_contents", //$NON-NLS-1$
+				List wordList = analyzeText(analyzer, "exact_contents", //$NON-NLS-1$
 						token.value);
 				if (wordList.size() > 0) {
 					if (!isTokenAfterNot && !highlightWords.contains(token.value)) {
@@ -219,8 +219,8 @@ public class QueryBuilder {
 					}
 				}
 				QueryWordsExactPhrase phrase = QueryWordsToken.exactPhrase();
-				for (Iterator<String> it = wordList.iterator(); it.hasNext();) {
-					String word = it.next();
+				for (Iterator it = wordList.iterator(); it.hasNext();) {
+					String word = (String) it.next();
 					phrase.addWord(word);
 					// add analyzed word to the list of words to highlight
 					// if (!highlightWords.contains(word))
@@ -240,8 +240,8 @@ public class QueryBuilder {
 	 * 
 	 * @return List of String
 	 */
-	private List<String> analyzeText(Analyzer analyzer, String fieldName, String text) {
-		List<String> words = new ArrayList<String>(1);
+	private List analyzeText(Analyzer analyzer, String fieldName, String text) {
+		List words = new ArrayList(1);
 		Reader reader = new StringReader(text);
 		TokenStream tStream = analyzer.tokenStream(fieldName, reader);
 		
@@ -263,15 +263,15 @@ public class QueryBuilder {
 	 * 
 	 * @return Query or null if no query could be created
 	 */
-	private Query createLuceneQuery(List<QueryWordsToken> searchTokens, String[] fieldNames,
+	private Query createLuceneQuery(List searchTokens, String[] fieldNames,
 			float[] boosts) {
 		// Get queries for parts separated by OR
-		List<Query> requiredQueries = getRequiredQueries(searchTokens, fieldNames,
+		List requiredQueries = getRequiredQueries(searchTokens, fieldNames,
 				boosts);
 		if (requiredQueries.size() == 0)
 			return null;
 		else if (requiredQueries.size() <= 1)
-			return requiredQueries.get(0);
+			return (Query) requiredQueries.get(0);
 		else
 			/* if (requiredQueries.size() > 1) */
 			// OR queries
@@ -282,12 +282,12 @@ public class QueryBuilder {
 	 * 
 	 * @return List of Query (could be empty)
 	 */
-	private List<Query> getRequiredQueries(List<QueryWordsToken> tokens, String[] fieldNames,
+	private List getRequiredQueries(List tokens, String[] fieldNames,
 			float[] boosts) {
-		List<Query> oredQueries = new ArrayList<Query>();
-		ArrayList<QueryWordsToken> requiredQueryTokens = new ArrayList<QueryWordsToken>();
+		List oredQueries = new ArrayList();
+		ArrayList requiredQueryTokens = new ArrayList();
 		for (int i = 0; i < tokens.size(); i++) {
-			QueryWordsToken token = tokens.get(i);
+			QueryWordsToken token = (QueryWordsToken) tokens.get(i);
 			if (token.type != QueryWordsToken.OR) {
 				requiredQueryTokens.add(token);
 			} else {
@@ -295,7 +295,7 @@ public class QueryBuilder {
 						fieldNames, boosts);
 				if (reqQuery != null)
 					oredQueries.add(reqQuery);
-				requiredQueryTokens = new ArrayList<QueryWordsToken>();
+				requiredQueryTokens = new ArrayList();
 			}
 		}
 		Query reqQuery = getRequiredQuery(requiredQueryTokens, fieldNames,
@@ -304,10 +304,10 @@ public class QueryBuilder {
 			oredQueries.add(reqQuery);
 		return oredQueries;
 	}
-	private Query orQueries(Collection<Query> queries) {
+	private Query orQueries(Collection queries) {
 		BooleanQuery bq = new BooleanQuery();
-		for (Iterator<Query> it = queries.iterator(); it.hasNext();) {
-			Query q = it.next();
+		for (Iterator it = queries.iterator(); it.hasNext();) {
+			Query q = (Query) it.next();
 			bq.add(q, BooleanClause.Occur.SHOULD);
 		}
 		return bq;
@@ -317,14 +317,14 @@ public class QueryBuilder {
 	 * 
 	 * @return BooleanQuery or null if no query could be created from the tokens
 	 */
-	private Query getRequiredQuery(List<QueryWordsToken> requiredTokens, String[] fieldNames,
+	private Query getRequiredQuery(List requiredTokens, String[] fieldNames,
 			float[] boosts) {
 		BooleanQuery retQuery = new BooleanQuery();
 		boolean requiredTermExist = false;
 		// Parse tokens left to right
 		QueryWordsToken operator = null;
 		for (int i = 0; i < requiredTokens.size(); i++) {
-			QueryWordsToken token = requiredTokens.get(i);
+			QueryWordsToken token = (QueryWordsToken) requiredTokens.get(i);
 			if (token.type == QueryWordsToken.AND
 					|| token.type == QueryWordsToken.NOT) {
 				operator = token;
@@ -372,7 +372,7 @@ public class QueryBuilder {
 	public Query getLuceneQuery(Collection fieldNames, boolean fieldSearchOnly)
 			throws QueryTooComplexException {
 		// split search query into tokens
-		List<QueryWordsToken> userTokens = tokenizeUserQuery(searchWords);
+		List userTokens = tokenizeUserQuery(searchWords);
 		analyzedTokens = analyzeTokens(userTokens);
 		return buildLuceneQuery(fieldNames, fieldSearchOnly);
 	}
@@ -425,7 +425,7 @@ public class QueryBuilder {
 			return query;
 		// check if all tokens are words
 		for (int i = 0; i < analyzedTokens.size(); i++)
-			if (analyzedTokens.get(i).type != QueryWordsToken.WORD)
+			if (((QueryWordsToken) analyzedTokens.get(i)).type != QueryWordsToken.WORD)
 				return query;
 		// Create phrase query for all tokens and OR with original query
 		BooleanQuery booleanQuery = new BooleanQuery();
@@ -434,8 +434,8 @@ public class QueryBuilder {
 		for (int f = 0; f < fields.length; f++) {
 			phraseQueries[f] = new PhraseQuery();
 			for (int i = 0; i < analyzedTokens.size(); i++) {
-				Term t = new Term(fields[f], analyzedTokens
-						.get(i).value);
+				Term t = new Term(fields[f], ((QueryWordsToken) analyzedTokens
+						.get(i)).value);
 				phraseQueries[f].add(t);
 			}
 			phraseQueries[f].setBoost(10 * boosts[f]);
@@ -450,7 +450,7 @@ public class QueryBuilder {
 	 */
 	public String gethighlightTerms() {
 		StringBuffer buf = new StringBuffer();
-		for (Iterator<String> it = highlightWords.iterator(); it.hasNext();) {
+		for (Iterator it = highlightWords.iterator(); it.hasNext();) {
 			buf.append('"');
 			buf.append(it.next());
 			buf.append("\" "); //$NON-NLS-1$
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java
index 324b8e122..9c4176876 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,10 +19,10 @@ import org.apache.lucene.search.*;
  * Represents a quoted token in user search query words
  */
 public class QueryWordsExactPhrase extends QueryWordsToken {
-	private List<String> words;
+	private List words;
 	public QueryWordsExactPhrase() {
 		super(QueryWordsToken.EXACT_PHRASE, ""); //$NON-NLS-1$
-		words = new ArrayList<String>();
+		words = new ArrayList();
 	}
 	public void addWord(String word) {
 		words.add(word);
@@ -31,7 +31,7 @@ public class QueryWordsExactPhrase extends QueryWordsToken {
 		else
 			value += " " + word; //$NON-NLS-1$
 	}
-	public List<String> getWords() {
+	public List getWords() {
 		return words;
 	}
 	/**
@@ -39,8 +39,8 @@ public class QueryWordsExactPhrase extends QueryWordsToken {
 	 */
 	public Query createLuceneQuery(String field, float boost) {
 		PhraseQuery q = new PhraseQuery();
-		for (Iterator<String> it = getWords().iterator(); it.hasNext();) {
-			String word = it.next();
+		for (Iterator it = getWords().iterator(); it.hasNext();) {
+			String word = (String) it.next();
 			Term t = new Term("exact_" + field, word); //$NON-NLS-1$
 			q.add(t);
 			q.setBoost(boost);
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
index 5104aa0c2..50930c748 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
@@ -125,7 +125,7 @@ public class SearchIndex implements ISearchIndex, IHelpSearchIndex {
 	private boolean closed = false;
 
 	// Collection of searches occuring now
-	private Collection<Thread> searches = new ArrayList<Thread>();
+	private Collection searches = new ArrayList();
 
 	private FileLock lock;
 
@@ -443,9 +443,9 @@ public class SearchIndex implements ISearchIndex, IHelpSearchIndex {
 	 * @return Map. Keys are /pluginid/href of all merged Docs. Values are null for added document,
 	 *         or String[] of indexIds with duplicates of the document
 	 */
-	public Map<String, String[]> merge(PluginIndex[] pluginIndexes, IProgressMonitor monitor) {
-		ArrayList<NIOFSDirectory> dirList = new ArrayList<NIOFSDirectory>(pluginIndexes.length);
-		Map<String, String[]> mergedDocs = new HashMap<String, String[]>();
+	public Map merge(PluginIndex[] pluginIndexes, IProgressMonitor monitor) {
+		ArrayList dirList = new ArrayList(pluginIndexes.length);
+		Map mergedDocs = new HashMap();
 		// Create directories to merge and calculate all documents added
 		// and which are duplicates (to delete later)
 		for (int p = 0; p < pluginIndexes.length; p++) {
@@ -478,7 +478,7 @@ public class SearchIndex implements ISearchIndex, IHelpSearchIndex {
 					} else {
 						if (mergedDocs.containsKey(href)) {
 							// this is duplicate
-							String[] dups = mergedDocs.get(href);
+							String[] dups = (String[]) mergedDocs.get(href);
 							if (dups == null) {
 								// first duplicate
 								mergedDocs.put(href, new String[] { indexId });
@@ -500,16 +500,16 @@ public class SearchIndex implements ISearchIndex, IHelpSearchIndex {
 			}
 		}
 		// perform actual merging
-		for (Iterator<String> it = mergedDocs.keySet().iterator(); it.hasNext();) {
+		for (Iterator it = mergedDocs.keySet().iterator(); it.hasNext();) {
 			indexedDocs.put(it.next(), "0"); //$NON-NLS-1$
 		}
-		Directory[] luceneDirs = dirList.toArray(new Directory[dirList.size()]);
+		Directory[] luceneDirs = (Directory[]) dirList.toArray(new Directory[dirList.size()]);
 		try {
 			iw.addIndexesNoOptimize(luceneDirs);
 			iw.optimize();
 		} catch (IOException ioe) {
 			HelpBasePlugin.logError("Merging search indexes failed.", ioe); //$NON-NLS-1$
-			return new HashMap<String, String[]>();
+			return new HashMap();
 		}
 		return mergedDocs;
 	}
@@ -648,7 +648,7 @@ public class SearchIndex implements ISearchIndex, IHelpSearchIndex {
 	 */
 	public PluginVersionInfo getDocPlugins() {
 		if (docPlugins == null) {
-			Set<String> totalIds = new HashSet<String>();
+			Set totalIds = new HashSet();
 			IExtensionRegistry registry = Platform.getExtensionRegistry();
 			IExtensionPoint extensionPoint = registry.getExtensionPoint(TocFileProvider.EXTENSION_POINT_ID_TOC);
 			IExtension[] extensions = extensionPoint.getExtensions();
@@ -660,7 +660,7 @@ public class SearchIndex implements ISearchIndex, IHelpSearchIndex {
 					// ignore this extension and move on
 				}
 			}
-			Collection<String> additionalPluginIds = BaseHelpSystem.getLocalSearchManager()
+			Collection additionalPluginIds = BaseHelpSystem.getLocalSearchManager()
 					.getPluginsWithSearchParticipants();
 			totalIds.addAll(additionalPluginIds);
 			docPlugins = new PluginVersionInfo(INDEXED_CONTRIBUTION_INFO_FILE, totalIds, indexDir, !exists());
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java
index 8b5b9d3b4..70f96bccb 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java
@@ -175,7 +175,7 @@ public class SearchManager {
 		IConfigurationElement[] configs = 
 			Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.help.base.searchProcessor"); //$NON-NLS-1$
 		
-		ArrayList<Object> processors = new ArrayList<Object>();
+		ArrayList processors = new ArrayList();
 		
 		for (int c=0;c<configs.length;c++)
 		{
@@ -185,7 +185,7 @@ public class SearchManager {
 			} catch (CoreException e) {} 
 		}
 		
-		return processors.toArray(new AbstractSearchProcessor[processors.size()]);
+		return (AbstractSearchProcessor[])processors.toArray(new AbstractSearchProcessor[processors.size()]);
 	}
 	
 	/*
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java
index edd6b2383..f00aed030 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java
@@ -35,7 +35,7 @@ import org.eclipse.help.internal.workingset.WorkingSet;
  */
 public class SearchResults implements ISearchHitCollector {
 	// Collection of AdaptableHelpResource[]
-	private ArrayList<AdaptableHelpResource> scopes;
+	private ArrayList scopes;
 	private int maxHits;
 	private String locale;
 	private AbstractHelpScope filter;
@@ -71,7 +71,7 @@ public class SearchResults implements ISearchHitCollector {
 	 */
 	public void addHits(List hits, String highlightTerms) {	
 		String urlEncodedWords = URLCoder.encode(highlightTerms);
-		List<SearchHit> searchHitList = new ArrayList<SearchHit>();
+		List searchHitList = new ArrayList();
 		float scoreScale = 1.0f;
 		boolean scoreScaleSet = false;
 		
@@ -135,7 +135,7 @@ public class SearchResults implements ISearchHitCollector {
 			filteredHits ++;
 			searchHitList.add(new SearchHit(href, label, rawHit.getSummary(), score, toc, rawHit.getRawId(), rawHit.getParticipantId(), rawHit.isPotentialHit()));
 		}
-		searchHits = searchHitList
+		searchHits = (SearchHit[]) searchHitList
 				.toArray(new SearchHit[searchHitList.size()]);
 
 	}
@@ -150,7 +150,7 @@ public class SearchResults implements ISearchHitCollector {
 	private AdaptableHelpResource getScopeForTopic(String href) {
 		boolean enabled = HelpPlugin.getCriteriaManager().isCriteriaEnabled();
 		for (int i = 0; i < scopes.size(); i++) {
-			AdaptableHelpResource scope = scopes.get(i);
+			AdaptableHelpResource scope = (AdaptableHelpResource) scopes.get(i);
 			ITopic inScopeTopic = scope.getTopic(href);
 			if (inScopeTopic != null){
 				if (filter == null || filter.inScope(inScopeTopic)) {
@@ -266,11 +266,11 @@ public class SearchResults implements ISearchHitCollector {
 	 * 
 	 * @return Collection
 	 */
-	private ArrayList<AdaptableHelpResource> getScopes(WorkingSet[] wSets) {
+	private ArrayList getScopes(WorkingSet[] wSets) {
 		if (wSets == null)
 			return null;
 
-		scopes = new ArrayList<AdaptableHelpResource>(wSets.length);
+		scopes = new ArrayList(wSets.length);
 		for (int w = 0; w < wSets.length; w++) {
 			AdaptableHelpResource[] elements = wSets[w].getElements();
 			for (int i = 0; i < elements.length; i++)
@@ -279,11 +279,11 @@ public class SearchResults implements ISearchHitCollector {
 		return scopes;
 	}
 	
-	private ArrayList<CriterionResource> getCriteriaScopes(WorkingSet[] wSets){
+	private ArrayList getCriteriaScopes(WorkingSet[] wSets){
 		if (wSets == null)
 			return null;
 		
-		ArrayList<CriterionResource> criteriaScopes = new ArrayList<CriterionResource>(wSets.length);
+		ArrayList criteriaScopes = new ArrayList(wSets.length);
 		for (int w = 0; w < wSets.length; w++) {
 			CriterionResource[] elements = wSets[w].getCriteria();
 			for (int i = 0; i < elements.length; i++)
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
index fc7ca0f64..3e870e2fe 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,7 +26,7 @@ public final class WordTokenStream extends TokenStream {
 	private static final int TOKENS_LEN = 512;
 	private final Reader reader;
 	private final BreakIterator boundary;
-	private final ArrayList<Token> tokens;
+	private final ArrayList tokens;
 	private int token;
 	private int noTokens;
 	private final char[] cbuf;
@@ -37,7 +37,7 @@ public final class WordTokenStream extends TokenStream {
 		this.reader = reader;
 		boundary = BreakIterator.getWordInstance(locale);
 		cbuf = new char[BUF_LEN];
-		tokens = new ArrayList<Token>(TOKENS_LEN);
+		tokens = new ArrayList(TOKENS_LEN);
 
 	}
 	/**
@@ -92,7 +92,7 @@ public final class WordTokenStream extends TokenStream {
 			token = 0;
 		}
 
-		return tokens.get(token++);
+		return (Token) tokens.get(token++);
 
 	}
 }
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java
index 1da7efe3b..52cb47f5e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java
@@ -28,7 +28,7 @@ import org.eclipse.help.search.*;
 public class LocalHelp implements ISearchEngine2 {
 	private static final int MAX_HITS = 500;
 
-	private List<String> altList;
+	private List altList;
 	
 	/*
 	 * (non-Javadoc)
@@ -43,7 +43,7 @@ public class LocalHelp implements ISearchEngine2 {
 			IProgressMonitor monitor) throws CoreException {
 
 		AbstractSearchProcessor processors[] = SearchManager.getSearchProcessors();
-		altList = new ArrayList<String>();
+		altList = new ArrayList();
 		for (int p=0;p<processors.length;p++)
 		{
 			SearchProcessorInfo result = 
@@ -120,7 +120,7 @@ public class LocalHelp implements ISearchEngine2 {
 			return;
 		}
 		// Filtering of results by activities
-		ArrayList<SearchHit> enabledHits = new ArrayList<SearchHit>();
+		ArrayList enabledHits = new ArrayList();
 		for (int i = 0; i < searchHits.length; i++) {
 			SearchHit hit = searchHits[i];
 			if (hit.getParticipantId()!=null) {
@@ -133,7 +133,7 @@ public class LocalHelp implements ISearchEngine2 {
 				enabledHits.add(hit);
 			}
 		}
-		collector.accept(enabledHits
+		collector.accept((SearchHit[]) enabledHits
 				.toArray(new SearchHit[enabledHits.size()]));
 	}
 
@@ -141,7 +141,7 @@ public class LocalHelp implements ISearchEngine2 {
 		return null;
 	}
 	
-	public List<String> getAlternates()
+	public List getAlternates()
 	{
 		return altList;
 	}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java
index 9b96c3827..cfaa3db24 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java
@@ -58,7 +58,7 @@ public class JettyHelpServer extends HelpServer {
 
 		public void run() {
 			try {
-				final Dictionary<String, Comparable> d = new Hashtable<String, Comparable>();
+				final Dictionary d = new Hashtable();
 				final int SESSION_TIMEOUT_INTERVAL_IN_SECONDS = 30*60;  // 30 minutes
 				configurePort();
 				d.put("http.port", new Integer(getPortParameter())); //$NON-NLS-1$
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java
index ea347a867..9c1fabe35 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -52,13 +52,13 @@ public class Options {
 	private static String vm;
 
 	// arguments to pass to Eclipse
-	private static List<String> vmArgs;
+	private static List vmArgs;
 
 	// arguments to pass to VM
-	private static List<String> eclipseArgs;
+	private static List eclipseArgs;
 
 	// help command to execute
-	private static List<String> helpCommand;
+	private static List helpCommand;
 
 	// host to override appserver preferences
 	private static String host;
@@ -97,7 +97,7 @@ public class Options {
 	 */
 	public static void init(String appId, String[] args) {
 		// convert array of arguments to a list
-		List<String> list = new ArrayList<String>();
+		List list = new ArrayList();
 		for (int i = 0; i < args.length; i++) {
 			list.add(args[i]);
 		}
@@ -117,39 +117,39 @@ public class Options {
 	 *            the same as Eclipse installation directory. Additionally, most
 	 *            options accepted by Eclipse execuable are supported.
 	 */
-	public static void init(String appId, List<String> options) {
+	public static void init(String appId, List options) {
 		// Initialize eclipseArgs with all passed options
-		eclipseArgs = new ArrayList<String>();
+		eclipseArgs = new ArrayList();
 		eclipseArgs.addAll(options);
 
 		// consume -command option
 		helpCommand = extractOption(eclipseArgs, "-command"); //$NON-NLS-1$
 		if (helpCommand == null) {
-			helpCommand = new ArrayList<String>(0);
+			helpCommand = new ArrayList(0);
 		}
 		// consume update commands' parameters
-		List<String> parameters = new ArrayList<String>();
-		List<String> param = extractOption(eclipseArgs, "-" + PARAM_FEATUREID); //$NON-NLS-1$
+		List parameters = new ArrayList();
+		List param = extractOption(eclipseArgs, "-" + PARAM_FEATUREID); //$NON-NLS-1$
 		if (param != null) {
-			parameters.add(PARAM_FEATUREID + "=" + param.get(0)); //$NON-NLS-1$
+			parameters.add(PARAM_FEATUREID + "=" + (String) param.get(0)); //$NON-NLS-1$
 		}
 		param = extractOption(eclipseArgs, "-" + PARAM_VERSION); //$NON-NLS-1$
 		if (param != null) {
-			parameters.add(PARAM_VERSION + "=" + param.get(0)); //$NON-NLS-1$
+			parameters.add(PARAM_VERSION + "=" + (String) param.get(0)); //$NON-NLS-1$
 		}
 		param = extractOption(eclipseArgs, "-" + PARAM_FROM); //$NON-NLS-1$
 		if (param != null) {
-			parameters.add(PARAM_FROM + "=" + param.get(0)); //$NON-NLS-1$
+			parameters.add(PARAM_FROM + "=" + (String) param.get(0)); //$NON-NLS-1$
 		}
 		param = extractOption(eclipseArgs, "-" + PARAM_TO); //$NON-NLS-1$
 		if (param != null) {
-			parameters.add(PARAM_TO + "=" + param.get(0)); //$NON-NLS-1$
+			parameters.add(PARAM_TO + "=" + (String) param.get(0)); //$NON-NLS-1$
 		}
 		param = extractOption(eclipseArgs, "-" + PARAM_VERIFYONLY); //$NON-NLS-1$
 		if (param != null) {
-			parameters.add(PARAM_VERIFYONLY + "=" + param.get(0)); //$NON-NLS-1$
+			parameters.add(PARAM_VERIFYONLY + "=" + (String) param.get(0)); //$NON-NLS-1$
 		}
-		updateParameters = parameters.toArray(new String[parameters
+		updateParameters = (String[]) parameters.toArray(new String[parameters
 				.size()]);
 
 		// read -debug option
@@ -162,20 +162,20 @@ public class Options {
 			useExe = false;
 		}
 		// consume -eclipsehome (accept eclipse_home too) option
-		List<String> homes = extractOption(eclipseArgs, "-eclipseHome"); //$NON-NLS-1$
+		List homes = extractOption(eclipseArgs, "-eclipseHome"); //$NON-NLS-1$
 		if (homes == null || homes.isEmpty()) {
 			homes = extractOption(eclipseArgs, "-eclipse_Home"); //$NON-NLS-1$
 		}
 		if (homes != null && !homes.isEmpty()) {
-			eclipseHome = new File(homes.get(0));
+			eclipseHome = new File((String) homes.get(0));
 		} else {
 			eclipseHome = new File(System.getProperty("user.dir")); //$NON-NLS-1$
 		}
 
 		// read -data option
-		List<String> workspaces = extractOption(eclipseArgs, "-data"); //$NON-NLS-1$
+		List workspaces = extractOption(eclipseArgs, "-data"); //$NON-NLS-1$
 		if (workspaces != null && !workspaces.isEmpty()) {
-			String workspacePath = workspaces.get(0);
+			String workspacePath = (String) workspaces.get(0);
 			workspace = new File(workspacePath);
 			if (!workspace.isAbsolute()) {
 				workspace = new File(eclipseHome, workspacePath);
@@ -187,45 +187,45 @@ public class Options {
 		hostPortFile = new File(workspace, "/.metadata/.connection"); //$NON-NLS-1$
 
 		// consume -host option
-		List<String> hosts = extractOption(eclipseArgs, "-host"); //$NON-NLS-1$
+		List hosts = extractOption(eclipseArgs, "-host"); //$NON-NLS-1$
 		if (hosts != null && hosts.size() > 0) {
-			host = hosts.get(0);
+			host = (String) hosts.get(0);
 		}
 
 		// consume -port option
-		List<String> ports = extractOption(eclipseArgs, "-port"); //$NON-NLS-1$
+		List ports = extractOption(eclipseArgs, "-port"); //$NON-NLS-1$
 		if (ports != null && ports.size() > 0) {
-			port = ports.get(0);
+			port = (String) ports.get(0);
 		}
 		
 		// consume - adminId option
-		List<String> adminIds = extractOption(eclipseArgs, "-adminId"); //$NON-NLS-1$
+		List adminIds = extractOption(eclipseArgs, "-adminId"); //$NON-NLS-1$
 		if (adminIds != null && adminIds.size() > 0) {
-			adminId = adminIds.get(0);
+			adminId = (String) adminIds.get(0);
 		}
 		
 		// consume - admin option
-		List<String> adminPasswords = extractOption(eclipseArgs, "-adminPassword"); //$NON-NLS-1$
+		List adminPasswords = extractOption(eclipseArgs, "-adminPassword"); //$NON-NLS-1$
 		if (adminPasswords != null && adminPasswords.size() > 0) {
-			adminPassword = adminPasswords.get(0);
+			adminPassword = (String) adminPasswords.get(0);
 		}
 		
 		// consume - trustStoreLocation option
-		List<String> trustStoreLocations = extractOption(eclipseArgs, "-trustStoreLocation"); //$NON-NLS-1$
+		List trustStoreLocations = extractOption(eclipseArgs, "-trustStoreLocation"); //$NON-NLS-1$
 		if (trustStoreLocations != null && trustStoreLocations.size() > 0) {
-			trustStoreLocation = trustStoreLocations.get(0);
+			trustStoreLocation = (String) trustStoreLocations.get(0);
 		}
 		
 		// consume - trustStoreLocation option
-		List<String> trustStorePasswords = extractOption(eclipseArgs, "-trustStorePassword"); //$NON-NLS-1$
+		List trustStorePasswords = extractOption(eclipseArgs, "-trustStorePassword"); //$NON-NLS-1$
 		if (trustStorePasswords != null && trustStorePasswords.size() > 0) {
-			trustStorePassword = trustStorePasswords.get(0);
+			trustStorePassword = (String) trustStorePasswords.get(0);
 		}
 
 		// consume -vm option
-		List<String> vms = extractOption(eclipseArgs, "-vm"); //$NON-NLS-1$
+		List vms = extractOption(eclipseArgs, "-vm"); //$NON-NLS-1$
 		if (vms != null && !vms.isEmpty()) {
-			vm = vms.get(0);
+			vm = (String) vms.get(0);
 		} else {
 			String vmName = System.getProperty("java.vm.name"); //$NON-NLS-1$
 			String executable = "J9".equals(vmName) ? "j9" : "java"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -242,8 +242,8 @@ public class Options {
 		}
 
 		// consume -vmargs option
-		vmArgs = new ArrayList<String>(0);
-		List<String> passedVmArgs = extractOption(eclipseArgs, "-vmargs"); //$NON-NLS-1$
+		vmArgs = new ArrayList(0);
+		List passedVmArgs = extractOption(eclipseArgs, "-vmargs"); //$NON-NLS-1$
 		if (passedVmArgs != null && passedVmArgs.size() > 0) {
 			vmArgs = passedVmArgs;
 		}
@@ -313,7 +313,7 @@ public class Options {
 		return workspace;
 	}
 
-	public static List<String> getHelpCommand() {
+	public static List getHelpCommand() {
 		return helpCommand;
 	}
 
@@ -321,7 +321,7 @@ public class Options {
 		return updateParameters;
 	}
 
-	public static List<String> getEclipseArgs() {
+	public static List getEclipseArgs() {
 		return eclipseArgs;
 	}
 
@@ -333,18 +333,18 @@ public class Options {
 	 * @return List of String values of the specified option, or null if option
 	 *         is not present
 	 */
-	private static List<String> extractOption(List<String> options, String optionName) {
-		List<String> values = null;
+	private static List extractOption(List options, String optionName) {
+		List values = null;
 		for (int i = 0; i < options.size();) {
-			if (optionName.equalsIgnoreCase(options.get(i))) {
+			if (optionName.equalsIgnoreCase((String) options.get(i))) {
 				if (values == null) {
-					values = new ArrayList<String>(1);
+					values = new ArrayList(1);
 				}
 				// found the option, remove option
 				options.remove(i);
 				// remove option parameters
 				while (i < options.size()) {
-					if (options.get(i).startsWith("-") //$NON-NLS-1$
+					if (((String) options.get(i)).startsWith("-") //$NON-NLS-1$
 							&& !optionName.equals("-vmargs")) { //$NON-NLS-1$
 						// start of next option
 						break;
@@ -370,16 +370,16 @@ public class Options {
 	 * @return List of String values of the specified option, or null if option
 	 *         is not present
 	 */
-	private static List<String> getOption(List<String> options, String optionName) {
-		List<String> values = null;
+	private static List getOption(List options, String optionName) {
+		List values = null;
 		for (int i = 0; i < options.size(); i++) {
-			if (optionName.equalsIgnoreCase(options.get(i))) {
+			if (optionName.equalsIgnoreCase((String) options.get(i))) {
 				if (values == null) {
-					values = new ArrayList<String>(1);
+					values = new ArrayList(1);
 				}
 				// read option parameters
 				for (int j = i + 1; j < options.size(); j++) {
-					if (options.get(j).startsWith("-") //$NON-NLS-1$
+					if (((String) options.get(j)).startsWith("-") //$NON-NLS-1$
 							&& !optionName.equals("-vmargs")) { //$NON-NLS-1$
 						// start of next option
 						i = j;
@@ -396,7 +396,7 @@ public class Options {
 		return vm;
 	}
 
-	public static List<String> getVmArgs() {
+	public static List getVmArgs() {
 		return vmArgs;
 	}
 
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/validation/TocValidator.java b/org.eclipse.help.base/src/org/eclipse/help/internal/validation/TocValidator.java
index f9636e9a3..cc8818402 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/validation/TocValidator.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/validation/TocValidator.java
@@ -20,7 +20,7 @@ import org.eclipse.help.internal.toc.TocFileParser;
 import org.xml.sax.SAXException;
 
 /*******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,7 +34,7 @@ public class TocValidator {
 
 	private static final boolean DEBUG = false;
 	
-	private HashMap<String, Object> processedTocs;
+	private HashMap processedTocs;
 	private TocFileParser parser;
 	
 	public static class BrokenLink {
@@ -72,27 +72,27 @@ public class TocValidator {
 	 * @throws SAXException
 	 * @throws ParserConfigurationException
 	 */
-	public static ArrayList<BrokenLink> validate(String[] hrefs) throws IOException, SAXException, ParserConfigurationException{
+	public static ArrayList validate(String[] hrefs) throws IOException, SAXException, ParserConfigurationException{
 		return filteredValidate(hrefs, new PassThroughFilter());
 	}
 	
-	public static ArrayList<BrokenLink> filteredValidate (String[] hrefs, Filter filter) throws IOException, SAXException, ParserConfigurationException{
+	public static ArrayList filteredValidate (String[] hrefs, Filter filter) throws IOException, SAXException, ParserConfigurationException{
 		TocValidator v = new TocValidator();
-		ArrayList<BrokenLink> result = new ArrayList<BrokenLink>();
+		ArrayList result = new ArrayList();
 		for (int i = 0; i < hrefs.length; i++)
 			v.processToc(hrefs[i], null, result, filter);
 		return result;
 	}
 	
 	private TocValidator() {
-		processedTocs = new HashMap<String, Object>();
+		processedTocs = new HashMap();
 		parser = new TocFileParser();
 	}
 	
 	/* Checks validity of all links in a given toc. If all links are valid, an empty ArrayList is returned.
 	 * Otherwise an ArrayList of BrokenLink objects is returned.
 	 */
-	private void processToc(String href, String plugin, ArrayList<BrokenLink> result, Filter filter) 
+	private void processToc(String href, String plugin, ArrayList result, Filter filter) 
 	               throws IOException, SAXException, ParserConfigurationException {
 		String path;
 		if (href.startsWith("/")) { //$NON-NLS-1$
@@ -124,7 +124,7 @@ public class TocValidator {
 	 * If there are any links to other tocs, calls the processToc method to validate them. If any broken links
 	 * are found, an appropriate BrokenLink object will be added to the result ArrayList.
 	 */
-	private void process(IUAElement element, String plugin, String path, ArrayList<BrokenLink> result, Filter filter) throws SAXException, ParserConfigurationException {
+	private void process(IUAElement element, String plugin, String path, ArrayList result, Filter filter) throws SAXException, ParserConfigurationException {
 		String href;
 		if (element instanceof ILink) {
 			href = ((ILink)element).getToc();
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java
index ff0f33364..e49d863be 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,8 +20,8 @@ import org.w3c.dom.Element;
 
 public class WorkingSet {
 	private String name;
-	private List<AdaptableHelpResource> elements;
-	private List<CriterionResource> criteria;
+	private List elements;
+	private List criteria;
 
 	public WorkingSet(String name) {
 		this(name, (List) null, (List) null);
@@ -31,17 +31,17 @@ public class WorkingSet {
 		this(name, elements, null);
 	}
 	
-	public WorkingSet(String name, List<AdaptableHelpResource> elements, List<CriterionResource> criteria) {
+	public WorkingSet(String name, List elements, List criteria) {
 		this.name = name;
 		
 		if (elements == null)
-			elements = new ArrayList<AdaptableHelpResource>();
+			elements = new ArrayList();
 		this.elements = elements;
 		
 		if (criteria != null) {
 			this.criteria = criteria;
 		} else {
-			this.criteria = new ArrayList<CriterionResource>();
+			this.criteria = new ArrayList();
 		}		
 	}
 
@@ -55,7 +55,7 @@ public class WorkingSet {
 		if (elements == null)
 			elements = new AdaptableHelpResource[0];
 
-		this.elements = new ArrayList<AdaptableHelpResource>(elements.length);
+		this.elements = new ArrayList(elements.length);
 		for (int i = 0; i < elements.length; i++) {
 			this.elements.add(elements[i]);
 		}
@@ -63,7 +63,7 @@ public class WorkingSet {
 		if (criteria == null)
 			criteria = new CriterionResource[0];
 
-		this.criteria = new ArrayList<CriterionResource>(criteria.length);
+		this.criteria = new ArrayList(criteria.length);
 		for (int j = 0; j < criteria.length; j++) {
 			this.criteria.add(criteria[j]);
 		}
@@ -93,14 +93,14 @@ public class WorkingSet {
 	}
 
 	public void setElements(AdaptableHelpResource[] elements) {
-		this.elements = new ArrayList<AdaptableHelpResource>(elements.length);
+		this.elements = new ArrayList(elements.length);
 		for (int i = 0; i < elements.length; i++)
 			this.elements.add(elements[i]);
 	}
 	
 	
 	public void setCriteria(CriterionResource[] criteria) {
-		this.criteria = new ArrayList<CriterionResource>(criteria.length);
+		this.criteria = new ArrayList(criteria.length);
 		for(int i = 0; i < criteria.length; i++) {
 			this.criteria.add(criteria[i]);
 		}
@@ -120,9 +120,9 @@ public class WorkingSet {
 		
 		Element contents = doc.createElement("contents"); //$NON-NLS-1$
 		ws.appendChild(contents);
-		for (Iterator<AdaptableHelpResource> it = elements.iterator(); it.hasNext();) {
+		for (Iterator it = elements.iterator(); it.hasNext();) {
 			Element child = doc.createElement("item"); //$NON-NLS-1$
-			AdaptableHelpResource helpResource = it.next();
+			AdaptableHelpResource helpResource = (AdaptableHelpResource) it.next();
 			helpResource.saveState(child);
 			contents.appendChild(child);
 		}
@@ -131,10 +131,10 @@ public class WorkingSet {
 			Element criteriaElement = doc.createElement("criteria"); //$NON-NLS-1$
 			ws.appendChild(criteriaElement);
 			
-			for(Iterator<CriterionResource> iterator = criteria.iterator(); iterator.hasNext();){
+			for(Iterator iterator = criteria.iterator(); iterator.hasNext();){
 				Element criterionItem = doc.createElement("criterion"); //$NON-NLS-1$
 				criteriaElement.appendChild(criterionItem);
-				CriterionResource criterion = iterator.next();
+				CriterionResource criterion = (CriterionResource)iterator.next();
 				String criterionName = criterion.getCriterionName();
 				criterionItem.setAttribute("name", criterionName);//$NON-NLS-1$
 				List criterionValues = criterion.getCriterionValues();
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
index 258e6cb81..bbfeb0fbe 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
@@ -64,7 +64,7 @@ public class WorkingSetManager implements IHelpWorkingSetManager {
 
 	private static final String UNCATEGORIZED = "Uncategorized"; //$NON-NLS-1$
 	
-	private SortedSet<WorkingSet> workingSets = new TreeSet<WorkingSet>(new WorkingSetComparator());
+	private SortedSet workingSets = new TreeSet(new WorkingSetComparator());
 
 	private AdaptableTocsArray root;
 	
@@ -141,9 +141,9 @@ public class WorkingSetManager implements IHelpWorkingSetManager {
 		if (name == null || workingSets == null)
 			return null;
 
-		Iterator<WorkingSet> iter = workingSets.iterator();
+		Iterator iter = workingSets.iterator();
 		while (iter.hasNext()) {
-			WorkingSet workingSet = iter.next();
+			WorkingSet workingSet = (WorkingSet) iter.next();
 			if (name.equals(workingSet.getName()))
 				return workingSet;
 		}
@@ -165,7 +165,7 @@ public class WorkingSetManager implements IHelpWorkingSetManager {
 	 * @see org.eclipse.ui.IWorkingSetManager#getWorkingSets()
 	 */
 	public WorkingSet[] getWorkingSets() {
-		return workingSets.toArray(new WorkingSet[workingSets
+		return (WorkingSet[]) workingSets.toArray(new WorkingSet[workingSets
 				.size()]);
 	}
 
@@ -262,7 +262,7 @@ public class WorkingSetManager implements IHelpWorkingSetManager {
 		String name = workingSetNode.getAttribute("name"); //$NON-NLS-1$
 
 		// scope
-		List<AdaptableHelpResource> helpResources = new ArrayList<AdaptableHelpResource>();
+		List helpResources = new ArrayList();
 		NodeList contents = workingSetNode.getElementsByTagName("contents"); //$NON-NLS-1$
 		for (int i = 0; i < contents.getLength(); i++) {
 			Element content = (Element) contents.item(i);
@@ -303,14 +303,14 @@ public class WorkingSetManager implements IHelpWorkingSetManager {
 				
 		//criteria
 		
-		List<CriterionResource> criteriaResource = new ArrayList<CriterionResource>();
+		List criteriaResource = new ArrayList();
 		NodeList criteriaContents = workingSetNode.getElementsByTagName("criterion"); //$NON-NLS-1$
 		for (int i = 0; i < criteriaContents.getLength(); ++i) {
 			Element criterion = (Element) criteriaContents.item(i);
 			String criterionName = criterion.getAttribute("name"); //$NON-NLS-1$
 			if(null != name && 0 != name.length()){
 				NodeList items = criterion.getElementsByTagName("item"); //$NON-NLS-1$
-				List<String> criterionValues = new ArrayList<String>();
+				List criterionValues = new ArrayList();
 				for(int j = 0; j < items.getLength(); ++j){
 					String value = ((Element) items.item(j)).getAttribute("value"); //$NON-NLS-1$
 					if(null != value && 0 != value.length()){
@@ -380,10 +380,10 @@ public class WorkingSetManager implements IHelpWorkingSetManager {
 	 *            the xml node to save to
 	 */
 	private void saveWorkingSetState(Element parent) {
-		Iterator<WorkingSet> iterator = workingSets.iterator();
+		Iterator iterator = workingSets.iterator();
 
 		while (iterator.hasNext()) {
-			WorkingSet workingSet = iterator.next();
+			WorkingSet workingSet = (WorkingSet) iterator.next();
 			workingSet.saveState(parent);
 		}
 	}
@@ -452,7 +452,7 @@ public class WorkingSetManager implements IHelpWorkingSetManager {
 	public void tocsChanged() {
 		saveState();
 		root = null;
-		workingSets = new TreeSet<WorkingSet>(new WorkingSetComparator());
+		workingSets = new TreeSet(new WorkingSetComparator());
 		restoreState();
 	}
 	
@@ -471,7 +471,7 @@ public class WorkingSetManager implements IHelpWorkingSetManager {
 		if(null == allCriteriaValues){
 			allCriteriaValues = HelpPlugin.getCriteriaManager().getAllCriteriaValues(Platform.getNL());
 		}
-		List<String> criterionIds = new ArrayList<String>();
+		List criterionIds = new ArrayList();
 		if(null != allCriteriaValues){
 			for(Iterator iter = allCriteriaValues.keySet().iterator(); iter.hasNext();){
 				String criterion = (String) iter.next();
@@ -490,9 +490,9 @@ public class WorkingSetManager implements IHelpWorkingSetManager {
 		if(null == allCriteriaValues){
 			allCriteriaValues = HelpPlugin.getCriteriaManager().getAllCriteriaValues(Platform.getNL());
 		}
-		List<String> valueIds = new ArrayList<String>();
+		List valueIds = new ArrayList();
 		if(null != criterionName && null != allCriteriaValues) {
-			Set<String> criterionValues = (Set<String>)allCriteriaValues.get(criterionName);
+			Set criterionValues = (Set)allCriteriaValues.get(criterionName);
 			if(null != criterionValues && !criterionValues.isEmpty()) {
 				valueIds.addAll(criterionValues);
 				Collections.sort(valueIds);
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java b/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
index a9e8d839d..90b318047 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
@@ -101,9 +101,9 @@ public class HelpIndexBuilder {
 
 	private File destination;
 	
-	private ArrayList<TocFile> tocFiles = new ArrayList<TocFile>();
+	private ArrayList tocFiles = new ArrayList();
 
-	private ArrayList<LocaleDir> localeDirs = new ArrayList<LocaleDir>();
+	private ArrayList localeDirs = new ArrayList();
 
 	private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory
 			.newInstance();
@@ -111,8 +111,8 @@ public class HelpIndexBuilder {
 	private DocumentBuilder parser;
 	
 	private static Locale[] legalLocales = Locale.getAvailableLocales();
-	private static HashSet<String> legalLanguages = null;
-	private static HashSet<String> legalCountries = null;
+	private static HashSet legalLanguages = null;
+	private static HashSet legalCountries = null;
 
 	class PluginIdentifier {
 		String id;
@@ -128,7 +128,7 @@ public class HelpIndexBuilder {
 	class LocaleDir {
 		String locale;
 		String relativePath;
-		ArrayList<File> dirs = new ArrayList<File>();
+		ArrayList dirs = new ArrayList();
 
 		public LocaleDir(String locale, String relativePath) {
 			this.locale = locale;
@@ -137,7 +137,7 @@ public class HelpIndexBuilder {
 		
 		public File findFile(String file) {
 			for (int i=0; i<dirs.size(); i++) {
-				File dir = dirs.get(i);
+				File dir = (File)dirs.get(i);
 				File absoluteFile = new File(dir, file);
 				if (absoluteFile.exists())
 					return absoluteFile;
@@ -309,7 +309,7 @@ public class HelpIndexBuilder {
 
 		for (int i=0; i<localeDirs.size(); i++) {
 			// process locale dir
-			LocaleDir localeDir = localeDirs.get(i);
+			LocaleDir localeDir = (LocaleDir) localeDirs.get(i);
 			MultiStatus localeStatus = processLocaleDir(pid, fid,
 					localeDir, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
 			if (localeStatus != null) {
@@ -368,7 +368,7 @@ public class HelpIndexBuilder {
 		if (!nl.exists() || !nl.isDirectory())
 			return;
 		File [] languages = nl.listFiles();
-		HashSet<String> locales = new HashSet<String>();
+		HashSet locales = new HashSet();
 		for (int i=0; i<languages.length; i++) {
 			File language = languages[i];
 			if (!language.isDirectory())
@@ -442,7 +442,7 @@ public class HelpIndexBuilder {
 	
 	private boolean isValidLanguage(String language) {
 		if (legalLanguages==null) {
-			legalLanguages = new HashSet<String>();
+			legalLanguages = new HashSet();
 			String [] choices = Locale.getISOLanguages();
 			for (int i=0; i<choices.length; i++) {
 				legalLanguages.add(choices[i]);
@@ -453,7 +453,7 @@ public class HelpIndexBuilder {
 	
 	private boolean isValidCountry(String country) {
 		if (legalCountries==null) {
-			legalCountries = new HashSet<String>();
+			legalCountries = new HashSet();
 			String [] choices = Locale.getISOCountries();
 			for (int i=0; i<choices.length; i++) {
 				legalCountries.add(choices[i]);
@@ -471,12 +471,12 @@ public class HelpIndexBuilder {
 			PluginIdentifier fid, LocaleDir localeDir, IProgressMonitor monitor)
 			throws CoreException {
 		// build an index for each locale directory
-		String message = NLS.bind(HelpBaseResources.HelpIndexBuilder_indexFor, localeDir.dirs.get(0).getName());
+		String message = NLS.bind(HelpBaseResources.HelpIndexBuilder_indexFor, ((File)localeDir.dirs.get(0)).getName());
 		monitor.beginTask(message, 5);		
-		File directory = localeDir.dirs.get(0);
+		File directory = (File)localeDir.dirs.get(0);
 		File indexDirectory = new File(directory, indexPath);
 		prepareDirectory(indexDirectory);
-		Collection<String> docs = collectDocs(localeDir);
+		Collection docs = collectDocs(localeDir);
 		MultiStatus status = null;
 		if (docs.size()>0) {
 			String locale = localeDir.locale!=null?localeDir.locale:Platform.getNL();
@@ -499,11 +499,11 @@ public class HelpIndexBuilder {
 	 * collect hrefs for the topics.
 	 */
 
-	private Collection<String> collectDocs(LocaleDir localeDir)
+	private Collection collectDocs(LocaleDir localeDir)
 			throws CoreException {
-		HashSet<String> docs = new HashSet<String>();
+		HashSet docs = new HashSet();
 		for (int i = 0; i < tocFiles.size(); i++) {
-			TocFile tocFile = tocFiles.get(i);
+			TocFile tocFile = (TocFile) tocFiles.get(i);
 			collectDocs(docs, getTocFile(localeDir, tocFile.href));
 			if (tocFile.extraDir!=null) {
 				//TODO also include all the indexable documents
@@ -532,7 +532,7 @@ public class HelpIndexBuilder {
 	/*
 	 * Collect hrefs starting from the 'toc' element.
 	 */
-	private void collectDocs(Set<String> docs, File tocFile)
+	private void collectDocs(Set docs, File tocFile)
 			throws CoreException {
 		if (!tocFile.exists())
 			return;
@@ -543,7 +543,7 @@ public class HelpIndexBuilder {
 	/*
 	 * Recursive collection of hrefs from topics.
 	 */
-	private void add(Element topic, Set<String> hrefs) {
+	private void add(Element topic, Set hrefs) {
 		String href = getAttribute(topic, "href"); //$NON-NLS-1$
 		if (topic.getTagName().equals("toc")) { //$NON-NLS-1$
 			// toc element has 'topic' attribute. Don't ask why :-)
@@ -574,7 +574,7 @@ public class HelpIndexBuilder {
 	 */
 
 	private MultiStatus createIndex(String pluginId, boolean fragment, LocaleDir localeDir,
-			SearchIndex index, Collection<String> addedDocs, IProgressMonitor monitor)
+			SearchIndex index, Collection addedDocs, IProgressMonitor monitor)
 			throws CoreException {
 		monitor.beginTask(HelpBaseResources.UpdatingIndex, addedDocs.size());		
 		if (!index.beginAddBatch(true)) {
@@ -583,8 +583,8 @@ public class HelpIndexBuilder {
 		checkCancelled(monitor);
 		MultiStatus multiStatus = null;
 
-		for (Iterator<String> it = addedDocs.iterator(); it.hasNext();) {
-			String href = it.next();
+		for (Iterator it = addedDocs.iterator(); it.hasNext();) {
+			String href = (String) it.next();
 			URL url = localeDir.findURL(href);
 			if (url != null) {
 				IStatus status = index
@@ -755,7 +755,7 @@ public class HelpIndexBuilder {
 	}
 
 	private Element[] getTocExtensions(Document doc) {
-		ArrayList<Node> list = new ArrayList<Node>();
+		ArrayList list = new ArrayList();
 		//Node root = doc.getDocumentElement();
 		NodeList children = doc.getElementsByTagName("extension"); //$NON-NLS-1$
 		for (int i = 0; i < children.getLength(); i++) {
@@ -764,7 +764,7 @@ public class HelpIndexBuilder {
 			if (point.equals(POINT_TOC))
 				list.add(child);
 		}
-		return list.toArray(new Element[list.size()]);
+		return (Element[]) list.toArray(new Element[list.size()]);
 	}
 
 	private Properties manifestToProperties(Attributes d) {
@@ -783,4 +783,4 @@ public class HelpIndexBuilder {
 				IStatus.OK, message, t);
 		throw new CoreException(status);
 	}
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipantXML.java b/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipantXML.java
index 2918c07a2..e3b9073cc 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipantXML.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipantXML.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
+ * Copyright (c) 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -39,7 +39,7 @@ import org.xml.sax.helpers.DefaultHandler;
  * @since 3.5
  */
 public abstract class SearchParticipantXML extends SearchParticipant {
-	private Stack<String> stack = new Stack<String>();
+	private Stack stack = new Stack();
 	private SAXParser parser;
 	private XMLProcessor processor;
 	private boolean hasFilters;
@@ -157,7 +157,7 @@ public abstract class SearchParticipantXML extends SearchParticipant {
 
 		public void endElement(String uri, String localName, String qName) throws SAXException {
 			handleEndElement(qName, data);
-			String top = stack.peek();
+			String top = (String) stack.peek();
 			if (top != null && top.equals(qName))
 				stack.pop();
 		}
@@ -329,7 +329,7 @@ public abstract class SearchParticipantXML extends SearchParticipant {
 	 */
 
 	protected String getTopElement() {
-		return stack.peek();
+		return (String) stack.peek();
 	}
 
 	/**
@@ -342,7 +342,7 @@ public abstract class SearchParticipantXML extends SearchParticipant {
 		for (int i = 0; i < stack.size(); i++) {
 			if (i > 0)
 				buf.append("/"); //$NON-NLS-1$
-			buf.append(stack.get(i));
+			buf.append((String) stack.get(i));
 		}
 		return buf.toString();
 	}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/XMLSearchParticipant.java b/org.eclipse.help.base/src/org/eclipse/help/search/XMLSearchParticipant.java
index e3b9494b6..abe7927a7 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/XMLSearchParticipant.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/XMLSearchParticipant.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -47,7 +47,7 @@ import org.xml.sax.helpers.DefaultHandler;
  * and the class SearchParticipantXML should be used instead.
  */
 public abstract class XMLSearchParticipant extends LuceneSearchParticipant {
-	private Stack<String> stack = new Stack<String>();
+	private Stack stack = new Stack();
 	private SAXParser parser;
 	private XMLProcessor processor;
 	private boolean hasFilters;
@@ -165,7 +165,7 @@ public abstract class XMLSearchParticipant extends LuceneSearchParticipant {
 
 		public void endElement(String uri, String localName, String qName) throws SAXException {
 			handleEndElement(qName, data);
-			String top = stack.peek();
+			String top = (String) stack.peek();
 			if (top != null && top.equals(qName))
 				stack.pop();
 		}
@@ -340,7 +340,7 @@ public abstract class XMLSearchParticipant extends LuceneSearchParticipant {
 	 */
 
 	protected String getTopElement() {
-		return stack.peek();
+		return (String) stack.peek();
 	}
 
 	/**
@@ -353,7 +353,7 @@ public abstract class XMLSearchParticipant extends LuceneSearchParticipant {
 		for (int i = 0; i < stack.size(); i++) {
 			if (i > 0)
 				buf.append("/"); //$NON-NLS-1$
-			buf.append(stack.get(i));
+			buf.append((String) stack.get(i));
 		}
 		return buf.toString();
 	}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java b/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java
index d6a722039..9693ec6c1 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -72,9 +72,9 @@ public class Help {
 	public Help(String pluginsDir) {
 		File plugins = new File(pluginsDir);
 		String install = plugins.getParent();
-		ArrayList<String> options = new ArrayList<String>(2);
+		ArrayList options = new ArrayList(2);
 		if (install != null) {
-			options = new ArrayList<String>(2);
+			options = new ArrayList(2);
 			options.add("-eclipseHome"); //$NON-NLS-1$
 			options.add(install);
 		}