Attachment 211642 Details for Bug 359724 – Path for this bug using egit

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Path for this bug using egit

Fix-for-Bug-359724.patch (text/plain), 1.86 MB, created by Samrat Dhillon

on 2012-02-26 13:54:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Samrat Dhillon

Created: 2012-02-26 13:54:48 EST

Size: 1.86 MB

patch

obsolete

>diff --git a/.gitignore b/.gitignore
>index a4f9c0a..ecd8f25 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1,4 +1,4 @@
>-bin/
>+/*/bin/
> *~
> *.rej
> *.bak
>@@ -7,8 +7,7 @@
> heapdump.*
> core.*
> Snap.*
>-target/
>-bin-resources/
>-binext/
>-binprocessors/
>-antbin/
>+/*/bin-resources/
>+/*/binext/
>+/*/binprocessors/
>+/*/antbin/
>diff --git a/org.eclipse.jdt.annotation/.classpath b/org.eclipse.jdt.annotation/.classpath
>new file mode 100644
>index 0000000..304e861
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/.classpath
>@@ -0,0 +1,7 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<classpath>
>+	<classpathentry kind="src" path="src"/>
>+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
>+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
>+	<classpathentry kind="output" path="bin"/>
>+</classpath>
>diff --git a/org.eclipse.jdt.annotation/.project b/org.eclipse.jdt.annotation/.project
>new file mode 100644
>index 0000000..84d76bb
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/.project
>@@ -0,0 +1,34 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<projectDescription>
>+	<name>org.eclipse.jdt.annotation</name>
>+	<comment></comment>
>+	<projects>
>+	</projects>
>+	<buildSpec>
>+		<buildCommand>
>+			<name>org.eclipse.jdt.core.javabuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.pde.ManifestBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.pde.SchemaBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+	</buildSpec>
>+	<natures>
>+		<nature>org.eclipse.jdt.core.javanature</nature>
>+		<nature>org.eclipse.pde.PluginNature</nature>
>+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
>+	</natures>
>+</projectDescription>
>diff --git a/org.eclipse.jdt.annotation/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jdt.annotation/.settings/org.eclipse.core.runtime.prefs
>new file mode 100644
>index 0000000..5a0ad22
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/.settings/org.eclipse.core.runtime.prefs
>@@ -0,0 +1,2 @@
>+eclipse.preferences.version=1
>+line.separator=\n
>diff --git a/org.eclipse.jdt.annotation/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.annotation/.settings/org.eclipse.jdt.core.prefs
>new file mode 100644
>index 0000000..ccd5771
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/.settings/org.eclipse.jdt.core.prefs
>@@ -0,0 +1,364 @@
>+eclipse.preferences.version=1
>+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
>+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
>+org.eclipse.jdt.core.builder.invalidClasspath=abort
>+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
>+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/
>+org.eclipse.jdt.core.circularClasspath=error
>+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
>+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
>+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
>+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
>+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
>+org.eclipse.jdt.core.compiler.compliance=1.5
>+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>+org.eclipse.jdt.core.compiler.debug.localVariable=generate
>+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
>+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
>+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
>+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
>+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=warning
>+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
>+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
>+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
>+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
>+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=warning
>+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
>+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
>+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
>+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
>+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
>+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
>+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
>+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
>+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
>+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
>+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
>+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
>+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
>+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
>+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
>+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
>+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
>+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
>+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
>+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
>+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
>+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
>+org.eclipse.jdt.core.compiler.problem.nullReference=warning
>+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
>+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
>+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
>+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
>+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
>+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
>+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
>+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
>+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=warning
>+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
>+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
>+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
>+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
>+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
>+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
>+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
>+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=warning
>+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
>+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=error
>+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
>+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
>+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
>+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
>+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
>+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
>+org.eclipse.jdt.core.compiler.source=1.5
>+org.eclipse.jdt.core.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=0
>+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
>+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
>+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
>+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
>+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
>+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
>+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
>+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
>+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
>+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
>+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
>+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
>+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
>+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
>+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
>+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
>+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
>+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
>+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
>+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
>+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
>+org.eclipse.jdt.core.formatter.comment.format_header=false
>+org.eclipse.jdt.core.formatter.comment.format_html=true
>+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
>+org.eclipse.jdt.core.formatter.comment.format_line_comments=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=120
>+org.eclipse.jdt.core.formatter.compact_else_if=true
>+org.eclipse.jdt.core.formatter.continuation_indentation=2
>+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
>+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
>+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
>+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
>+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
>+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
>+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
>+org.eclipse.jdt.core.formatter.indent_empty_lines=false
>+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
>+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
>+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
>+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
>+org.eclipse.jdt.core.formatter.indentation.size=4
>+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
>+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
>+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
>+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
>+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
>+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
>+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
>+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
>+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
>+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
>+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
>+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
>+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
>+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
>+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
>+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
>+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
>+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
>+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
>+org.eclipse.jdt.core.formatter.lineSplit=120
>+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
>+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
>+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
>+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
>+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
>+org.eclipse.jdt.core.formatter.tabulation.char=tab
>+org.eclipse.jdt.core.formatter.tabulation.size=4
>+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
>+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
>+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
>+org.eclipse.jdt.core.incompleteClasspath=error
>diff --git a/org.eclipse.jdt.annotation/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.jdt.annotation/.settings/org.eclipse.jdt.launching.prefs
>new file mode 100644
>index 0000000..2dcd706
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/.settings/org.eclipse.jdt.launching.prefs
>@@ -0,0 +1,3 @@
>+#Wed Feb 02 11:25:08 EST 2011
>+eclipse.preferences.version=1
>+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error
>diff --git a/org.eclipse.jdt.annotation/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.jdt.annotation/.settings/org.eclipse.jdt.ui.prefs
>new file mode 100644
>index 0000000..020f0ab
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/.settings/org.eclipse.jdt.ui.prefs
>@@ -0,0 +1,105 @@
>+#Tue Jan 05 12:29:35 EST 2010
>+cleanup.add_default_serial_version_id=true
>+cleanup.add_generated_serial_version_id=false
>+cleanup.add_missing_annotations=true
>+cleanup.add_missing_deprecated_annotations=true
>+cleanup.add_missing_nls_tags=false
>+cleanup.add_missing_override_annotations=true
>+cleanup.add_serial_version_id=false
>+cleanup.always_use_blocks=true
>+cleanup.always_use_parentheses_in_expressions=false
>+cleanup.always_use_this_for_non_static_field_access=true
>+cleanup.always_use_this_for_non_static_method_access=false
>+cleanup.convert_to_enhanced_for_loop=false
>+cleanup.format_comment=false
>+cleanup.format_javadoc=true
>+cleanup.format_multi_line_comment=true
>+cleanup.format_single_line_comment=true
>+cleanup.format_source_code=false
>+cleanup.make_local_variable_final=true
>+cleanup.make_parameters_final=false
>+cleanup.make_private_fields_final=true
>+cleanup.make_variable_declarations_final=false
>+cleanup.never_use_blocks=false
>+cleanup.never_use_parentheses_in_expressions=true
>+cleanup.organize_imports=true
>+cleanup.qualify_static_field_accesses_with_declaring_class=true
>+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
>+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
>+cleanup.qualify_static_member_accesses_with_declaring_class=true
>+cleanup.qualify_static_method_accesses_with_declaring_class=false
>+cleanup.remove_private_constructors=true
>+cleanup.remove_unnecessary_casts=true
>+cleanup.remove_unnecessary_nls_tags=true
>+cleanup.remove_unused_imports=true
>+cleanup.remove_unused_local_variables=false
>+cleanup.remove_unused_private_fields=true
>+cleanup.remove_unused_private_members=false
>+cleanup.remove_unused_private_methods=true
>+cleanup.remove_unused_private_types=true
>+cleanup.use_blocks=false
>+cleanup.use_blocks_only_for_return_and_throw=false
>+cleanup.use_parentheses_in_expressions=false
>+cleanup.use_this_for_non_static_field_access=true
>+cleanup.use_this_for_non_static_field_access_only_if_necessary=false
>+cleanup.use_this_for_non_static_method_access=false
>+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
>+cleanup_profile=_Numbat
>+cleanup_settings_version=2
>+eclipse.preferences.version=1
>+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
>+formatter_profile=_Jdtcore [built-in + Indent switch body + LineWidth\:120]
>+formatter_settings_version=11
>+sp_cleanup.add_default_serial_version_id=true
>+sp_cleanup.add_generated_serial_version_id=false
>+sp_cleanup.add_missing_annotations=false
>+sp_cleanup.add_missing_deprecated_annotations=true
>+sp_cleanup.add_missing_methods=false
>+sp_cleanup.add_missing_nls_tags=false
>+sp_cleanup.add_missing_override_annotations=true
>+sp_cleanup.add_missing_override_annotations_interface_methods=false
>+sp_cleanup.add_serial_version_id=false
>+sp_cleanup.always_use_blocks=true
>+sp_cleanup.always_use_parentheses_in_expressions=false
>+sp_cleanup.always_use_this_for_non_static_field_access=false
>+sp_cleanup.always_use_this_for_non_static_method_access=false
>+sp_cleanup.convert_to_enhanced_for_loop=false
>+sp_cleanup.correct_indentation=false
>+sp_cleanup.format_source_code=false
>+sp_cleanup.format_source_code_changes_only=false
>+sp_cleanup.make_local_variable_final=false
>+sp_cleanup.make_parameters_final=false
>+sp_cleanup.make_private_fields_final=true
>+sp_cleanup.make_type_abstract_if_missing_method=false
>+sp_cleanup.make_variable_declarations_final=false
>+sp_cleanup.never_use_blocks=false
>+sp_cleanup.never_use_parentheses_in_expressions=true
>+sp_cleanup.on_save_use_additional_actions=true
>+sp_cleanup.organize_imports=false
>+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
>+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
>+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
>+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
>+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
>+sp_cleanup.remove_private_constructors=true
>+sp_cleanup.remove_trailing_whitespaces=false
>+sp_cleanup.remove_trailing_whitespaces_all=true
>+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
>+sp_cleanup.remove_unnecessary_casts=false
>+sp_cleanup.remove_unnecessary_nls_tags=false
>+sp_cleanup.remove_unused_imports=false
>+sp_cleanup.remove_unused_local_variables=false
>+sp_cleanup.remove_unused_private_fields=true
>+sp_cleanup.remove_unused_private_members=false
>+sp_cleanup.remove_unused_private_methods=true
>+sp_cleanup.remove_unused_private_types=true
>+sp_cleanup.sort_members=false
>+sp_cleanup.sort_members_all=false
>+sp_cleanup.update_ibm_copyright_to_current_year=true
>+sp_cleanup.use_blocks=false
>+sp_cleanup.use_blocks_only_for_return_and_throw=false
>+sp_cleanup.use_parentheses_in_expressions=false
>+sp_cleanup.use_this_for_non_static_field_access=false
>+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
>+sp_cleanup.use_this_for_non_static_method_access=false
>+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
>diff --git a/org.eclipse.jdt.annotation/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.jdt.annotation/.settings/org.eclipse.pde.api.tools.prefs
>new file mode 100644
>index 0000000..6f7536a
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/.settings/org.eclipse.pde.api.tools.prefs
>@@ -0,0 +1,94 @@
>+#Fri May 21 10:24:07 EDT 2010
>+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
>+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
>+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
>+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
>+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
>+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
>+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
>+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
>+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
>+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
>+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
>+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
>+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
>+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
>+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
>+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
>+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
>+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
>+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
>+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
>+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
>+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
>+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
>+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
>+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
>+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
>+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
>+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
>+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
>+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
>+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
>+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
>+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
>+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
>+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
>+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
>+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
>+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
>+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
>+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
>+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
>+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
>+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
>+ILLEGAL_EXTEND=Warning
>+ILLEGAL_IMPLEMENT=Warning
>+ILLEGAL_INSTANTIATE=Warning
>+ILLEGAL_OVERRIDE=Warning
>+ILLEGAL_REFERENCE=Warning
>+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
>+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
>+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
>+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
>+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
>+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
>+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
>+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
>+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
>+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
>+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
>+INVALID_JAVADOC_TAG=Warning
>+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Warning
>+LEAK_EXTEND=Warning
>+LEAK_FIELD_DECL=Warning
>+LEAK_IMPLEMENT=Warning
>+LEAK_METHOD_PARAM=Warning
>+LEAK_METHOD_RETURN_TYPE=Warning
>+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
>+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
>+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
>+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
>+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
>+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
>+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
>+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
>+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
>+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
>+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
>+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
>+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
>+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
>+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
>+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
>+UNUSED_PROBLEM_FILTERS=Warning
>+automatically_removed_unused_problem_filters=false
>+eclipse.preferences.version=1
>+incompatible_api_component_version=Error
>+incompatible_api_component_version_include_major_without_breaking_change=Disabled
>+incompatible_api_component_version_include_minor_without_api_change=Disabled
>+invalid_since_tag_version=Error
>+malformed_since_tag=Error
>+missing_since_tag=Error
>+report_api_breakage_when_major_version_incremented=Disabled
>+report_resolution_errors_api_component=Warning
>diff --git a/org.eclipse.jdt.annotation/.settings/org.eclipse.pde.prefs b/org.eclipse.jdt.annotation/.settings/org.eclipse.pde.prefs
>new file mode 100644
>index 0000000..35bb407
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/.settings/org.eclipse.pde.prefs
>@@ -0,0 +1,35 @@
>+#Fri May 21 10:24:08 EDT 2010
>+compilers.f.unresolved-features=1
>+compilers.f.unresolved-plugins=1
>+compilers.incompatible-environment=1
>+compilers.p.build=1
>+compilers.p.build.bin.includes=1
>+compilers.p.build.encodings=2
>+compilers.p.build.java.compiler=2
>+compilers.p.build.java.compliance=2
>+compilers.p.build.missing.output=2
>+compilers.p.build.output.library=2
>+compilers.p.build.source.library=2
>+compilers.p.build.src.includes=1
>+compilers.p.deprecated=1
>+compilers.p.discouraged-class=1
>+compilers.p.internal=1
>+compilers.p.missing-bundle-classpath-entries=2
>+compilers.p.missing-packages=2
>+compilers.p.missing-version-export-package=2
>+compilers.p.missing-version-import-package=2
>+compilers.p.missing-version-require-bundle=2
>+compilers.p.no-required-att=0
>+compilers.p.not-externalized-att=2
>+compilers.p.unknown-attribute=1
>+compilers.p.unknown-class=1
>+compilers.p.unknown-element=1
>+compilers.p.unknown-identifier=1
>+compilers.p.unknown-resource=1
>+compilers.p.unresolved-ex-points=0
>+compilers.p.unresolved-import=0
>+compilers.s.create-docs=false
>+compilers.s.doc-folder=doc
>+compilers.s.open-tags=1
>+compilers.use-project=true
>+eclipse.preferences.version=1
>diff --git a/org.eclipse.jdt.annotation/META-INF/MANIFEST.MF b/org.eclipse.jdt.annotation/META-INF/MANIFEST.MF
>new file mode 100644
>index 0000000..227f618
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/META-INF/MANIFEST.MF
>@@ -0,0 +1,9 @@
>+Manifest-Version: 1.0
>+Bundle-ManifestVersion: 2
>+Bundle-Name: %bundleName
>+Bundle-Localization: bundle
>+Bundle-SymbolicName: org.eclipse.jdt.annotation
>+Bundle-Version: 1.0.0.qualifier
>+Export-Package: org.eclipse.jdt.annotation
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Bundle-Vendor: %providerName
>diff --git a/org.eclipse.jdt.annotation/about.html b/org.eclipse.jdt.annotation/about.html
>new file mode 100644
>index 0000000..c258ef5
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/about.html
>@@ -0,0 +1,28 @@
>+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
>+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
>+<html xmlns="http://www.w3.org/1999/xhtml">
>+<head>
>+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
>+<title>About</title>
>+</head>
>+<body lang="EN-US">
>+<h2>About This Content</h2>
>+ 
>+<p>June 5, 2006</p>	
>+<h3>License</h3>
>+
>+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
>+indicated below, the Content is provided to you under the terms and conditions of the
>+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
>+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
>+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
>+
>+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
>+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
>+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
>+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
>+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
>+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
>+
>+</body>
>+</html>
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.annotation/build.properties b/org.eclipse.jdt.annotation/build.properties
>new file mode 100644
>index 0000000..153d0b7
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/build.properties
>@@ -0,0 +1,18 @@
>+###############################################################################
>+# Copyright (c) 2011 Stephan Herrmann and others.
>+# All rights reserved. This program and the accompanying materials
>+# are made available under the terms of the Eclipse Public License v1.0
>+# which accompanies this distribution, and is available at
>+# http://www.eclipse.org/legal/epl-v10.html
>+#
>+# Contributors:
>+#     Stephan Herrmann - initial API and implementation
>+#     IBM Corporation - bug fixes
>+###############################################################################
>+source.. = src/
>+bin.includes = META-INF/,\
>+               .,\
>+               bundle.properties,\
>+               src/,\
>+               about.html
>+src.includes = about.html
>diff --git a/org.eclipse.jdt.annotation/bundle.properties b/org.eclipse.jdt.annotation/bundle.properties
>new file mode 100644
>index 0000000..e4bef55
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/bundle.properties
>@@ -0,0 +1,12 @@
>+###############################################################################
>+# Copyright (c) 2011 Stephan Herrmann.
>+# All rights reserved. This program and the accompanying materials
>+# are made available under the terms of the Eclipse Public License v1.0
>+# which accompanies this distribution, and is available at
>+# http://www.eclipse.org/legal/epl-v10.html
>+#
>+# Contributors:
>+#     Stephan Herrmann - initial API and implementation
>+###############################################################################
>+providerName=Eclipse.org
>+bundleName=JDT Annotations for Enhanced Null Analysis
>diff --git a/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNull.java b/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNull.java
>new file mode 100644
>index 0000000..9372739
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNull.java
>@@ -0,0 +1,50 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 Stephan Herrmann and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Stephan Herrmann - initial API and implementation
>+ *     IBM Corporation - bug fixes
>+ *******************************************************************************/
>+package org.eclipse.jdt.annotation;
>+
>+import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
>+import static java.lang.annotation.ElementType.METHOD;
>+import static java.lang.annotation.ElementType.PARAMETER;
>+
>+import java.lang.annotation.Documented;
>+import java.lang.annotation.Retention;
>+import java.lang.annotation.RetentionPolicy;
>+import java.lang.annotation.Target;
>+ 
>+/**
>+ * Qualifier for a type in a method signature or a local variable declaration:
>+ * The entity (return value, parameter, local variable) whose type has this
>+ * annotation can never have the value <code>null</code> at runtime.
>+ * <p>
>+ * This has two consequences:
>+ * <ol>
>+ * <li>Dereferencing the entity is safe, i.e., no <code>NullPointerException</code> can occur at runtime.</li>
>+ * <li>An attempt to bind a <code>null</code> value to the entity is a compile time error.</li>
>+ * </ol>
>+ * For the second case, diagnostics issued by the compiler should distinguish three situations:
>+ * <ol>
>+ * <li>Nullness of the value can be statically determined, the entity is definitely bound from either of:
>+ *     <ul><li>the value <code>null</code>, or</li>
>+ *         <li>an entity with a {@link Nullable @Nullable} type.</li></ul></li>
>+ * <li>Nullness cannot definitely be determined, because different code branches yield different results.</li>
>+ * <li>Nullness cannot be determined, because other program elements are involved for which
>+ *     null annotations are lacking.</li>
>+ * </ol>
>+ * </p>
>+ * @since 1.0
>+ */
>+@Documented
>+@Retention(RetentionPolicy.CLASS)
>+@Target({ METHOD, PARAMETER, LOCAL_VARIABLE })
>+public @interface NonNull {
>+	// marker annotation with no members
>+}
>diff --git a/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNullByDefault.java b/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNullByDefault.java
>new file mode 100644
>index 0000000..0ef1cac
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNullByDefault.java
>@@ -0,0 +1,52 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 Stephan Herrmann and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Stephan Herrmann - initial API and implementation
>+ *     IBM Corporation - bug fixes
>+ *******************************************************************************/
>+package org.eclipse.jdt.annotation;
>+
>+import static java.lang.annotation.ElementType.CONSTRUCTOR;
>+import static java.lang.annotation.ElementType.METHOD;
>+import static java.lang.annotation.ElementType.PACKAGE;
>+import static java.lang.annotation.ElementType.TYPE;
>+
>+import java.lang.annotation.Documented;
>+import java.lang.annotation.Retention;
>+import java.lang.annotation.RetentionPolicy;
>+import java.lang.annotation.Target;
>+ 
>+/**
>+ * This annotation can be applied to a package, type, method or constructor in order to 
>+ * define that all contained entities for which a null annotation is otherwise lacking
>+ * should be considered as {@link NonNull @NonNull}.
>+ * <dl>
>+ * <dt>Canceling a default</dt>
>+ * <dd>By using a <code>@NonNullByDefault</code> annotation with the argument <code>false</code>,
>+ * a default from any enclosing scope can be canceled for the element being annotated.
>+ * <dt>Nested defaults</dt>
>+ * <dd>If a <code>@NonNullByDefault</code>
>+ * annotation is used within the scope of another <code>@NonNullByDefault</code>
>+ * annotation or a project-wide default setting, the innermost annotation defines the
>+ * default applicable at any given position (depending on the parameter {@link #value()}).</dd>
>+ * </dl>
>+ * Note that for applying an annotation to a package, a file by the name
>+ * <code>package-info.java</code> is used.
>+ * 
>+ * @since 1.0
>+ */
>+@Documented
>+@Retention(RetentionPolicy.CLASS)
>+@Target({ PACKAGE, TYPE, METHOD, CONSTRUCTOR })
>+public @interface NonNullByDefault {
>+	/**
>+	 * When parameterized with <code>false</code>, the annotation specifies that the current element should not apply
>+	 * any default to un-annotated types.
>+	 */
>+	boolean value() default true;
>+}
>diff --git a/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/Nullable.java b/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/Nullable.java
>new file mode 100644
>index 0000000..41f93cd
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/Nullable.java
>@@ -0,0 +1,41 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 Stephan Herrmann and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Stephan Herrmann - initial API and implementation
>+ *     IBM Corporation - bug fixes
>+ *******************************************************************************/
>+package org.eclipse.jdt.annotation;
>+
>+import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
>+import static java.lang.annotation.ElementType.METHOD;
>+import static java.lang.annotation.ElementType.PARAMETER;
>+
>+import java.lang.annotation.Documented;
>+import java.lang.annotation.Retention;
>+import java.lang.annotation.RetentionPolicy;
>+import java.lang.annotation.Target;
>+ 
>+/**
>+ * Qualifier for a type in a method signature or a local variable declaration:
>+ * The entity (return value, parameter, local variable) whose type has this
>+ * annotation is allowed to have the value <code>null</code> at runtime.
>+ * <p>
>+ * This has two consequences:
>+ * <ul>
>+ * <li>Binding a <code>null</code> value to the entity is legal.</li>
>+ * <li>Dereferencing the entity is unsafe, i.e., a <code>NullPointerException</code> can occur at runtime.</li>
>+ * </ul>
>+ * </p>
>+ * @since 1.0
>+ */
>+@Documented
>+@Retention(RetentionPolicy.CLASS)
>+@Target({ METHOD, PARAMETER, LOCAL_VARIABLE })
>+public @interface Nullable {
>+	// marker annotation with no members
>+}
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/package-info.java b/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/package-info.java
>new file mode 100644
>index 0000000..62f91ff
>--- /dev/null
>+++ b/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/package-info.java
>@@ -0,0 +1,10 @@
>+/**
>+ * This package contains annotations that can trigger special behavior
>+ * when annotated types are compiled by the Eclipse Compiler for Java.
>+ * <p>
>+ * Currently, the package contains annotations that specify nullness contracts
>+ * for annotated elements.
>+ * </p>
>+ */
>+package org.eclipse.jdt.annotation;
>+
>diff --git a/org.eclipse.jdt.apt.core/.cvsignore b/org.eclipse.jdt.apt.core/.cvsignore
>deleted file mode 100755
>index 1fe7c80..0000000
>--- a/org.eclipse.jdt.apt.core/.cvsignore
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-bin
>-tools.jar
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.apt.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jdt.apt.core/.settings/org.eclipse.core.resources.prefs
>index 86c2fda..bf068cf 100644
>--- a/org.eclipse.jdt.apt.core/.settings/org.eclipse.core.resources.prefs
>+++ b/org.eclipse.jdt.apt.core/.settings/org.eclipse.core.resources.prefs
>@@ -1,5 +1,5 @@
>-#Mon Mar 20 17:21:22 PST 2006
>-eclipse.preferences.version=1
>-encoding//src/org/eclipse/jdt/apt/core/internal/build/messages.properties=8859_1
>-encoding//src/org/eclipse/jdt/apt/core/internal/messages.properties=8859_1
>-encoding//src/org/eclipse/jdt/apt/core/internal/util/messages.properties=8859_1
>+#Mon Mar 20 17:21:22 PST 2006
>+eclipse.preferences.version=1
>+encoding//src/org/eclipse/jdt/apt/core/internal/build/messages.properties=8859_1
>+encoding//src/org/eclipse/jdt/apt/core/internal/messages.properties=8859_1
>+encoding//src/org/eclipse/jdt/apt/core/internal/util/messages.properties=8859_1
>diff --git a/org.eclipse.jdt.apt.core/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jdt.apt.core/.settings/org.eclipse.core.runtime.prefs
>new file mode 100644
>index 0000000..5a0ad22
>--- /dev/null
>+++ b/org.eclipse.jdt.apt.core/.settings/org.eclipse.core.runtime.prefs
>@@ -0,0 +1,2 @@
>+eclipse.preferences.version=1
>+line.separator=\n
>diff --git a/org.eclipse.jdt.apt.pluggable.core/.cvsignore b/org.eclipse.jdt.apt.pluggable.core/.cvsignore
>deleted file mode 100644
>index c5e82d7..0000000
>--- a/org.eclipse.jdt.apt.pluggable.core/.cvsignore
>+++ /dev/null
>@@ -1 +0,0 @@
>-bin
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.apt.pluggable.core/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jdt.apt.pluggable.core/.settings/org.eclipse.core.runtime.prefs
>new file mode 100644
>index 0000000..5a0ad22
>--- /dev/null
>+++ b/org.eclipse.jdt.apt.pluggable.core/.settings/org.eclipse.core.runtime.prefs
>@@ -0,0 +1,2 @@
>+eclipse.preferences.version=1
>+line.separator=\n
>diff --git a/org.eclipse.jdt.apt.pluggable.tests/.cvsignore b/org.eclipse.jdt.apt.pluggable.tests/.cvsignore
>deleted file mode 100644
>index c5e82d7..0000000
>--- a/org.eclipse.jdt.apt.pluggable.tests/.cvsignore
>+++ /dev/null
>@@ -1 +0,0 @@
>-bin
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.apt.pluggable.tests/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jdt.apt.pluggable.tests/.settings/org.eclipse.core.runtime.prefs
>new file mode 100644
>index 0000000..5a0ad22
>--- /dev/null
>+++ b/org.eclipse.jdt.apt.pluggable.tests/.settings/org.eclipse.core.runtime.prefs
>@@ -0,0 +1,2 @@
>+eclipse.preferences.version=1
>+line.separator=\n
>diff --git a/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/processors/modeltester/ModelTesterProc.java b/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/processors/modeltester/ModelTesterProc.java
>index b34dd26..828f914 100644
>--- a/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/processors/modeltester/ModelTesterProc.java
>+++ b/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/processors/modeltester/ModelTesterProc.java
>@@ -54,12 +54,11 @@
> 	
> 	public static final String TEST_FIELD_TYPE_PKG = "p";
> 	public static final String TEST_FIELD_TYPE_CLASS = "Foo";
>-	public static final String TEST_FIELD_TYPE_SOURCE = 				
>+	public static final String TEST_FIELD_TYPE_SOURCE =
> 		"package p;\n" +
> 		"import org.eclipse.jdt.apt.pluggable.tests.annotations.ModelTestTrigger;\n" +
> 		"import org.eclipse.jdt.apt.pluggable.tests.annotations.LookAt;\n" +
> 		"@ModelTestTrigger(test = \"testFieldType\")" +
>-		"@SuppressWarnings(\"unused\")\n" +
> 		"public class Foo {\n" +
> 		"    @LookAt\n" +
> 		"    private int _fInt = 0;\n" +
>@@ -71,12 +70,11 @@
> 
> 	public static final String TEST_METHOD_TYPE_PKG = "p";
> 	public static final String TEST_METHOD_TYPE_CLASS = "Foo";
>-	public static final String TEST_METHOD_TYPE_SOURCE = 				
>+	public static final String TEST_METHOD_TYPE_SOURCE =
> 		"package p;\n" +
> 		"import org.eclipse.jdt.apt.pluggable.tests.annotations.ModelTestTrigger;\n" +
> 		"import org.eclipse.jdt.apt.pluggable.tests.annotations.LookAt;\n" +
> 		"@ModelTestTrigger(test = \"testMethodType\")" +
>-		"@SuppressWarnings(\"unused\")\n" +
> 		"public class Foo {\n" +
> 		"    @LookAt\n" +
> 		"    private Foo self() { return this;}\n" +
>diff --git a/org.eclipse.jdt.apt.pluggable.tests/test.xml b/org.eclipse.jdt.apt.pluggable.tests/test.xml
>index 8150935..c958856 100644
>--- a/org.eclipse.jdt.apt.pluggable.tests/test.xml
>+++ b/org.eclipse.jdt.apt.pluggable.tests/test.xml
>@@ -1,7 +1,7 @@
>-<?xml version="1.0"?>
>+<?xml version="1.0" encoding="UTF-8"?>
> 
> \r\n" + 
>+					"\r\n",
>+					javadoc);
>+		} finally {
>+			this.project.setRawClasspath(entries, null);
>+		}
>+	}
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ClasspathTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ClasspathTests.java
>index 4166cb2..77a5b58 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ClasspathTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ClasspathTests.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -7,6 +7,8 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Terry Parker <tparker@google.com> - DeltaProcessor misses state changes in archive files, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=357425,
>+ *     									   Fup of 357425: ensure all reported regressions are witnessed by tests, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=361922
>  *******************************************************************************/
> package org.eclipse.jdt.core.tests.model;
> 
>@@ -67,9 +69,12 @@
> import org.eclipse.jdt.internal.core.JavaModelManager;
> import org.eclipse.jdt.internal.core.JavaProject;
> import org.eclipse.jdt.internal.core.UserLibraryClasspathContainer;
>+import org.eclipse.jdt.internal.core.builder.State;
> import org.eclipse.team.core.RepositoryProvider;
> 
> public class ClasspathTests extends ModifyingResourceTests {
>+	private static final IClasspathAttribute ATTR_IGNORE_OPTIONAL_PROBLEMS_TRUE = JavaCore.newClasspathAttribute(IClasspathAttribute.IGNORE_OPTIONAL_PROBLEMS, "true");
>+	private static final IClasspathAttribute ATTR_IGNORE_OPTIONAL_PROBLEMS_FALSE = JavaCore.newClasspathAttribute(IClasspathAttribute.IGNORE_OPTIONAL_PROBLEMS, "false");
> 
> 	public class TestContainer implements IClasspathContainer {
> 		IPath path;
>@@ -249,6 +254,7 @@
> 	suite.addTest(new ClasspathTests("testInvalidClasspath2"));
> 	suite.addTest(new ClasspathTests("testInvalidExternalClassFolder"));
> 	suite.addTest(new ClasspathTests("testInvalidExternalJar"));
>+	suite.addTest(new ClasspathTests("testTransitionFromInvalidToValidJar"));
> 	suite.addTest(new ClasspathTests("testInvalidInternalJar1"));
> 	suite.addTest(new ClasspathTests("testInvalidInternalJar2"));
> 	suite.addTest(new ClasspathTests("testInvalidSourceFolder"));
>@@ -334,6 +340,10 @@
> 	suite.addTest(new ClasspathTests("testBug321170"));
> 	suite.addTest(new ClasspathTests("testBug229042"));
> 	suite.addTest(new ClasspathTests("testBug274737"));
>+	suite.addTest(new ClasspathTests("testBug357425"));
>+	suite.addTest(new ClasspathTests("testBug287164"));
>+	suite.addTest(new ClasspathTests("testBug220928a"));
>+	suite.addTest(new ClasspathTests("testBug220928b"));
> 	return suite;
> }
> public void setUpSuite() throws Exception {
>@@ -2020,6 +2030,7 @@
> public void testClasspathValidation22() throws CoreException {
> 	try {
> 		IJavaProject proj =  this.createJavaProject("P", new String[] {}, "");
>+		proj.setOption(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, JavaCore.ERROR);
> 		IClasspathEntry[] originalCP = proj.getRawClasspath();
> 
> 		IClasspathEntry[] newCP = new IClasspathEntry[originalCP.length+2];
>@@ -2045,6 +2056,7 @@
> public void testClasspathValidation23() throws CoreException {
> 	try {
> 		IJavaProject proj =  this.createJavaProject("P", new String[] {}, "");
>+		proj.setOption(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, JavaCore.IGNORE);
> 		IClasspathEntry[] originalCP = proj.getRawClasspath();
> 
> 		IClasspathEntry[] newCP = new IClasspathEntry[originalCP.length+2];
>@@ -4197,6 +4209,43 @@
> 			"Project 'P' is missing required library: \'" + jarPath + "\'",
> 			proj);
> 	} finally {
>+		deleteProject("P");
>+	}
>+}
>+/*
>+ * Ensures that validateClasspathEntry() sees a transition from an invalid/missing jar to a valid jar.
>+ */
>+public void testTransitionFromInvalidToValidJar() throws CoreException, IOException {
>+	String transitioningJarName = "transitioningJar.jar";
>+	String transitioningJar = getExternalPath() + transitioningJarName;
>+	String invalidJar = getExternalPath() + "invalidJar.jar";
>+	IClasspathEntry transitioningEntry = JavaCore.newLibraryEntry(new Path(transitioningJar), null, null);
>+	IClasspathEntry nonExistingEntry = JavaCore.newLibraryEntry(new Path(invalidJar), null, null);
>+
>+	try {
>+		Util.createFile(transitioningJar, "");
>+		Util.createFile(invalidJar, "");
>+		IJavaProject proj = createJavaProject("P", new String[] {}, new String[] {transitioningJar, invalidJar}, "bin");
>+		
>+		IJavaModelStatus status1 = ClasspathEntry.validateClasspathEntry(proj, transitioningEntry, false, false);
>+		IJavaModelStatus status2 = ClasspathEntry.validateClasspathEntry(proj, nonExistingEntry, false, false);
>+		assertFalse("Non-existing jar should be invalid", status1.isOK());
>+		assertFalse("Non-existing jar should be invalid", status2.isOK());
>+
>+		Util.createJar(	
>+			new String[0],
>+			new String[] {
>+				"META-INF/MANIFEST.MF",
>+				"Manifest-Version: 1.0\n"
>+			},
>+			transitioningJar,
>+			JavaCore.VERSION_1_4);
>+		status1 = ClasspathEntry.validateClasspathEntry(proj, transitioningEntry, false, false);
>+		status2 = ClasspathEntry.validateClasspathEntry(proj, nonExistingEntry, false, false);
>+		assertTrue("Existing jar should be valid", status1.isOK());
>+		assertFalse("Non-existing jar should be invalid", status2.isOK());
>+	} finally {
>+		deleteExternalResource(transitioningJarName);
> 		deleteProject("P");
> 	}
> }
>@@ -7190,4 +7239,185 @@
> 	}
> }
> 
>+/*
>+ * Ensures that the correct delta is reported when changing the Class-Path: clause 
>+ * of an external jar from not containing a chained jar to containing a chained jar.
>+ * (regression test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=357425)
>+ */
>+public void testBug357425() throws Exception {
>+	try {
>+		IJavaProject p = createJavaProject("P");
>+		addExternalLibrary(p, getExternalResourcePath("lib357425_a.jar"), new String[0], 
>+			new String[] {
>+				"META-INF/MANIFEST.MF",
>+				"Manifest-Version: 1.0\n"
>+			},
>+			JavaCore.VERSION_1_4);
>+		refreshExternalArchives(p);		
>+
>+		startDeltas();
>+		org.eclipse.jdt.core.tests.util.Util.createJar(new String[0],
>+			new String[] {
>+				"META-INF/MANIFEST.MF",
>+				"Manifest-Version: 1.0\n" +
>+				"Class-Path: lib357425_b.jar\n",
>+			},
>+			getExternalResourcePath("lib357425_a.jar"),
>+			JavaCore.VERSION_1_4);
>+		createExternalFile("lib357425_b.jar", "");
>+
>+		refreshExternalArchives(p);
>+		assertDeltas(
>+			"Unexpected delta",
>+			"P[*]: {CHILDREN | RESOLVED CLASSPATH CHANGED}\n" + 
>+			"	"+ getExternalPath() + "lib357425_a.jar[*]: {CONTENT | REORDERED | ARCHIVE CONTENT CHANGED}\n" + 
>+			"	"+ getExternalPath() + "lib357425_b.jar[+]: {}"
>+				);
>+	} finally {
>+		stopDeltas();
>+		deleteProject("P");
>+		deleteExternalResource("lib357425_a.jar");
>+		deleteExternalResource("lib357425_b.jar");
>+	}
>+}
>+/**
>+ * @bug287164: Report build path error if source folder has other source folder as output folder
>+ * 
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=287164"
>+ */
>+public void testBug287164() throws CoreException {
>+	try {
>+		IJavaProject proj =  this.createJavaProject("P", new String[] {}, "");
>+		
>+		// Test that with the option set to IGNORE, the Java model status returns OK
>+		proj.setOption(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, JavaCore.IGNORE);
>+		IClasspathEntry[] originalCP = proj.getRawClasspath();
>+
>+		IClasspathEntry[] newCP = new IClasspathEntry[originalCP.length+2];
>+		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
>+		newCP[originalCP.length] = JavaCore.newSourceEntry(new Path("/P/src"), new IPath[0], new Path("/P/src2"));
>+		newCP[originalCP.length+1] = JavaCore.newSourceEntry(new Path("/P/src2"), new IPath[0], new Path("/P/src"));
>+
>+		createFolder("/P/src");
>+		createFolder("/P/src2");
>+
>+		IJavaModelStatus status = JavaConventions.validateClasspath(proj, newCP, proj.getOutputLocation());
>+		assertTrue(status.isOK());
>+		assertStatus(
>+			"OK",
>+			status);
>+		
>+		proj.setRawClasspath(newCP, null);
>+		assertMarkers("Unexpected markers", "", proj);
>+		
>+		// Test that with the option set to WARNING, status.isOK() returns true
>+		proj.setOption(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, JavaCore.WARNING);
>+
>+		status = JavaConventions.validateClasspath(proj, newCP, proj.getOutputLocation());
>+		assertTrue(status.isOK());
>+		assertStatus(
>+			"Source folder \'src\' in project \'P\' cannot output to distinct source folder \'src2\'",
>+			status);
>+
>+		assertMarkers("Unexpected markers", 
>+				"Source folder \'src\' in project \'P\' cannot output to distinct source folder \'src2\'", proj);
>+		
>+		// Test that with the option set to WARNING and the presence of a more severe error scenario, the error status
>+		// is returned
>+		IClasspathEntry[] newCP2 = new IClasspathEntry[newCP.length+1];
>+		System.arraycopy(newCP, 0, newCP2, 0, newCP.length-1);
>+		newCP2[newCP.length] = JavaCore.newLibraryEntry(new Path("/P/lib2"), null, null);
>+		newCP2[newCP.length-1] = JavaCore.newSourceEntry(new Path("/P/src2"), new IPath[0], new Path("/P/lib2"));
>+
>+		status = JavaConventions.validateClasspath(proj, newCP2, proj.getOutputLocation());
>+		assertFalse(status.isOK());
>+		assertStatus(
>+			"Source folder \'src2\' in project 'P' cannot output to library \'lib2\'",
>+			status);
>+		
>+		proj.setOption(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, JavaCore.ERROR);
>+
>+		status = JavaConventions.validateClasspath(proj, newCP, proj.getOutputLocation());
>+		assertStatus(
>+			"Source folder \'src\' in project \'P\' cannot output to distinct source folder \'src2\'",
>+			status);
>+		
>+	} finally {
>+		this.deleteProject("P");
>+	}
>+}
>+
>+/**
>+ * @bug220928: [buildpath] Should be able to ignore warnings from certain source folders
>+ * 
>+ * Verify that adding the {@link IClasspathAttribute#IGNORE_OPTIONAL_PROBLEMS} attribute is
>+ * correctly reflected by the {@link ClasspathEntry#ignoreOptionalProblems()} method.
>+ * 
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=220928"
>+ */
>+public void testBug220928a() throws CoreException {
>+	ClasspathEntry entry;
>+
>+	entry = (ClasspathEntry) JavaCore.newSourceEntry(new Path("/P/src"));
>+	assertFalse(entry.ignoreOptionalProblems());
>+
>+	entry = (ClasspathEntry) JavaCore.newSourceEntry(new Path("/P/src"), null, null, null,
>+			new IClasspathAttribute[] { ATTR_IGNORE_OPTIONAL_PROBLEMS_TRUE });
>+	assertTrue(entry.ignoreOptionalProblems());
>+
>+	entry = (ClasspathEntry) JavaCore.newSourceEntry(new Path("/P/src"), null, null, null,
>+			new IClasspathAttribute[] { ATTR_IGNORE_OPTIONAL_PROBLEMS_FALSE });
>+	assertFalse(entry.ignoreOptionalProblems());
>+}
>+
>+/**
>+ * @bug220928: [buildpath] Should be able to ignore warnings from certain source folders
>+ * 
>+ * Verify that value of the {@link IClasspathAttribute#IGNORE_OPTIONAL_PROBLEMS} attribute is
>+ * correctly saved on workspace save.
>+ * 
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=220928"
>+ */
>+public void testBug220928b() throws CoreException {
>+	boolean autoBuild = getWorkspace().isAutoBuilding();
>+	IWorkspaceDescription preferences = getWorkspace().getDescription();
>+	try {
>+		// ensure that the workspace auto-build is ON
>+		preferences.setAutoBuilding(true);
>+		getWorkspace().setDescription(preferences);
>+
>+		IJavaProject project = createJavaProject("P", new String[] {}, "bin");
>+		createFolder("/P/src");
>+		IClasspathEntry[] originalCP = project.getRawClasspath();
>+		IClasspathEntry[] newCP = new IClasspathEntry[originalCP.length + 1];
>+		State state;
>+
>+		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
>+		newCP[originalCP.length] = JavaCore.newSourceEntry(new Path("/P/src"));
>+		getJavaProject("P").setRawClasspath(newCP, null);
>+		simulateExitRestart();
>+		state = (State) JavaModelManager.getJavaModelManager().getLastBuiltState(getJavaProject("P").getProject(), null);
>+		assertFalse(state.sourceLocations[0].ignoreOptionalProblems);
>+
>+		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
>+		newCP[originalCP.length] = JavaCore.newSourceEntry(new Path("/P/src"), null, null, null,
>+				new IClasspathAttribute[] { ATTR_IGNORE_OPTIONAL_PROBLEMS_TRUE });
>+		getJavaProject("P").setRawClasspath(newCP, null);
>+		simulateExitRestart();
>+		state = (State) JavaModelManager.getJavaModelManager().getLastBuiltState(getJavaProject("P").getProject(), null);
>+		assertTrue(state.sourceLocations[0].ignoreOptionalProblems);
>+
>+		System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
>+		newCP[originalCP.length] = JavaCore.newSourceEntry(new Path("/P/src"), null, null, null,
>+				new IClasspathAttribute[] { ATTR_IGNORE_OPTIONAL_PROBLEMS_FALSE });
>+		getJavaProject("P").setRawClasspath(newCP, null);
>+		simulateExitRestart();
>+		state = (State) JavaModelManager.getJavaModelManager().getLastBuiltState(getJavaProject("P").getProject(), null);
>+		assertFalse(state.sourceLocations[0].ignoreOptionalProblems);
>+	} finally {
>+		preferences.setAutoBuilding(autoBuild);
>+		getWorkspace().setDescription(preferences);
>+		deleteProject("P");
>+	}
>+}
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests2.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests2.java
>index a067924..8cf9c88 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests2.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests2.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -38,6 +38,7 @@
> import org.eclipse.jdt.core.IJavaProject;
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaCore;
>+import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.tests.util.Util;
> import org.eclipse.jdt.internal.codeassist.RelevanceConstants;
> import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
>@@ -45,6 +46,10 @@
> import org.eclipse.jdt.internal.core.search.indexing.IndexManager;
> 
> public class CompletionTests2 extends ModifyingResourceTests implements RelevanceConstants {
>+	
>+	static {
>+//		TESTS_NAMES = new String[]{"testBug340945"};
>+	}
> 
> 	public static class CompletionContainerInitializer implements ContainerInitializer.ITestInitializer {
> 
>@@ -5591,4 +5596,260 @@
> 		deleteProject(project);
> 	}
> }
>+
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=292087
>+public void testBug340945() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/test/Try.java",
>+			"package test;\n" +
>+			"public class Try extends Thread{\n" +
>+			"	int inty = 1;\n" +
>+			"	void foo() {\n" +
>+			"		int i = 1;\n" +
>+			"		Object o = new Object() {\n" +
>+			"			void running() {\n" +
>+			"				int j = 1;\n" +
>+			"				int k = " +
>+			"			}\n" +
>+			"		}\n" +
>+			"	}\n" +
>+			"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	requestor.setRequireExtendedContext(true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setComputeVisibleElements(true);
>+//	requestor.setAssignableType("I");
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "int k =";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	assertResults(
>+			"<CompleteOnName:>",
>+			requestor.getCompletionNode());
>+	assertResults(
>+			"int k = <CompleteOnName:>;",
>+			requestor.getCompletionNodeParent());
>+	assertResults(
>+			"int j[pos: unused][id:2]\n" +
>+			"int i[pos: unused][id:0]\n" +
>+			"java.lang.Object o[pos: unused][id:1]\n",
>+			requestor.getVisibleLocalVariables());
>+	assertResults(
>+			"int inty\n",
>+			requestor.getVisibleFields());
>+	assertResults(
>+			"void running() \n" +
>+			"public final void wait(long, int) throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public final void wait(long) throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public final void wait() throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public java.lang.String toString() \n" +
>+			"public final void notifyAll() throws java.lang.IllegalMonitorStateException\n" +
>+			"public final void notify() throws java.lang.IllegalMonitorStateException\n" +
>+			"public int hashCode() \n" +
>+			"public final java.lang.Class getClass() \n" + 
>+			"protected void finalize() throws java.lang.Throwable\n" +
>+			"public boolean equals(java.lang.Object) \n" +
>+			"protected java.lang.Object clone() throws java.lang.CloneNotSupportedException\n" +
>+			"void foo() \n",
>+			requestor.getVisibleMethods());
>+}
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=292087
>+public void testBug340945a() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/test/Try.java",
>+			"package test;\n" +
>+			"public class Try extends Thread{\n" +
>+			"	int int1 = 1;\n" +
>+			"	int int2 = 2;\n" +
>+			"	int int3 = " +
>+			"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	requestor.setRequireExtendedContext(true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setComputeVisibleElements(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "int int3 =";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	assertResults(
>+			"<CompleteOnName:>",
>+			requestor.getCompletionNode());
>+	assertResults(
>+			"int int3 = <CompleteOnName:>;",
>+			requestor.getCompletionNodeParent());
>+	assertResults(
>+			"",
>+			requestor.getVisibleLocalVariables());
>+	assertResults(
>+			"int int2\n" +
>+			"int int1\n",
>+			requestor.getVisibleFields());
>+	assertResults(
>+			"public final void wait(long, int) throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public final void wait(long) throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public final void wait() throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public java.lang.String toString() \n" +
>+			"public final void notifyAll() throws java.lang.IllegalMonitorStateException\n" +
>+			"public final void notify() throws java.lang.IllegalMonitorStateException\n" +
>+			"public int hashCode() \n" +
>+			"public final java.lang.Class getClass() \n" + 
>+			"protected void finalize() throws java.lang.Throwable\n" +
>+			"public boolean equals(java.lang.Object) \n" +
>+			"protected java.lang.Object clone() throws java.lang.CloneNotSupportedException\n",
>+			requestor.getVisibleMethods());
>+}
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=292087
>+public void testBug340945b() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/test/Try.java",
>+			"package test;\n" +
>+			"public class Try extends Thread{\n" +
>+			"Object field;\n" +
>+			"void foo() {\n" +
>+			"	int int1 = 1;\n" +
>+			"	int int2 = 2;\n" +
>+			"	int int3 = " +
>+			"}\n" +
>+			"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	requestor.setRequireExtendedContext(true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setComputeVisibleElements(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "int int3 =";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	assertResults(
>+			"<CompleteOnName:>",
>+			requestor.getCompletionNode());
>+	assertResults(
>+			"int int3 = <CompleteOnName:>;",
>+			requestor.getCompletionNodeParent());
>+	assertResults(
>+			"int int1[pos: unused][id:0]\n" +
>+			"int int2[pos: unused][id:1]\n",
>+			requestor.getVisibleLocalVariables());
>+	assertResults(
>+			"java.lang.Object field\n",
>+			requestor.getVisibleFields());
>+	assertResults(
>+			"void foo() \n" +
>+			"public final void wait(long, int) throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public final void wait(long) throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public final void wait() throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public java.lang.String toString() \n" +
>+			"public final void notifyAll() throws java.lang.IllegalMonitorStateException\n" +
>+			"public final void notify() throws java.lang.IllegalMonitorStateException\n" +
>+			"public int hashCode() \n" +
>+			"public final java.lang.Class getClass() \n" + 
>+			"protected void finalize() throws java.lang.Throwable\n" +
>+			"public boolean equals(java.lang.Object) \n" +
>+			"protected java.lang.Object clone() throws java.lang.CloneNotSupportedException\n",			
>+			requestor.getVisibleMethods());
>+}
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=292087
>+public void testBug340945c() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/test/Try.java",
>+			"package test;\n" +
>+			"public class Try extends Thread{\n" +
>+			"Object field;\n" +
>+			"void foo() {\n" +
>+			"	int int1 = 1;\n" +
>+			"	int int2 = 2;\n" +
>+			"	Object o1 = new Object();\n" +
>+			"   o1." +
>+			"}\n" +
>+			"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	requestor.setRequireExtendedContext(true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setComputeVisibleElements(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "o1.";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	assertResults(
>+			"<CompleteOnName:o1.>",
>+			requestor.getCompletionNode());
>+	assertNull(
>+			"should be null",
>+			requestor.getCompletionNodeParent());
>+	assertResults(
>+			"int int1[pos: unused][id:0]\n" +
>+			"int int2[pos: unused][id:1]\n" +
>+			"java.lang.Object o1[pos: unused][id:2]\n",
>+			requestor.getVisibleLocalVariables());
>+	assertResults(
>+			"java.lang.Object field\n",
>+			requestor.getVisibleFields());
>+	assertResults(
>+			"void foo() \n" +
>+			"public final void wait(long, int) throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public final void wait(long) throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public final void wait() throws java.lang.IllegalMonitorStateException, java.lang.InterruptedException\n" +
>+			"public java.lang.String toString() \n" +
>+			"public final void notifyAll() throws java.lang.IllegalMonitorStateException\n" +
>+			"public final void notify() throws java.lang.IllegalMonitorStateException\n" +
>+			"public int hashCode() \n" +
>+			"public final java.lang.Class getClass() \n" + 
>+			"protected void finalize() throws java.lang.Throwable\n" +
>+			"public boolean equals(java.lang.Object) \n" +
>+			"protected java.lang.Object clone() throws java.lang.CloneNotSupportedException\n",			
>+			requestor.getVisibleMethods());
>+}
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=292087
>+public void testBug340945d() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/test/Try.java",
>+			"package test;\n" +
>+			"public class Try extends Thread{\n" +
>+			"Object field;\n" +
>+			"static void foo() {\n" +	// field should not be visible here
>+			"	int int1 = 1;\n" +
>+			"	int int2 = 2;\n" +
>+			"	Object o1 = new Object();\n" +
>+			"   o1." +
>+			"}\n" +
>+			"}\n");
>+
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
>+	requestor.setRequireExtendedContext(true);
>+	requestor.allowAllRequiredProposals();
>+	requestor.setComputeVisibleElements(true);
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "o1.";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	assertResults(
>+			"<CompleteOnName:o1.>",
>+			requestor.getCompletionNode());
>+	assertNull(
>+			"should be null",
>+			requestor.getCompletionNodeParent());
>+	assertResults(
>+			"int int1[pos: unused][id:0]\n" +
>+			"int int2[pos: unused][id:1]\n" +
>+			"java.lang.Object o1[pos: unused][id:2]\n",
>+			requestor.getVisibleLocalVariables());
>+	assertResults(
>+			"",
>+			requestor.getVisibleFields());
>+	assertResults(
>+			"static void foo() \n",			
>+			requestor.getVisibleMethods());
>+}
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java
>index c3102c4..09935f5 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2011 IBM Corporation and others.
>+ * Copyright (c) 2004, 2012 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,6 +20,9 @@
> import org.eclipse.jdt.core.IJavaElement;
> import org.eclipse.jdt.core.Signature;
> import org.eclipse.jdt.core.compiler.IProblem;
>+import org.eclipse.jdt.internal.codeassist.InternalCompletionContext;
>+import org.eclipse.jdt.internal.compiler.ast.ASTNode;
>+import org.eclipse.jdt.internal.compiler.util.ObjectVector;
> import org.eclipse.jdt.internal.core.JavaElement;
> 
> public class CompletionTestsRequestor2 extends CompletionRequestor {
>@@ -600,9 +603,58 @@
> 	
> 	public boolean canUseDiamond(int proposalNo) {
> 		if (proposalNo < this.proposals.length && this.proposals[proposalNo] != null) {
>-			System.out.println(this.proposals[proposalNo]);
> 			return this.proposals[proposalNo].canUseDiamond(this.context);
> 		}
> 		return false;
> 	}
>+	
>+	public String getCompletionNode() {
>+		if (this.context instanceof InternalCompletionContext) {
>+			InternalCompletionContext internalCompletionContext = (InternalCompletionContext) this.context;
>+			ASTNode astNode = internalCompletionContext.getCompletionNode();
>+			if (astNode != null) return astNode.toString();
>+			
>+		}
>+		return null;
>+	}
>+	
>+	public String getCompletionNodeParent() {
>+		if (this.context instanceof InternalCompletionContext) {
>+			InternalCompletionContext internalCompletionContext = (InternalCompletionContext) this.context;
>+			ASTNode astNode = internalCompletionContext.getCompletionNodeParent();
>+			if (astNode != null) return astNode.toString();
>+			
>+		}
>+		return null;
>+	}
>+	
>+	public String getVisibleLocalVariables() {
>+		if (this.context instanceof InternalCompletionContext) {
>+			InternalCompletionContext internalCompletionContext = (InternalCompletionContext) this.context;
>+			ObjectVector locals = internalCompletionContext.getVisibleLocalVariables();
>+			if (locals != null) return locals.toString();
>+			
>+		}
>+		return null;
>+	}
>+	
>+	public String getVisibleFields() {
>+		if (this.context instanceof InternalCompletionContext) {
>+			InternalCompletionContext internalCompletionContext = (InternalCompletionContext) this.context;
>+			ObjectVector fields = internalCompletionContext.getVisibleFields();
>+			if (fields != null) return fields.toString();
>+			
>+		}
>+		return null;
>+	}
>+	
>+	public String getVisibleMethods() {
>+		if (this.context instanceof InternalCompletionContext) {
>+			InternalCompletionContext internalCompletionContext = (InternalCompletionContext) this.context;
>+			ObjectVector methods = internalCompletionContext.getVisibleMethods();
>+			if (methods != null) return methods.toString();
>+			
>+		}
>+		return null;
>+	}
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests_1_5.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests_1_5.java
>index 4cc9390..6521614 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests_1_5.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests_1_5.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -14286,4 +14286,24 @@
> 			"X1<T>[TYPE_REF]{, test, Ltest.X1<TT;>;, null, null, replace[77, 77], token[77, 77], " + relevance + "}",
> 			requestor.getResults());
> }
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=361963
>+public void test361963() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[1];
>+	this.workingCopies[0] = getWorkingCopy(
>+			"/Completion/src/X.java",
>+			"public class X<T> {\n" +
>+			"    void g() {\n" +
>+			"        return new X() {\n" +
>+			"            void g() {\n" +
>+			"                Object o = new X<\n");
>+	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true, false, true, true, true, true);
>+	requestor.allowAllRequiredProposals();
>+	String str = this.workingCopies[0].getSource();
>+	String completeBehind = "new X<";
>+	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
>+	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
>+	assertResults(
>+			"X<T>[TYPE_REF]{, , LX<TT;>;, null, null, replace[116, 116], token[116, 116], 51}",
>+			requestor.getResults());
>+}
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveElementsTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveElementsTests.java
>index eec97ac..8ecb0b9 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveElementsTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveElementsTests.java
>@@ -2452,7 +2452,7 @@
> 	try {
> 		TestProgressMonitor monitor = TestProgressMonitor.getInstance();
> 		monitor.setCancelledCounter(1);
>-		movePositive(typeSource.getMethods(), new IJavaElement[] {typeDest}, null, null, false, monitor);
>+		movePositive(typeSource.getMethods(), new IJavaElement[] {typeDest}, null, null, false, true, monitor);
> 	} catch (OperationCanceledException e) {
> 		isCanceled = true;
> 	}
>@@ -2488,7 +2488,7 @@
> 		try {
> 			TestProgressMonitor monitor = TestProgressMonitor.getInstance();
> 			monitor.setCancelledCounter(1);
>-			movePositive(typeSource.getMethods(), new IJavaElement[] {typeDest}, null, null, false, monitor);
>+			movePositive(typeSource.getMethods(), new IJavaElement[] {typeDest}, null, null, false, true, monitor);
> 		} catch (OperationCanceledException e) {
> 			isCanceled = true;
> 		}
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveResourcesTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveResourcesTests.java
>index 3d4d1ec..2b68fd0 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveResourcesTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveResourcesTests.java
>@@ -80,7 +80,13 @@
> 		}
> 		IJavaElementDelta destDelta = this.deltaListener.getDeltaFor(container, true);
> 		assertTrue("Destination container not changed", destDelta != null && destDelta.getKind() == IJavaElementDelta.CHANGED);
>-		IJavaElementDelta[] deltas = destDelta.getAddedChildren();
>+		IJavaElementDelta[] deltas = null;
>+		if (force) {
>+			deltas = destDelta.getChangedChildren();
>+		}
>+		else {
>+			deltas = destDelta.getAddedChildren();
>+		}
> 		// FIXME: not strong enough
> 		boolean found = false;
> 		for (int i = 0; i < deltas.length; i++) {
>@@ -809,25 +815,38 @@
>  * existing CU.
>  */
> public void testMoveCU03() throws CoreException {
>-	this.createFolder("/P/src/p1");
>-	this.createFile(
>-		"/P/src/p1/X.java",
>-		"package p1;\n" +
>-		"public class X {\n" +
>-		"}"
>-	);
>-	ICompilationUnit cuSource = getCompilationUnit("/P/src/p1/X.java");
>+	try {
>+		this.createFolder("/P/src/p1");
>+		this.createFile(
>+			"/P/src/p1/X.java",
>+			"package p1;\n" +
>+			"public class X {\n" +
>+			"}"
>+		);
>+		ICompilationUnit cuSource = getCompilationUnit("/P/src/p1/X.java");
> 
>-	this.createFolder("/P/src/p2");
>-	this.createFile(
>-		"/P/src/p2/X.java",
>-		"package p2;\n" +
>-		"public class X {\n" +
>-		"}"
>-	);
>-	IPackageFragment pkgDest = getPackage("/P/src/p2");
>-
>-	movePositive(cuSource, pkgDest, null, null, true);
>+		this.createFolder("/P/src/p2");
>+		this.createFile(
>+			"/P/src/p2/X.java",
>+			"package p2;\n" +
>+			"public class X {\n" +
>+			"}"
>+		);
>+		IPackageFragment pkgDest = getPackage("/P/src/p2");
>+		startDeltas();
>+		movePositive(new IJavaElement[] {cuSource}, new IJavaElement[] {pkgDest}, null, null, true, false, null);
>+			assertDeltas(
>+					"Incorrect delta",
>+					"P[*]: {CHILDREN}\n"
>+							+ "	src[*]: {CHILDREN}\n"
>+							+ "		p1[*]: {CHILDREN}\n"
>+							+ "			X.java[-]: {MOVED_TO(X.java [in p2 [in src [in P]]])}\n"
>+							+ "		p2[*]: {CHILDREN}\n"
>+							+ "			X.java[*]: {CONTENT | PRIMARY RESOURCE}");
>+	}
>+	finally {
>+		stopDeltas();
>+	}
> }
> /**
>  * Ensures that a CU can be moved to a different package,
>@@ -853,25 +872,39 @@
>  * be renamed, overwriting an existing resource.
>  */
> public void testMoveCU05() throws CoreException {
>-	this.createFolder("/P/src/p1");
>-	this.createFile(
>-		"/P/src/p1/X.java",
>-		"package p1;\n" +
>-		"public class X {\n" +
>-		"}"
>-	);
>-	ICompilationUnit cuSource = getCompilationUnit("/P/src/p1/X.java");
>+	try {
>+		this.createFolder("/P/src/p1");
>+		this.createFile(
>+			"/P/src/p1/X.java",
>+			"package p1;\n" +
>+			"public class X {\n" +
>+			"}"
>+		);
>+		ICompilationUnit cuSource = getCompilationUnit("/P/src/p1/X.java");
> 
>-	this.createFolder("/P/src/p2");
>-	this.createFile(
>-		"/P/src/p2/Y.java",
>-		"package p2;\n" +
>-		"public class Y {\n" +
>-		"}"
>-	);
>-	IPackageFragment pkgDest = getPackage("/P/src/p2");
>-
>-	movePositive(cuSource, pkgDest, null, "Y.java", true);
>+		this.createFolder("/P/src/p2");
>+		this.createFile(
>+			"/P/src/p2/Y.java",
>+			"package p2;\n" +
>+			"public class Y {\n" +
>+			"}"
>+		);
>+		IPackageFragment pkgDest = getPackage("/P/src/p2");
>+		startDeltas();
>+		movePositive(new IJavaElement[] {cuSource}, new IJavaElement[] {pkgDest}, null, new String[]{"Y.java"}, true, false, null);
>+		assertDeltas(
>+					"Incorrect delta",
>+					"P[*]: {CHILDREN}\n"
>+							+ "	src[*]: {CHILDREN}\n"
>+							+ "		p1[*]: {CHILDREN}\n"
>+							+ "			X.java[-]: {MOVED_TO(Y.java [in p2 [in src [in P]]])}\n"
>+							+ "		p2[*]: {CHILDREN}\n"
>+							+ "			Y.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n"
>+							+ "				Y[+]: {MOVED_FROM(X [in X.java [in p1 [in src [in P]]]])}");
>+	}
>+	finally {
>+		stopDeltas();
>+	}
> }
> /**
>  * Ensures that a CU cannot be moved to a different package, replacing an
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveTests.java
>index b1066ae..c03e393 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveTests.java
>@@ -253,12 +253,15 @@
> public void movePositive(IJavaElement[] elements, IJavaElement[] destinations, IJavaElement[] siblings, String[] names, boolean force) throws JavaModelException {
> 	movePositive(elements, destinations, siblings, names, force, null);
> }
>+public void movePositive(IJavaElement[] elements, IJavaElement[] destinations, IJavaElement[] siblings, String[] names, boolean force, IProgressMonitor monitor) throws JavaModelException {
>+	movePositive(elements, destinations, siblings, names, force, true, null);
>+}
> /**
>  * Moves the elements to the containers with optional renaming
>  * and forcing. The operation should succeed, so any exceptions
>  * encountered are thrown.
>  */
>-public void movePositive(IJavaElement[] elements, IJavaElement[] destinations, IJavaElement[] siblings, String[] names, boolean force, IProgressMonitor monitor) throws JavaModelException {
>+public void movePositive(IJavaElement[] elements, IJavaElement[] destinations, IJavaElement[] siblings, String[] names, boolean force, boolean checkDelta, IProgressMonitor monitor) throws JavaModelException {
> 	// if forcing, ensure that a name collision exists
> 	int i;
> 	if (force) {
>@@ -275,7 +278,7 @@
> 	}
> 
> 	try {
>-		startDeltas();
>+		if(checkDelta)	startDeltas();
> 
> 		// move
> 		getJavaModel().move(elements, destinations, siblings, names, force, monitor);
>@@ -341,24 +344,26 @@
> 					}
> 				}
> 			}
>-			IJavaElementDelta destDelta = null;
>-			if (isMainType(element, destinations[i]) && names != null && names[i] != null) { //moved/renamed main type to same cu
>-				destDelta = this.deltaListener.getDeltaFor(moved.getParent());
>-				assertTrue("Renamed compilation unit as result of main type not added", destDelta != null && destDelta.getKind() == IJavaElementDelta.ADDED);
>-				assertTrue("flag should be F_MOVED_FROM", (destDelta.getFlags() & IJavaElementDelta.F_MOVED_FROM) > 0);
>-				assertTrue("moved from handle should be original", destDelta.getMovedFromElement().equals(element.getParent()));
>-			} else {
>-				destDelta = this.deltaListener.getDeltaFor(destinations[i], true);
>-				assertTrue("Destination container not changed", destDelta != null && destDelta.getKind() == IJavaElementDelta.CHANGED);
>-				IJavaElementDelta[] deltas = destDelta.getAddedChildren();
>-				assertTrue("Added children not correct for element copy", deltas[i].getElement().equals(moved));
>-				assertTrue("should be K_ADDED", deltas[i].getKind() == IJavaElementDelta.ADDED);
>-				IJavaElementDelta sourceDelta= this.deltaListener.getDeltaFor(element, false);
>-				assertTrue("should be K_REMOVED", sourceDelta.getKind() == IJavaElementDelta.REMOVED);
>+			if(checkDelta) {
>+				IJavaElementDelta destDelta = null;
>+				if (isMainType(element, destinations[i]) && names != null && names[i] != null) { //moved/renamed main type to same cu
>+					destDelta = this.deltaListener.getDeltaFor(moved.getParent());
>+					assertTrue("Renamed compilation unit as result of main type not added", destDelta != null && destDelta.getKind() == IJavaElementDelta.ADDED);
>+					assertTrue("flag should be F_MOVED_FROM", (destDelta.getFlags() & IJavaElementDelta.F_MOVED_FROM) > 0);
>+					assertTrue("moved from handle should be original", destDelta.getMovedFromElement().equals(element.getParent()));
>+				} else {
>+					destDelta = this.deltaListener.getDeltaFor(destinations[i], true);
>+					assertTrue("Destination container not changed", destDelta != null && destDelta.getKind() == IJavaElementDelta.CHANGED);
>+					IJavaElementDelta[] deltas = destDelta.getAddedChildren();
>+					assertTrue("Added children not correct for element copy", deltas[i].getElement().equals(moved));
>+					assertTrue("should be K_ADDED", deltas[i].getKind() == IJavaElementDelta.ADDED);
>+					IJavaElementDelta sourceDelta= this.deltaListener.getDeltaFor(element, false);
>+					assertTrue("should be K_REMOVED", sourceDelta.getKind() == IJavaElementDelta.REMOVED);
>+				}
> 			}
> 		}
> 	} finally {
>-		stopDeltas();
>+		if(checkDelta)	stopDeltas();
> 	}
> }
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/EncodingTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/EncodingTests.java
>index c9368c8..8baa96a 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/EncodingTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/EncodingTests.java
>@@ -28,6 +28,7 @@
> import org.eclipse.core.runtime.content.IContentDescription;
> import org.eclipse.core.runtime.preferences.IEclipsePreferences;
> import org.eclipse.core.runtime.preferences.InstanceScope;
>+import org.eclipse.jdt.core.IClasspathAttribute;
> import org.eclipse.jdt.core.IClasspathEntry;
> import org.eclipse.jdt.core.ICompilationUnit;
> import org.eclipse.jdt.core.IJavaProject;
>@@ -62,7 +63,7 @@
> 	// Use this static initializer to specify subset for tests
> 	// All specified tests which do not belong to the class are skipped...
> 	static {
>-//		TESTS_NAMES = new String[] { "testBug110576" };
>+//		TESTS_NAMES = new String[] { "testBug361356" };
> //		TESTS_NUMBERS = new int[] { 2, 12 };
> //		TESTS_RANGE = new int[] { 16, -1 };
> 	}
>@@ -1217,7 +1218,256 @@
> 			getWorkspaceRoot().setDefaultCharset(wkspEncoding, null);
> 		}
> 	}
>-	
>+	public void testBug361356() throws Exception {
>+		String oldEncoding = this.encodingProject.getDefaultCharset();
>+		try{
>+			String encoding = "Shift-JIS";
>+			if (wkspEncoding.equals(encoding))
>+				getWorkspaceRoot().setDefaultCharset("UTF-8", null);
>+			this.encodingProject.setDefaultCharset("UTF-8", null);
>+			IJavaProject project = this.createJavaProject("Encoding2", new String[] {""}, "");
>+			IFile zipFile = (IFile) this.encodingProject.findMember("testShiftJIS.zip"); //$NON-NLS-1$
>+			IFile sourceFile = (IFile) this.encodingProject.findMember("src/testShiftJIS/A.java");
>+			
>+			IClasspathEntry[] entries = this.encodingJavaProject.getRawClasspath();
>+			IClasspathEntry newEntry = null;
>+			for (int index = 0; index < entries.length; index++) {
>+				IClasspathEntry entry = entries[index];
>+				if (entry.getPath().toOSString().endsWith("testShiftJIS.jar")) {
>+					newEntry = entries[index]; 
>+				}
>+			}
>+
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, encoding);
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path("/Encoding/src"), null, null, new IClasspathAttribute[]{attribute}, false)}, null);
>+			sourceFile.setCharset(null, null);
>+			
>+			IPackageFragmentRoot root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			ISourceReference sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			String source = sourceRef.getSource();
>+			assertNotNull(source);
>+			String encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			char[] charArray = encodedContents.toCharArray();
>+			encodedContents = new String(CharOperation.remove(charArray, '\r'));
>+			charArray = source.toCharArray();
>+			source = new String(CharOperation.remove(charArray, '\r'));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+
>+			attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, "UTF-8");
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path("/Encoding/src"), null, null, new IClasspathAttribute[]{attribute}, false)}, null);
>+			sourceFile.setCharset(encoding, null);
>+			
>+			root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			source = sourceRef.getSource();
>+			assertNotNull(source);
>+			encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			charArray = encodedContents.toCharArray();
>+			encodedContents = new String(CharOperation.remove(charArray, '\r'));
>+			charArray = source.toCharArray();
>+			source = new String(CharOperation.remove(charArray, '\r'));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+
>+			attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, encoding);
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path("/Encoding/testShiftJIS.zip"), null, null, new IClasspathAttribute[]{attribute}, false)}, null);
>+			zipFile.setCharset(null, null);
>+			
>+			root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			source = sourceRef.getSource();
>+			assertNotNull(source);
>+			encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			charArray = encodedContents.toCharArray();
>+			encodedContents = new String(CharOperation.remove(charArray, '\r'));
>+			charArray = source.toCharArray();
>+			source = new String(CharOperation.remove(charArray, '\r'));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+
>+			attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, "UTF-8");
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path("/Encoding/testShiftJIS.zip"), null, null, new IClasspathAttribute[]{attribute}, false)}, null);
>+			zipFile.setCharset(encoding, null);
>+			
>+			root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			source = sourceRef.getSource();
>+			assertNotNull(source);
>+			encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			charArray = encodedContents.toCharArray();
>+			encodedContents = new String(CharOperation.remove(charArray, '\r'));
>+			charArray = source.toCharArray();
>+			source = new String(CharOperation.remove(charArray, '\r'));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+
>+		}
>+		finally {
>+			this.encodingProject.setDefaultCharset(oldEncoding, null);
>+			deleteProject("Encoding2");
>+			getWorkspaceRoot().setDefaultCharset(wkspEncoding, null);
>+		}		
>+	}
>+	public void testBug361356a() throws Exception {
>+		String oldEncoding = this.encodingProject.getDefaultCharset();
>+		try{
>+			String encoding = "Shift-JIS";
>+			if (wkspEncoding.equals(encoding))
>+				getWorkspaceRoot().setDefaultCharset("UTF-8", null);
>+			this.encodingProject.setDefaultCharset("UTF-8", null);
>+			IJavaProject project = this.createJavaProject("Encoding2", new String[] {""}, "");
>+			IFile zipFile = (IFile) this.encodingProject.findMember("testShiftJIS.zip"); //$NON-NLS-1$
>+			IFile sourceFile = (IFile) this.encodingProject.findMember("src/testShiftJIS/A.java");
>+			
>+			IClasspathEntry[] entries = this.encodingJavaProject.getRawClasspath();
>+			IClasspathEntry newEntry = null;
>+			for (int index = 0; index < entries.length; index++) {
>+				IClasspathEntry entry = entries[index];
>+				if (entry.getPath().toOSString().endsWith("testShiftJIS.jar")) {
>+					newEntry = entries[index]; 
>+				}
>+			}
>+
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, encoding);
>+			attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, encoding);
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path("/Encoding/testShiftJIS.zip"), null, null, new IClasspathAttribute[]{attribute}, false)}, null);
>+			zipFile.setCharset(null, null);
>+			
>+			IPackageFragmentRoot root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			ISourceReference sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			String source = sourceRef.getSource();
>+			assertNotNull(source);
>+			String encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			char[] charArray = encodedContents.toCharArray();
>+			encodedContents = new String(CharOperation.remove(charArray, '\r'));
>+			charArray = source.toCharArray();
>+			source = new String(CharOperation.remove(charArray, '\r'));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+
>+			attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, "UTF-8");
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path("/Encoding/testShiftJIS.zip"), null, null, new IClasspathAttribute[]{attribute}, false)}, null);
>+			zipFile.setCharset(encoding, null);
>+			
>+			root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			source = sourceRef.getSource();
>+			assertNotNull(source);
>+			encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			charArray = encodedContents.toCharArray();
>+			encodedContents = new String(CharOperation.remove(charArray, '\r'));
>+			charArray = source.toCharArray();
>+			source = new String(CharOperation.remove(charArray, '\r'));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+		}
>+		finally {
>+			this.encodingProject.setDefaultCharset(oldEncoding, null);
>+			deleteProject("Encoding2");
>+			getWorkspaceRoot().setDefaultCharset(wkspEncoding, null);
>+		}		
>+	}
>+	public void testBug361356b() throws Exception {
>+		String oldEncoding = this.encodingProject.getDefaultCharset();
>+		File externalSourceZip = null;
>+		File externalSource = null;
>+		try{
>+			String encoding = "Shift-JIS";
>+			if (wkspEncoding.equals(encoding))
>+				getWorkspaceRoot().setDefaultCharset("UTF-8", null);
>+			this.encodingProject.setDefaultCharset("UTF-8", null);
>+			IJavaProject project = this.createJavaProject("Encoding2", new String[] {""}, "");
>+			IFile sourceFile = (IFile) this.encodingProject.findMember("src/testShiftJIS/A.java");
>+			
>+			File internalSourceZip = new File(getWorkspacePath(), "/Encoding/testShiftJIS.zip");
>+			externalSourceZip = new File(getExternalPath(), "testShiftJIS.zip");
>+			File internalSource = new File(getWorkspacePath(), "/Encoding/src");
>+			externalSource = new File(getExternalPath(), "testShiftJIS");
>+
>+			copyDirectory(internalSource, externalSource);
>+			copy(internalSourceZip, externalSourceZip);
>+			
>+			IClasspathEntry[] entries = this.encodingJavaProject.getRawClasspath();
>+			IClasspathEntry newEntry = null;
>+			for (int index = 0; index < entries.length; index++) {
>+				IClasspathEntry entry = entries[index];
>+				if (entry.getPath().toOSString().endsWith("testShiftJIS.jar")) {
>+					newEntry = entries[index]; 
>+				}
>+			}
>+
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, encoding);
>+			attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, encoding);
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path(getExternalResourcePath("testShiftJIS.zip")), null, null, new IClasspathAttribute[]{attribute}, false)}, null);
>+			
>+			IPackageFragmentRoot root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			ISourceReference sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			String source = sourceRef.getSource();
>+			assertNotNull(source);
>+			String encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			char[] charArray = encodedContents.toCharArray();
>+			encodedContents = new String(CharOperation.remove(charArray, '\r'));
>+			charArray = source.toCharArray();
>+			source = new String(CharOperation.remove(charArray, '\r'));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+
>+			attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, "UTF-8");
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path(getExternalResourcePath("testShiftJIS.zip")), null, null, new IClasspathAttribute[]{attribute}, false)}, null);
>+			
>+			root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			source = sourceRef.getSource();
>+			assertNotNull(source);
>+			encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			charArray = encodedContents.toCharArray();
>+			encodedContents = new String(CharOperation.remove(charArray, '\r'));
>+			charArray = source.toCharArray();
>+			source = new String(CharOperation.remove(charArray, '\r'));
>+			assertFalse("Sources should not be decoded the same way", encodedContents.equals(source));
>+			
>+			attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, encoding);
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path(getExternalResourcePath("testShiftJIS")), null, null, new IClasspathAttribute[]{attribute}, false)}, null);
>+			sourceFile.setCharset(null, null);
>+			
>+			root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			source = sourceRef.getSource();
>+			assertNotNull(source);
>+			encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			charArray = encodedContents.toCharArray();
>+			encodedContents = new String(CharOperation.remove(charArray, '\r'));
>+			charArray = source.toCharArray();
>+			source = new String(CharOperation.remove(charArray, '\r'));
>+			assertTrue("Sources should be decoded the same way", encodedContents.equals(source));
>+
>+			attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING, "UTF-8");
>+			project.setRawClasspath(new IClasspathEntry[]{JavaCore.newLibraryEntry(newEntry.getPath(), new Path(getExternalResourcePath("testShiftJIS")), null, null, new IClasspathAttribute[]{attribute}, false)}, null);
>+			sourceFile.setCharset(encoding, null);
>+			
>+			root = getPackageFragmentRoot("Encoding2", "testShiftJIS.jar");
>+			sourceRef = root.getPackageFragment("testShiftJIS").getClassFile("A.class");
>+			assertNotNull(sourceRef);
>+			source = sourceRef.getSource();
>+			assertNotNull(source);
>+			encodedContents = new String (Util.getResourceContentsAsCharArray(sourceFile, encoding));
>+			charArray = encodedContents.toCharArray();
>+			encodedContents = new String(CharOperation.remove(charArray, '\r'));
>+			charArray = source.toCharArray();
>+			source = new String(CharOperation.remove(charArray, '\r'));
>+			assertFalse("Sources should not be decoded the same way", encodedContents.equals(source));
>+		}
>+		finally {
>+			if (externalSourceZip != null) externalSourceZip.delete();
>+			if (externalSource != null) deleteExternalResource("testShiftJIS");
>+			this.encodingProject.setDefaultCharset(oldEncoding, null);
>+			deleteProject("Encoding2");
>+			getWorkspaceRoot().setDefaultCharset(wkspEncoding, null);
>+		}		
>+	}
> 	private void verifyUtf8BOM(IFile file) throws CoreException {
> 		assertNull("File should not have any explicit charset", file.getCharset(false));
> 		IContentDescription contentDescription = file.getContentDescription();
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/IgnoreOptionalProblemsFromSourceFoldersTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/IgnoreOptionalProblemsFromSourceFoldersTests.java
>new file mode 100644
>index 0000000..87fb395
>--- /dev/null
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/IgnoreOptionalProblemsFromSourceFoldersTests.java
>@@ -0,0 +1,289 @@
>+/*******************************************************************************
>+ * Copyright (c) 2012 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.core.tests.model;
>+
>+import junit.framework.Test;
>+
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.Path;
>+import org.eclipse.jdt.core.IClasspathAttribute;
>+import org.eclipse.jdt.core.IClasspathEntry;
>+import org.eclipse.jdt.core.ICompilationUnit;
>+import org.eclipse.jdt.core.IJavaProject;
>+import org.eclipse.jdt.core.JavaCore;
>+import org.eclipse.jdt.core.WorkingCopyOwner;
>+
>+public class IgnoreOptionalProblemsFromSourceFoldersTests extends ModifyingResourceTests {
>+	private static final IClasspathAttribute ATTR_IGNORE_OPTIONAL_PROBLEMS_TRUE = JavaCore.newClasspathAttribute(IClasspathAttribute.IGNORE_OPTIONAL_PROBLEMS, "true");
>+
>+	public static Test suite() {
>+		return buildModelTestSuite(IgnoreOptionalProblemsFromSourceFoldersTests.class);
>+	}
>+
>+	public IgnoreOptionalProblemsFromSourceFoldersTests(String name) {
>+		super(name);
>+	}
>+
>+	// ignore optional errors
>+	public void test001() throws CoreException {
>+		ICompilationUnit unit = null;
>+		try {
>+			IJavaProject project = createJavaProject("P", new String[] {}, new String[] { "JCL_LIB" }, "bin");
>+			project.setOption(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.ERROR);
>+
>+			IClasspathEntry[] originalCP = project.getRawClasspath();
>+			IClasspathEntry[] newCP = new IClasspathEntry[originalCP.length + 1];
>+			System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
>+			newCP[originalCP.length] = JavaCore.newSourceEntry(new Path("/P/src"), null, null, null,
>+					new IClasspathAttribute[] { ATTR_IGNORE_OPTIONAL_PROBLEMS_TRUE });
>+			project.setRawClasspath(newCP, null);
>+
>+			createFolder("/P/src/p");
>+			IFile file = createFile("/P/src/p/X.java",
>+					"package p;\n" +
>+					"public class X {\n" +
>+					"	public void foo() {\n" +
>+					"		int i;\n" +
>+					"	}\n" +
>+					"}");
>+			unit = (ICompilationUnit) JavaCore.create(file);
>+
>+			ProblemRequestor problemRequestor = new ProblemRequestor();
>+			WorkingCopyOwner owner = newWorkingCopyOwner(problemRequestor);
>+			unit.getWorkingCopy(owner, null);
>+			assertProblems("Unexpected problems",
>+					"----------\n" +
>+					"----------\n",
>+					problemRequestor);
>+		} finally {
>+			if (unit != null) {
>+				unit.discardWorkingCopy();
>+			}
>+			deleteProject("P");
>+		}
>+	}
>+
>+	// two different source folders ignore only from one
>+	public void test002() throws CoreException {
>+		ICompilationUnit x = null;
>+		ICompilationUnit y = null;
>+		try {
>+			IJavaProject project = createJavaProject("P", new String[] {}, new String[] { "JCL_LIB" }, "bin");
>+			project.setOption(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.ERROR);
>+
>+			IClasspathEntry[] originalCP = project.getRawClasspath();
>+			IClasspathEntry[] newCP = new IClasspathEntry[originalCP.length + 2];
>+			System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
>+			newCP[originalCP.length] = JavaCore.newSourceEntry(new Path("/P/src"), null, null, null,
>+					new IClasspathAttribute[] { ATTR_IGNORE_OPTIONAL_PROBLEMS_TRUE });
>+			newCP[originalCP.length + 1] = JavaCore.newSourceEntry(new Path("/P/src2"));
>+			project.setRawClasspath(newCP, null);
>+
>+			createFolder("/P/src/p");
>+			IFile fileX = createFile("/P/src/p/X.java",
>+					"package p;\n" +
>+					"public class X {\n" +
>+					"	public void foo() {\n" +
>+					"		int i;\n" +
>+					"	}\n" +
>+					"}");
>+			x = (ICompilationUnit) JavaCore.create(fileX);
>+			createFolder("/P/src2/q");
>+			IFile fileY = createFile("/P/src2/q/Y.java",
>+					"package q;\n" +
>+					"public class Y {\n" +
>+					"	public void foo() {\n" +
>+					"		int i;\n" +
>+					"	}\n" +
>+					"}");
>+			y = (ICompilationUnit) JavaCore.create(fileY);
>+
>+			ProblemRequestor problemRequestorX = new ProblemRequestor();
>+			WorkingCopyOwner ownerX = newWorkingCopyOwner(problemRequestorX);
>+			x.getWorkingCopy(ownerX, null);
>+			assertProblems("Unexpected problems",
>+					"----------\n" +
>+					"----------\n",
>+					problemRequestorX);
>+
>+			ProblemRequestor problemRequestorY = new ProblemRequestor();
>+			WorkingCopyOwner ownerY = newWorkingCopyOwner(problemRequestorY);
>+			y.getWorkingCopy(ownerY, null);
>+			assertProblems("Unexpected problems value",
>+					"----------\n" +
>+					"1. ERROR in /P/src2/q/Y.java\n" +
>+					"The value of the local variable i is not used\n" +
>+					"----------\n",
>+					problemRequestorY);
>+		} finally {
>+			if (x != null) {
>+				x.discardWorkingCopy();
>+			}
>+			if (y != null) {
>+				y.discardWorkingCopy();
>+			}
>+			deleteProject("P");
>+		}
>+	}
>+
>+	// two different source folders ignore from both
>+	public void test003() throws CoreException {
>+		ICompilationUnit x = null;
>+		ICompilationUnit y = null;
>+		try {
>+			IJavaProject project = createJavaProject("P", new String[] {}, new String[] { "JCL_LIB" }, "bin");
>+			project.setOption(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.ERROR);
>+
>+			IClasspathEntry[] originalCP = project.getRawClasspath();
>+			IClasspathEntry[] newCP = new IClasspathEntry[originalCP.length + 2];
>+			System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
>+			newCP[originalCP.length] = JavaCore.newSourceEntry(new Path("/P/src"), null, null, null,
>+					new IClasspathAttribute[] { ATTR_IGNORE_OPTIONAL_PROBLEMS_TRUE });
>+			newCP[originalCP.length + 1] = JavaCore.newSourceEntry(new Path("/P/src2"), null, null, null,
>+					new IClasspathAttribute[] { ATTR_IGNORE_OPTIONAL_PROBLEMS_TRUE });
>+			project.setRawClasspath(newCP, null);
>+
>+			createFolder("/P/src/p");
>+			IFile fileX = createFile("/P/src/p/X.java",
>+					"package p;\n" +
>+					"public class X {\n" +
>+					"	public void foo() {\n" +
>+					"		int i;\n" +
>+					"	}\n" +
>+					"}");
>+			x = (ICompilationUnit) JavaCore.create(fileX);
>+			createFolder("/P/src2/q");
>+			IFile fileY = createFile("/P/src2/q/Y.java",
>+					"package q;\n" +
>+					"public class Y {\n" +
>+					"	public void foo() {\n" +
>+					"		int i;\n" +
>+					"	}\n" +
>+					"}");
>+			y = (ICompilationUnit) JavaCore.create(fileY);
>+
>+			ProblemRequestor problemRequestorX = new ProblemRequestor();
>+			WorkingCopyOwner ownerX = newWorkingCopyOwner(problemRequestorX);
>+			x.getWorkingCopy(ownerX, null);
>+			assertProblems("Unexpected problems",
>+					"----------\n" +
>+					"----------\n",
>+					problemRequestorX);
>+
>+			ProblemRequestor problemRequestorY = new ProblemRequestor();
>+			WorkingCopyOwner ownerY = newWorkingCopyOwner(problemRequestorY);
>+			y.getWorkingCopy(ownerY, null);
>+			assertProblems("Unexpected problems",
>+					"----------\n" +
>+					"----------\n",
>+					problemRequestorY);
>+		} finally {
>+			if (x != null) {
>+				x.discardWorkingCopy();
>+			}
>+			if (y != null) {
>+				y.discardWorkingCopy();
>+			}
>+			deleteProject("P");
>+		}
>+	}
>+
>+	// non-optional errors cannot be ignored
>+	public void test004() throws CoreException {
>+		ICompilationUnit unit = null;
>+		try {
>+			IJavaProject project = createJavaProject("P", new String[] {}, new String[] { "JCL_LIB" }, "bin");
>+			project.setOption(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.ERROR);
>+
>+			IClasspathEntry[] originalCP = project.getRawClasspath();
>+			IClasspathEntry[] newCP = new IClasspathEntry[originalCP.length + 1];
>+			System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
>+			newCP[originalCP.length] = JavaCore.newSourceEntry(new Path("/P/src"), null, null, null,
>+					new IClasspathAttribute[] { ATTR_IGNORE_OPTIONAL_PROBLEMS_TRUE });
>+			project.setRawClasspath(newCP, null);
>+
>+			createFolder("/P/src/p");
>+			IFile file = createFile("/P/src/p/X.java",
>+					"package p;\n" +
>+					"public class X {\n" +
>+					"	public void foo() {\n" +
>+					"		int i;\n" +
>+					"	}\n" +
>+					"	public void bar() {\n" +
>+					"		a++;\n" +
>+					"	}\n" +
>+					"}");
>+			unit = (ICompilationUnit) JavaCore.create(file);
>+
>+			ProblemRequestor problemRequestor = new ProblemRequestor();
>+			WorkingCopyOwner owner = newWorkingCopyOwner(problemRequestor);
>+			unit.getWorkingCopy(owner, null);
>+			assertProblems("Unexpeted problems",
>+					"----------\n" +
>+					"1. ERROR in /P/src/p/X.java\n" +
>+					"a cannot be resolved to a variable\n" +
>+					"----------\n",
>+					problemRequestor);
>+		} finally {
>+			if (unit != null) {
>+				unit.discardWorkingCopy();
>+			}
>+			deleteProject("P");
>+		}
>+	}
>+
>+	// task tags cannot be ignored
>+	public void test005() throws CoreException {
>+		ICompilationUnit unit = null;
>+		try {
>+			IJavaProject project = createJavaProject("P", new String[] {}, new String[] { "JCL_LIB" }, "bin");
>+			project.setOption(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.ERROR);
>+			project.setOption(JavaCore.COMPILER_TASK_TAGS, "TODO");
>+			project.setOption(JavaCore.COMPILER_TASK_PRIORITIES, "NORMAL");
>+
>+			IClasspathEntry[] originalCP = project.getRawClasspath();
>+			IClasspathEntry[] newCP = new IClasspathEntry[originalCP.length + 1];
>+			System.arraycopy(originalCP, 0, newCP, 0, originalCP.length);
>+			newCP[originalCP.length] = JavaCore.newSourceEntry(new Path("/P/src"), null, null, null,
>+					new IClasspathAttribute[] { ATTR_IGNORE_OPTIONAL_PROBLEMS_TRUE });
>+			project.setRawClasspath(newCP, null);
>+
>+			createFolder("/P/src/p");
>+			IFile file = createFile("/P/src/p/X.java",
>+					"package p;\n" +
>+					"public class X {\n" +
>+					"	public void foo() {\n" +
>+					"		int i;\n" +
>+					"	}\n" +
>+					"	public void bar() {\n" +
>+					"		// TODO nothing\n" +
>+					"	}\n" +
>+					"}");
>+			unit = (ICompilationUnit) JavaCore.create(file);
>+
>+			ProblemRequestor problemRequestor = new ProblemRequestor();
>+			WorkingCopyOwner owner = newWorkingCopyOwner(problemRequestor);
>+			unit.getWorkingCopy(owner, null);
>+			assertProblems("Unexpeted problems",
>+					"----------\n" +
>+					"1. WARNING in /P/src/p/X.java\n" +
>+					"TODO nothing\n" +
>+					"----------\n",
>+					problemRequestor);
>+		} finally {
>+			if (unit != null) {
>+				unit.discardWorkingCopy();
>+			}
>+			deleteProject("P");
>+		}
>+	}
>+}
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaIndexTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaIndexTests.java
>new file mode 100644
>index 0000000..1893d3f
>--- /dev/null
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaIndexTests.java
>@@ -0,0 +1,866 @@
>+/*******************************************************************************
>+ * Copyright (c) 2012 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.core.tests.model;
>+
>+import java.io.File;
>+import java.io.IOException;
>+import java.net.URL;
>+
>+import junit.framework.Test;
>+
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.Path;
>+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
>+import org.eclipse.core.runtime.preferences.InstanceScope;
>+import org.eclipse.jdt.core.ClasspathContainerInitializer;
>+import org.eclipse.jdt.core.IClasspathAttribute;
>+import org.eclipse.jdt.core.IClasspathEntry;
>+import org.eclipse.jdt.core.IJavaElement;
>+import org.eclipse.jdt.core.IJavaProject;
>+import org.eclipse.jdt.core.JavaCore;
>+import org.eclipse.jdt.core.index.*;
>+import org.eclipse.jdt.core.search.SearchEngine;
>+import org.eclipse.jdt.core.tests.util.Util;
>+import org.eclipse.jdt.internal.core.JavaModelManager;
>+import org.eclipse.jdt.internal.core.UserLibraryClasspathContainer;
>+import org.osgi.service.prefs.BackingStoreException;
>+
>+public class JavaIndexTests extends AbstractJavaSearchTests  {
>+
>+	static {
>+		// TESTS_NAMES = new String[] {"testPlatformIndexFile"};
>+	}
>+	public JavaIndexTests(String name) {
>+		super(name);
>+	}
>+
>+	public static Test suite() {
>+		return buildModelTestSuite(JavaIndexTests.class);
>+	}
>+	// Test that the index file is really generated.
>+	public void testGenerateIndex() throws IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			assertTrue(new File(indexFilePath).exists());
>+		} finally {
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+	// Test that the index file and the jar can be deleted after the indexing is done
>+	// This is to ensure that the files are closed
>+	public void testDeleteIndexedFile() {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			assertTrue("Could not delete the index file", new File(indexFilePath).delete());
>+			assertTrue("Could not delete the jar file", new File(jarFilePath).delete());
>+		} catch (IOException e) {
>+			assertFalse("Test failed", true);
>+		}
>+	}
>+	
>+	// Test that search works fine with the index file
>+	public void testUseIndex() throws CoreException, IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			long modified = new File(indexFilePath).lastModified();
>+			
>+			IJavaProject p = createJavaProject("P");
>+			Path libPath = new Path(jarFilePath);
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			
>+			waitUntilIndexesReady();
>+			
>+			// Test that specified index file is really used
>+			java.io.File indexFile = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile();
>+			assertEquals("Specified index file is not being used", indexFilePath,indexFile.toString());
>+			
>+			// Test that search works properly 
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			// Ensure that the index file is not modified
>+			assertEquals(modified, new File(indexFilePath).lastModified());
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+	// Test that the same index file is used even after restarting
>+	public void testUseIndexAfterRestart() throws IOException, CoreException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			long modified = new File(indexFilePath).lastModified();
>+			IJavaProject p = createJavaProject("P");
>+			Path libPath = new Path(jarFilePath);
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			simulateExitRestart();
>+			getJavaModel().refreshExternalArchives(null, null);
>+			waitUntilIndexesReady();
>+			
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			java.io.File indexFile = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile();
>+			assertEquals(indexFilePath,indexFile.toString());
>+			// Ensure that the file is not modified
>+			assertEquals(modified, new File(indexFilePath).lastModified());
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+	// Test that the same index file is used even after restarting
>+	public void testUseIndexInternalJarAfterRestart() throws IOException, CoreException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = "/P/Test.jar";
>+		String fullJarPath = getWorkspacePath() + jarFilePath;
>+		try {
>+			IJavaProject p = createJavaProject("P");
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, fullJarPath);
>+			p.getProject().refreshLocal(1, null);
>+			JavaIndexer.generateIndexForJar(fullJarPath, indexFilePath);
>+			long modified = new File(indexFilePath).lastModified();
>+			IPath libPath = new Path(jarFilePath);
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults("Test.jar pkg.Test [No source]");
>+			java.io.File indexFile = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile();
>+			assertEquals(indexFilePath,indexFile.toString());
>+			
>+			simulateExitRestart();
>+			waitUntilIndexesReady();
>+			
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults("Test.jar pkg.Test [No source]");
>+			
>+			indexFile = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile();
>+			assertEquals(indexFilePath,indexFile.toString());
>+			// Ensure that the file is not modified
>+			assertEquals(modified, new File(indexFilePath).lastModified());
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+		}
>+	}
>+	
>+	// Test that a jar file that gets modified after the index is created doesn't return new changes. 
>+	// This behavior might have to be modified but.. 
>+	public void testModifyJarAfterIndex() throws CoreException, IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}", 
>+					"pkg/NewTest.java",
>+					"package pkg;\n" +
>+					"public class NewTest {\n" +
>+					"  protected NewTest(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			IJavaProject p = createJavaProject("P");
>+			Path libPath = new Path(jarFilePath);
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			search("NewTest", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults("");
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+
>+	// test a non-existent index
>+	public void testNonExistentIndex() throws CoreException, IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			IJavaProject p = createJavaProject("P");
>+			Path libPath = new Path(jarFilePath);
>+			new File(indexFilePath).delete();
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+	// test a non-existent index
>+	public void testNonExistentIndexRestart() throws CoreException, IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			
>+			new File(indexFilePath).delete();
>+			
>+			IJavaProject p = createJavaProject("P");
>+			Path libPath = new Path(jarFilePath);
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			java.io.File indexFile = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile();
>+			long modified = indexFile.lastModified();
>+			assertEquals(modified, indexFile.lastModified());
>+			
>+			simulateExitRestart();
>+			getJavaModel().refreshExternalArchives(null,null);
>+			waitUntilIndexesReady();
>+			
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			indexFile = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile();
>+			assertEquals("Index File should not have got modified",modified, indexFile.lastModified());
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+	// test that if the index is not existent after restart, it should build up a new index
>+	public void testNonExistentIndexAfterRestart() throws CoreException, IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" + 
>+					"public class Test {\n" +
>+					"protected Test(int i) {}\n" + "}" 
>+					},jarFilePath);
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			
>+			IJavaProject p = createJavaProject("P");
>+			Path libPath = new Path(jarFilePath);
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			simulateExitRestart();
>+			File indexFile = new File(indexFilePath);
>+			indexFile.delete();
>+			assertTrue(!indexFile.exists());
>+			getJavaModel().refreshExternalArchives(null,null);
>+			waitUntilIndexesReady();
>+			
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+	// test a non-existent index which becomes existent after restart
>+	public void testExistentIndexAfterRestart() throws CoreException, IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			
>+			File indexFile = new File(indexFilePath);
>+			indexFile.delete();
>+			assertTrue(!indexFile.exists());
>+			
>+			IJavaProject p = createJavaProject("P");
>+			Path libPath = new Path(jarFilePath);
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			simulateExitRestart();
>+			getJavaModel().refreshExternalArchives(null,null);
>+			waitUntilIndexesReady();
>+			
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			indexFile = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile();
>+			assertEquals(indexFilePath,indexFile.toString());
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+	// Test that the index file is not deleted when the project is deleted
>+	public void testDeleteProject() throws CoreException, IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			IJavaProject p = createJavaProject("P");
>+			createExternalFolder("externalLib");
>+			Path libPath = new Path(jarFilePath);
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			deleteProject("P");
>+			File f = new File(indexFilePath);
>+			assertTrue(f.exists());
>+		} finally {
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+
>+	
>+	// Test index file in platform
>+	public void testPlatformIndexFile() throws CoreException, IOException {
>+		String indexFilePath = null;
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		String indexUrl = "platform:/resource/P/Test.index";
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			
>+			IJavaProject p = createJavaProject("P");
>+			indexFilePath = p.getProject().getLocation().append("Test.index").toFile().getAbsolutePath();
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			long modified = new File(indexFilePath).lastModified();
>+			
>+			Path libPath = new Path(jarFilePath);
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, indexUrl);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			String indexFileName = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile().getName();
>+			assertEquals(indexFileName, "Test.index");
>+			
>+			simulateExitRestart();
>+			getJavaModel().refreshExternalArchives(null,null);
>+			waitUntilIndexesReady();
>+			
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			indexFileName = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile().getName();
>+			assertEquals(indexFileName, "Test.index");
>+
>+			assertEquals(modified, new File(indexFilePath).lastModified());
>+		} finally {
>+			deleteProject("P");
>+			if (indexFilePath != null) new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+	
>+	public void testEditClasspath() throws CoreException, IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			File f = new File(indexFilePath);
>+			long modified = f.lastModified();
>+			IJavaProject p = this.createJavaProject("P", new String[] {}, "bin");
>+
>+			String content = new String(
>+					"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
>+					+ "<classpath>\n"
>+					+ "<classpathentry kind=\"src\" path=\"src a\"/>\n"
>+					+ "<classpathentry kind=\"src\" path=\"src x\"/>\n"
>+					+ "<classpathentry kind=\"lib\" path=\""
>+					+ getExternalJCLPath()
>+					+ "\"/>\n"
>+					+ "<classpathentry kind=\"lib\" path=\""
>+					+ jarFilePath
>+					+ "\">"
>+					+ "<attributes>\n" 
>+					+ "	<attribute name=\"index_location\" value=\"file:///"
>+					+ indexFilePath
>+					+"\"/>\n" 
>+					+ "</attributes>\n"
>+					+ "</classpathentry>\n"
>+					+ "<classpathentry kind=\"output\" path=\"bin\"/>\n"
>+					+ "</classpath>\n");
>+
>+			editFile("/P/.classpath", content);
>+			p.open(null);
>+			waitUntilIndexesReady();
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			java.io.File indexFile = JavaModelManager.getIndexManager().getIndex(new Path(jarFilePath), false, false).getIndexFile();
>+			assertEquals(indexFilePath,indexFile.toString());
>+			f = new File(indexFilePath);
>+			assertEquals(modified, f.lastModified());
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+	// Test changing the classpath	
>+	public void testChangeClasspath() throws CoreException, IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}", 
>+					"pkg/NewTest.java",
>+					"package pkg;\n" +
>+					"public class NewTest {\n" +
>+					"  protected NewTest(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			IJavaProject p = createJavaProject("P");
>+			Path libPath = new Path(jarFilePath);
>+			
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, null, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			search("NewTest", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.NewTest");
>+			
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("NewTest", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults("");
>+			
>+			entry = JavaCore.newLibraryEntry(libPath, null, null, null, null, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("NewTest", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.NewTest");
>+			
>+			
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+	// Test changing the classpath	
>+	public void testChangeClasspathForInternalJar() throws CoreException, IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = "/P/Test.jar";
>+		String fullJarPath = getWorkspacePath() + jarFilePath;
>+		try {
>+			IJavaProject p = createJavaProject("P");
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, fullJarPath);
>+			JavaIndexer.generateIndexForJar(fullJarPath, indexFilePath);
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}", 
>+					"pkg/NewTest.java",
>+					"package pkg;\n" +
>+					"public class NewTest {\n" +
>+					"  protected NewTest(int i) {}\n" +
>+					"}"}, fullJarPath);
>+			p.getProject().refreshLocal(1, null);
>+			Path libPath = new Path(jarFilePath);
>+			
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, null, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			search("NewTest", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults("Test.jar pkg.NewTest [No source]");
>+			
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("NewTest", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults("");
>+			
>+			entry = JavaCore.newLibraryEntry(libPath, null, null, null, null, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("NewTest", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults("Test.jar pkg.NewTest [No source]");	
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+		}
>+	}
>+		
>+	public void testMultipleProjects() throws CoreException, IOException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			
>+			IJavaProject p1 = createJavaProject("P1");
>+			Path libPath = new Path(jarFilePath);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, null, false);
>+			setClasspath(p1, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			
>+			IJavaProject p2 = createJavaProject("P2");
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, "file:///"+indexFilePath);
>+			entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p2, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p1}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			File indexFile = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile();
>+			assertEquals(indexFilePath,indexFile.toString());
>+			
>+		} finally {
>+			deleteProject("P1");
>+			deleteProject("P2");
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+	
>+	public void setContainerPath(IJavaProject p, IPath jarPath, String indexLocation) throws CoreException, BackingStoreException {
>+		// Create new user library "SomeUserLibrary"
>+		ClasspathContainerInitializer initializer= JavaCore.getClasspathContainerInitializer(JavaCore.USER_LIBRARY_CONTAINER_ID);
>+		String libraryName = "SomeUserLibrary";
>+		IPath containerPath = new Path(JavaCore.USER_LIBRARY_CONTAINER_ID);
>+		UserLibraryClasspathContainer containerSuggestion = new UserLibraryClasspathContainer(libraryName);
>+		initializer.requestClasspathContainerUpdate(containerPath.append(libraryName), null, containerSuggestion);
>+
>+		// Modify user library
>+		IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(JavaCore.PLUGIN_ID);
>+		String propertyName = JavaModelManager.CP_USERLIBRARY_PREFERENCES_PREFIX+"SomeUserLibrary";
>+		StringBuffer propertyValue = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<userlibrary systemlibrary=\"false\" version=\"1\">\r\n<archive ");
>+		//String jarFullPath = getWorkspaceRoot().getLocation().append(jarFile.getFullPath()).toString();
>+		propertyValue.append(" path=\"" + jarPath + "\">\r\n");
>+		propertyValue.append(" <attributes>\r\n");
>+		propertyValue.append("		<attribute name=\"index_location\" value=\"");
>+		propertyValue.append(indexLocation);
>+		propertyValue.append("\"/>\r\n</attributes>\r\n");
>+		propertyValue.append("</archive>\r\n");
>+		propertyValue.append("</userlibrary>\r\n");
>+		preferences.put(propertyName, propertyValue.toString());
>+		preferences.flush();
>+		
>+		IClasspathEntry[] entries = p.getRawClasspath();
>+		int length = entries.length;
>+		System.arraycopy(entries, 0, entries = new IClasspathEntry[length+1], 0, length);
>+		entries[length] = JavaCore.newContainerEntry(containerSuggestion.getPath());
>+		p.setRawClasspath(entries, null);
>+	}
>+	
>+	public void testUserLibraryIndex() throws IOException, CoreException, BackingStoreException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			long modified = new File(indexFilePath).lastModified();
>+			
>+			IJavaProject p = createJavaProject("P");
>+			
>+			Path libPath = new Path(jarFilePath);
>+			setContainerPath(p, libPath, "file:///"+indexFilePath);
>+			
>+			waitUntilIndexesReady();
>+			
>+			// Test that specified index file is really used
>+			java.io.File indexFile = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile();
>+			assertEquals("Specified index file is not being used", indexFilePath,indexFile.toString());
>+			
>+			// Test that search works properly 
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			// Ensure that the index file is not modified
>+			assertEquals(modified, new File(indexFilePath).lastModified());
>+			
>+			simulateExitRestart();
>+			getJavaModel().refreshExternalArchives(null,null);
>+			waitUntilIndexesReady();
>+			
>+			// Test that specified index file is really used
>+			indexFile = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexFile();
>+			assertEquals("Specified index file is not being used", indexFilePath,indexFile.toString());
>+			
>+			// Test that search works properly
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			// Ensure that the index file is not modified
>+			assertEquals(modified, new File(indexFilePath).lastModified());
>+		} finally {
>+			deleteProject("P");
>+			new File(indexFilePath).delete();
>+			new File(jarFilePath).delete();
>+		}		
>+	}
>+	
>+	// Test that it works if the index file is in the jar file
>+	public void testIndexInJar() throws IOException, CoreException {
>+		String indexFilePath = getExternalResourcePath("Test.index");
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		String indexZipPath =  getExternalResourcePath("TestIndex.zip");
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			Util.zipFiles(new File[]{new File(indexFilePath)}, indexZipPath);
>+			
>+			IJavaProject p = createJavaProject("P");
>+			Path libPath = new Path(jarFilePath);
>+			String url = "jar:file:"+indexZipPath+"!/Test.index";
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, url);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			
>+			assertEquals(url,JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexLocation().getUrl().toString());
>+			
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			simulateExitRestart();
>+			getJavaModel().refreshExternalArchives(null,null);
>+			waitUntilIndexesReady();
>+			
>+			this.resultCollector = new JavaSearchResultCollector();
>+			assertEquals(url,JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexLocation().getUrl().toString());
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+		} finally {
>+			deleteProject("P");
>+			new File(indexZipPath).delete();
>+			new File(jarFilePath).delete();
>+		}
>+	}
>+
>+	// Test index file in platform
>+	public void testPlatformJarIndexFile() throws CoreException, IOException {
>+		String indexFilePath = null;
>+		String jarFilePath = getExternalResourcePath("Test.jar");
>+		String indexUrl = "platform:/resource/ForIndex/Test.index.zip!/Test.index";
>+		try {
>+			createJar(new String[] {
>+					"pkg/Test.java",
>+					"package pkg;\n" +
>+					"public class Test {\n" +
>+					"  protected Test(int i) {}\n" +
>+					"}"}, jarFilePath);
>+			
>+			IProject indexProj = createProject("ForIndex");
>+			indexFilePath = indexProj.getProject().getLocation().append("Test.index").toFile().getAbsolutePath();
>+			JavaIndexer.generateIndexForJar(jarFilePath, indexFilePath);
>+			Util.zipFiles(new File[]{new File(indexFilePath)}, indexFilePath+".zip");
>+			
>+			IJavaProject p = createJavaProject("P");
>+			Path libPath = new Path(jarFilePath);
>+			IClasspathAttribute attribute = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, indexUrl);
>+			IClasspathEntry entry = JavaCore.newLibraryEntry(libPath, null, null, null, new IClasspathAttribute[]{attribute}, false);
>+			setClasspath(p, new IClasspathEntry[] {entry});
>+			waitUntilIndexesReady();
>+			
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			URL url = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexLocation().getUrl();
>+			assertEquals(indexUrl, url.toString());
>+			
>+			simulateExitRestart();
>+			getJavaModel().refreshExternalArchives(null,null);
>+			waitUntilIndexesReady();
>+			
>+			this.resultCollector = new JavaSearchResultCollector();
>+			search("Test", TYPE, DECLARATIONS, EXACT_RULE, SearchEngine.createJavaSearchScope(new IJavaElement[]{p}));
>+			assertSearchResults(getExternalPath() + "Test.jar pkg.Test");
>+			
>+			url = JavaModelManager.getIndexManager().getIndex(libPath, false, false).getIndexLocation().getUrl();
>+			assertEquals(indexUrl, url.toString());
>+		} finally {
>+			deleteProject("P");
>+			if (indexFilePath != null) {
>+				new File(indexFilePath).delete();
>+				new File(indexFilePath+".zip").delete();
>+			}
>+			new File(jarFilePath).delete();
>+			deleteProject("ForIndex");
>+		}
>+	}
>+}
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java
>index 6357803..a7388ab 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java
>@@ -37,7 +37,7 @@
> 	super(name);
> }
> static {
>-//	TESTS_NAMES = new String[] { "testAddExternalLibFolder6" };
>+//	TESTS_NAMES = new String[] { "testBug360164" };
> }
> public static Test suite() {
> 	TestSuite suite = (TestSuite) buildModelTestSuite(JavaProjectTests.class);
>@@ -2389,4 +2389,102 @@
> 		deleteProject("JavaProjectTestsInvalidProject");
> 	}
> }
>+// Bug 360164 - Compile error in XSDImpl
>+// test that we can tolerate if a 1.4 project refers to an enum inside a library.
>+public void testBug360164() throws IOException, CoreException {
>+	String libPath = getWorkspacePath()+"JavaProjectTests/bin/bug360164.jar";
>+	try {
>+		this.createJavaProject("P", new String[] {"src"}, new String[] {"JCL_LIB", libPath}, "bin", JavaCore.VERSION_1_4);
>+		IFile file = createFile("/P/src/X.java", 
>+				"import p360164.Provider;\n" +
>+				"import p360164.MyEnum;\n" +
>+				"public class X {\n" +
>+				"    int foo(Provider p) {\n" +
>+				"        MyEnum e = p.getE();\n" +
>+				"        switch (e.getValue()) {\n" +
>+				"        case MyEnum.ONE_COMPAT: return 1;\n" +
>+				"        case MyEnum.TWO_COMPAT: return 2;\n" +
>+				"        }\n" +
>+				"        return 0;\n" +
>+				"    }\n" +
>+				"}"
>+		);	
>+		ICompilationUnit unit = (ICompilationUnit)JavaCore.create(file);
>+		ProblemRequestor problemRequestor = new ProblemRequestor();
>+		WorkingCopyOwner owner = newWorkingCopyOwner(problemRequestor);
>+		unit.getWorkingCopy(owner, null);
>+		assertProblems("Unexpected problems", 
>+				"----------\n" + 
>+				"----------\n", 
>+				problemRequestor);
>+	} finally {
>+		this.deleteProject("P");
>+	}
>+}
>+// Bug 360164 - Compile error in XSDImpl
>+// test that we still report the missing superclass when resolving non-local methods
>+public void testBug360164a() throws IOException, CoreException {
>+	String libPath = getWorkspacePath()+"JavaProjectTests/bin/bug360164.jar";
>+	try {
>+		this.createJavaProject("P", new String[] {"src"}, new String[] {"JCL_LIB", libPath}, "bin", JavaCore.VERSION_1_4);
>+		IFile file = createFile("/P/src/X.java", 
>+				"import p360164.Provider;\n" +
>+				"import p360164.MyEnum;\n" +
>+				"public class X {\n" +
>+				"    String foo(Provider p) {\n" +
>+				"        MyEnum e = p.getE();\n" +
>+				"        return e.toString();\n" +
>+				"    }\n" +
>+				"}"
>+		);	
>+		ICompilationUnit unit = (ICompilationUnit)JavaCore.create(file);
>+		ProblemRequestor problemRequestor = new ProblemRequestor();
>+		WorkingCopyOwner owner = newWorkingCopyOwner(problemRequestor);
>+		unit.getWorkingCopy(owner, null);
>+		assertProblems("Unexpected problems", 
>+				"----------\n" + 
>+				"1. ERROR in /P/src/X.java\n" + 
>+				"The type java.lang.Enum cannot be resolved. It is indirectly referenced from required .class files\n" + 
>+				"----------\n", 
>+				problemRequestor);
>+	} finally {
>+		this.deleteProject("P");
>+	}
>+}
>+// Bug 360317 - [compiler] report switch over enum in 1.4- mode
>+public void testBug360317() throws IOException, CoreException {
>+	// use the setup from testBug360164():
>+	String libPath = getWorkspacePath()+"JavaProjectTests/bin/bug360164.jar";
>+	try {
>+		this.createJavaProject("P", new String[] {"src"}, new String[] {"JCL_LIB", libPath}, "bin", JavaCore.VERSION_1_4);
>+		String sourceX = "import p360164.Provider;\n" +
>+						 "import p360164.MyEnum;\n" +
>+						 "public class X {\n" +
>+						 "    int foo(Provider p) {\n" +
>+						 "        MyEnum e = p.getE();\n" +
>+						 "        switch (e) {\n" +
>+						 "        case ONE: return 1;\n" +
>+						 "        case TWO: return 2;\n" +
>+						 "        }\n" +
>+						 "        return 0;\n" +
>+						 "    }\n" +
>+						 "}";
>+		IFile file = createFile("/P/src/X.java", sourceX);	
>+		ICompilationUnit unit = (ICompilationUnit)JavaCore.create(file);
>+		ProblemRequestor problemRequestor = new ProblemRequestor();
>+		problemRequestor.initialize(sourceX.toCharArray());
>+		WorkingCopyOwner owner = newWorkingCopyOwner(problemRequestor);
>+		unit.getWorkingCopy(owner, null);
>+		assertProblems("Unexpected problems", 
>+				"----------\n" +
>+				"1. ERROR in /P/src/X.java (at line 6)\n" +
>+				"	switch (e) {\n" +
>+				"	        ^\n" +
>+				"Cannot switch on an enum value for source level below 1.5. Only convertible int values are permitted\n" +
>+				"----------\n",
>+				problemRequestor);
>+	} finally {
>+		this.deleteProject("P");
>+	}
>+}
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java
>index f18fa34..4ab96d2 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -69,7 +69,6 @@
> import org.eclipse.jdt.core.search.TypeReferenceMatch;
> import org.eclipse.jdt.core.tests.util.Util;
> import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
>-import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
> import org.eclipse.jdt.internal.core.ClassFile;
> import org.eclipse.jdt.internal.core.JavaModelManager;
> import org.eclipse.jdt.internal.core.SourceMethod;
>@@ -94,7 +93,7 @@
> // Debug
> static {
> //	 org.eclipse.jdt.internal.core.search.BasicSearchEngine.VERBOSE = true;
>-//	TESTS_NAMES = new String[] {"testBug306223"};
>+//	TESTS_NAMES = new String[] {"testBug324189d"};
> }
> 
> public JavaSearchBugsTests(String name) {
>@@ -710,6 +709,8 @@
> 	suite.addTest(new JavaSearchBugsTests("testBug350885"));
> 	suite.addTest(new JavaSearchBugsTests("testBug349683"));
> 	suite.addTest(new JavaSearchBugsTests("testBug345807"));
>+	suite.addTest(new JavaSearchBugsTests("testBug355605"));
>+	suite.addTest(new JavaSearchBugsTests("testBug241834"));
> 	return suite;
> }
> class TestCollector extends JavaSearchResultCollector {
>@@ -11579,9 +11580,9 @@
>  */
> public void testBug286379c() throws CoreException {
> 	class TestResourceChangeListener implements IResourceChangeListener {
>-		boolean valid = false;
>+		boolean toRemPresent = false;
> 		public void resourceChanged(IResourceChangeEvent event) {
>-			this.valid = validate(event.getDelta());
>+			this.toRemPresent = validate(event.getDelta());
> 		}
> 		/*
> 		 * Ensure that the listener receives a delta concerning the resource
>@@ -11604,17 +11605,6 @@
> 	        return false;
>         }
> 	}
>-	// print statement to debug random failures of this test
>-	JavaModelManager.DEBUG_302850 = true;
>-	System.out.println("================================================================================");
>-	System.out.println("Starting test JavaSearchBugTests.testBug286379c()...");
>-	System.out.println("	- Default Options at test start:");
>-	System.out.println(Util.indentString(new CompilerOptions(JavaCore.getDefaultOptions()).toString(), 1));
>-	System.out.println("	- Options at test start:");
>-	System.out.println("		+ Task tags:           " + JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
>-	System.out.println("		+ Task priorities:     " + JavaCore.getOption(JavaCore.COMPILER_TASK_PRIORITIES));
>-	System.out.println("		+ Forbidden reference: " + JavaCore.getOption(JavaCore.COMPILER_PB_FORBIDDEN_REFERENCE));
>-	System.out.println(Util.indentString(new CompilerOptions(JavaCore.getOptions()).toString(), 2));
> 	
> 	IContentType javaContentType = Platform.getContentTypeManager().getContentType(JavaCore.JAVA_SOURCE_CONTENT_TYPE);
> 	TestResourceChangeListener changeListener = new TestResourceChangeListener();
>@@ -11644,7 +11634,7 @@
> 		// fail as we don't get any specific event from the platform to refresh the indexes.
> 		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=118619
> 		int counter = 0;
>-		while (!changeListener.valid) {
>+		while (!changeListener.toRemPresent) {
> 			try {
> 				Thread.sleep(100);
> 			}
>@@ -11657,21 +11647,9 @@
> 		// Wait to be sure that indexes are ready after the new resource was added
> 		waitUntilIndexesReady();
> 
>-		// print statement to debug random failures of this test
>-		System.out.println("	- Options before first exit:");
>-		System.out.println("		+ Task tags:           " + JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
>-		System.out.println("		+ Task priorities:     " + JavaCore.getOption(JavaCore.COMPILER_TASK_PRIORITIES));
>-		System.out.println("		+ Forbidden reference: " + JavaCore.getOption(JavaCore.COMPILER_PB_FORBIDDEN_REFERENCE));
>-		System.out.println(Util.indentString(new CompilerOptions(JavaCore.getOptions()).toString(), 2));
> 		// Restart to let the indexes to be refreshed
> 		simulateExit();
> 		simulateRestart();
>-		// print statement to debug random failures of this test
>-		System.out.println("	- Options after first restart:");
>-		System.out.println("		+ Task tags:           " + JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
>-		System.out.println("		+ Task priorities:     " + JavaCore.getOption(JavaCore.COMPILER_TASK_PRIORITIES));
>-		System.out.println("		+ Forbidden reference: " + JavaCore.getOption(JavaCore.COMPILER_PB_FORBIDDEN_REFERENCE));
>-		System.out.println(Util.indentString(new CompilerOptions(JavaCore.getOptions()).toString(), 2));
> 		waitUntilIndexesReady();
> 
> 		// Search for the new type with new extension
>@@ -11689,22 +11667,23 @@
> 				false /*only assume*/);
> 		
> 		// Delete the file specification
>+		changeListener.toRemPresent = true;
> 		javaContentType.removeFileSpec("torem", IContentType.FILE_EXTENSION_SPEC);
>+		counter = 0;
>+		while (changeListener.toRemPresent) {
>+			try {
>+				Thread.sleep(100);
>+			}
>+			catch (InterruptedException ie) {
>+				// skip
>+			}
>+			assertTrue("We should have got a resource event within a 10s delay!", counter++ < 100);
>+		}
>+		waitUntilIndexesReady();
> 		
>-		// print statement to debug random failures of this test
>-		System.out.println("	- Options before second exit:");
>-		System.out.println("		+ Task tags:           " + JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
>-		System.out.println("		+ Task priorities:     " + JavaCore.getOption(JavaCore.COMPILER_TASK_PRIORITIES));
>-		System.out.println("		+ Forbidden reference: " + JavaCore.getOption(JavaCore.COMPILER_PB_FORBIDDEN_REFERENCE));
>-		System.out.println(Util.indentString(new CompilerOptions(JavaCore.getOptions()).toString(), 2));
> 		// Restarting should update the index file to remove the references of any .torem files
> 		simulateExit();
>-		simulateRestart();	
>-		// print statement to debug random failures of this test
>-		System.out.println("	- Options after second restart:");
>-		System.out.println("		+ Task tags:           " + JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
>-		System.out.println("		+ Task priorities:     " + JavaCore.getOption(JavaCore.COMPILER_TASK_PRIORITIES));
>-		System.out.println("		+ Forbidden reference: " + JavaCore.getOption(JavaCore.COMPILER_PB_FORBIDDEN_REFERENCE));
>+		simulateRestart();
> 		waitUntilIndexesReady();
> 
> 		// Search for the new type with new extension
>@@ -11717,24 +11696,11 @@
> 				IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
> 				null);
> 		assertSearchResults("No search results expected", "", collector);
>-		System.out.println("	- Options after search:");
>-		System.out.println("		+ Task tags:           " + JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
>-		System.out.println("		+ Task priorities:     " + JavaCore.getOption(JavaCore.COMPILER_TASK_PRIORITIES));
>-		System.out.println("		+ Forbidden reference: " + JavaCore.getOption(JavaCore.COMPILER_PB_FORBIDDEN_REFERENCE));
>-		System.out.println(Util.indentString(new CompilerOptions(JavaCore.getOptions()).toString(), 2));
> 	} finally {
> 		getWorkspace().removeResourceChangeListener(changeListener);
> 		if (javaContentType != null)
> 			javaContentType.removeFileSpec("torem", IContentType.FILE_EXTENSION_SPEC);
> 		deleteProject("P");
>-		System.out.println("	- Options at test end:");
>-		System.out.println("		+ Task tags:           " + JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
>-		System.out.println("		+ Task priorities:     " + JavaCore.getOption(JavaCore.COMPILER_TASK_PRIORITIES));
>-		System.out.println("		+ Forbidden reference: " + JavaCore.getOption(JavaCore.COMPILER_PB_FORBIDDEN_REFERENCE));
>-		System.out.println(Util.indentString(new CompilerOptions(JavaCore.getOptions()).toString(), 2));
>-		System.out.println("	- Default Options at test end:");
>-		System.out.println(Util.indentString(new CompilerOptions(JavaCore.getDefaultOptions()).toString(), 2));
>-		JavaModelManager.DEBUG_302850 = false;
> 	}
> }
> 
>@@ -13434,7 +13400,7 @@
> 			},
> 			new HashMap(),
> 			libPath);
>-		IJavaProject javaProject = createJavaProject("P", new String[0], new String[] {libPath}, "");
>+		IJavaProject javaProject = createJavaProject("P", new String[0], new String[] {libPath, "JCL_LIB"}, "");
> 		waitUntilIndexesReady();
> 		int mask = IJavaSearchScope.APPLICATION_LIBRARIES | IJavaSearchScope.SOURCES ;
> 		IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] { javaProject }, mask);
>@@ -13713,4 +13679,69 @@
> 		deleteProject("Project2");
> 	}
> }
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=355605
>+public void testBug355605() throws CoreException {
>+	try {
>+	createJavaProject("P");
>+
>+		String fileContent = 				
>+			"public class X { \n" 
>+			+ "class R {\n"
>+			+ "   class S {\n" 
>+			+ "   	void setInfo(String x) {\n"
>+			+ "   	}\n" 
>+			+ "   }\n"
>+			+ "   class T {\n"
>+			+ "   }\n"
>+			+ "	T t = new T()  {\n" 
>+			+ "		S s = new S() {\n"
>+			+ "           void myMethod() {\n"
>+			+ "               setInfo(\"a\");\n" 
>+			+ "           }\n"
>+			+ "      };// S ends\n"
>+			+ "   };\n" 
>+			+ "}\n" 
>+			+ "}\n" ;
>+		createFile("/P/X.java", fileContent);
>+		
>+		waitUntilIndexesReady();
>+		this.resultCollector = new TestCollector();
>+		this.resultCollector.showAccuracy(true);
>+		ICompilationUnit unit = getCompilationUnit("/P/X.java");
>+		IMethod method = selectMethod(unit, "myMethod", 1);
>+		IJavaSearchScope hierarchyScope = SearchEngine.createHierarchyScope((IType)method.getParent());
>+		search(method, IMPLEMENTORS, EXACT_RULE, hierarchyScope, this.resultCollector);
>+		assertSearchResults("Unexpected search results!", "X.java void X$R.t:<anonymous>#1.s:<anonymous>#1.myMethod() [myMethod] EXACT_MATCH", this.resultCollector);
>+		
>+	} finally {
>+		deleteProject("P");
>+	}
>+}
>+/**
>+ * @bug 241834: [search] ClassCastException during move class refactoring
>+ * @test that search for declarations of referenced types doesn't cause CCE
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=241834"
>+ */
>+public void testBug241834() throws CoreException {
>+	try {
>+		IJavaProject project = createJavaProject("P");
>+		project.setOption(JavaCore.COMPILER_DOC_COMMENT_SUPPORT, JavaCore.ENABLED);
>+		createFolder("/P/pkg");
>+		createFile("/P/pkg/Foo.java",
>+				"package pkg;\n"+
>+				"/**\n" +
>+				"  * {@link missing.Foo}\n" +
>+				"  */\n" +
>+				"public class Foo {\n" +
>+				"}\n");
>+		waitUntilIndexesReady();
>+		IType type = getCompilationUnit("/P/pkg/Foo.java").getType("Foo");
>+		searchDeclarationsOfReferencedTypes(type, this.resultCollector);
>+		assertSearchResults("");
>+	} finally {
>+		deleteProject("P");
>+		
>+	}
>+}
>+// Add new tests in JavaSearchBugsTests2
> }
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests2.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests2.java
>new file mode 100644
>index 0000000..0052f7a
>--- /dev/null
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests2.java
>@@ -0,0 +1,484 @@
>+/*******************************************************************************
>+ * Copyright (c) 2012 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+
>+package org.eclipse.jdt.core.tests.model;
>+
>+import java.io.IOException;
>+import java.util.ArrayList;
>+import java.util.List;
>+
>+import junit.framework.Test;
>+
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.jdt.core.IJavaElement;
>+import org.eclipse.jdt.core.IJavaProject;
>+import org.eclipse.jdt.core.IMethod;
>+import org.eclipse.jdt.core.IType;
>+import org.eclipse.jdt.core.search.IJavaSearchConstants;
>+import org.eclipse.jdt.core.search.IJavaSearchScope;
>+import org.eclipse.jdt.core.search.SearchEngine;
>+import org.eclipse.jdt.core.search.SearchMatch;
>+import org.eclipse.jdt.core.search.SearchPattern;
>+
>+// The size of JavaSearchBugsTests.java is very big, Hence continuing here.
>+public class JavaSearchBugsTests2 extends AbstractJavaSearchTests {
>+
>+	public JavaSearchBugsTests2(String name) {
>+		super(name);
>+		this.endChar = "";
>+	}
>+	
>+	static {
>+		//TESTS_NAMES = new String[] {"testBug123836"};
>+	}
>+
>+	public static Test suite() {
>+		return buildModelTestSuite(JavaSearchBugsTests2.class);
>+	}
>+
>+	class TestCollector extends JavaSearchResultCollector {
>+		public List matches = new ArrayList();
>+
>+		public void acceptSearchMatch(SearchMatch searchMatch) throws CoreException {
>+			super.acceptSearchMatch(searchMatch);
>+			this.matches.add(searchMatch);
>+		}
>+	}
>+
>+	protected void setUp() throws Exception {
>+		super.setUp();
>+		this.resultCollector = new TestCollector();
>+		this.resultCollector.showAccuracy(true);
>+	}
>+
>+	/**
>+	 * Test that missing types in the class shouldn't impact the search of a type in an inner class
>+	 */
>+	public void testBug362633() throws CoreException, IOException {
>+		try {
>+			IJavaProject p = createJavaProject("P", new String[] {}, new String[] { "/P/lib325418.jar", "JCL15_LIB" }, "", "1.5");
>+			org.eclipse.jdt.core.tests.util.Util.createJar(new String[] {
>+					"p325418M/Missing.java",
>+					"package p325418M;\n" + 
>+					"public class Missing{}\n" }, 
>+					p.getProject().getLocation().append("lib325418M.jar").toOSString(), "1.5");
>+			
>+			org.eclipse.jdt.core.tests.util.Util.createJar(
>+							new String[] {
>+							"p325418/Test.java",
>+							"package p325418;\n" +
>+							"public class Test{\n" +
>+							"	public void foo(p325418M.Missing a) {}\n" +
>+							"	public <T> T foo(int a) {\n" +
>+							 "		return new Inner<T>() {T  run() {  return null;  }}.run();\n" +
>+							 "	}\n" + "}\n",
>+							"p325418/Inner.java",
>+							"package p325418;\n" +
>+							"abstract class Inner <T> {\n" +
>+							"	 abstract T run();\n" + "}\n" },
>+							null,
>+							p.getProject().getLocation().append("lib325418.jar").toOSString(),
>+							new String[] { p.getProject().getLocation().append("lib325418M.jar").toOSString() },
>+							"1.5");
>+			refresh(p);
>+			int mask = IJavaSearchScope.APPLICATION_LIBRARIES | IJavaSearchScope.SOURCES;
>+			IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] { p }, mask);
>+			search("Inner.run()", IJavaSearchConstants.METHOD, IJavaSearchConstants.DECLARATIONS, scope, this.resultCollector);
>+			assertSearchResults(
>+					"Unexpected search results!",
>+					"lib325418.jar T p325418.Inner.run() [No source] EXACT_MATCH\n" +
>+					"lib325418.jar T p325418.<anonymous>.run() [No source] EXACT_MATCH",
>+					this.resultCollector);
>+		} finally {
>+			deleteProject("P");
>+		}
>+	}
>+	
>+	/**
>+	 * @bug 123836: [1.5][search] for references to overriding method with bound type variable is not polymorphic
>+	 * @test Search for references to an overridden method with bound variables should yield.
>+	 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=123836"
>+	 */
>+	public void testBug123836a() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Sub.java", 
>+					"abstract class Sup<C> {\n" +
>+					"    protected void m(C classifier) {}\n"+
>+					"    public void use(C owner) { m (owner); }\n" +
>+					"}\n" +
>+					"public class Sub extends Sup<String>{\n" +
>+					"    @Override\n"+
>+					"    protected void m(String classifier) {}\n"+
>+					"}\n");
>+			IType type = getCompilationUnit("/P/Sub.java").getType("Sub");
>+			IMethod method = type.getMethod("m", new String[]{"QString;"});
>+			search(method, REFERENCES, EXACT_RULE, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("Sub.java void Sup.use(C) [m (owner)] EXACT_MATCH");
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+	// Search for a non-overriden method with same name as which could have been overriden should
>+	// not have results
>+	public void testBug123836b() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Sub.java", 
>+					"abstract class Sup<C> {\n" +
>+					"    protected void m(C classifier) {}\n"+
>+					"    public void use(C owner) { m (owner); }\n" +
>+					"}\n" +
>+					"public class Sub extends Sup<String>{\n" +
>+					"    @Override\n"+
>+					"    protected void m(String classifier) {}\n"+
>+					"    protected void m(Sub classifier) {}\n"+
>+					"}\n" );
>+			// search
>+			IType type = getCompilationUnit("/P/Sub.java").getType("Sub");
>+			IMethod method = type.getMethod("m", new String[]{"QSub;"});
>+			search(method, REFERENCES, EXACT_RULE, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("");
>+			
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+	// another variant of the testcase
>+	public void testBug123836c() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			// create the common project and create an interface
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Test.java", 
>+				"class Test {\n"+
>+				"    void calc(Property prop, Property<? extends Serializable> p2) {\n"+
>+				"        prop.compute(null);\n"+
>+				"        p2.compute(null);\n"+
>+				"    }\n"+
>+				"}\n"+
>+				"abstract class Property<E> {\n"+
>+				"    public abstract void compute(E e);\n"+
>+				"}\n"+
>+				"class StringProperty extends Property<String> {\n"+
>+				"    @Override public void compute(String e) {\n"+
>+				"        System.out.println(e);\n"+
>+				"    }");
>+			IType type = getCompilationUnit("/P/Test.java").getType("StringProperty");
>+			IMethod method = type.getMethod("compute", new String[]{"QString;"});
>+			search(method, REFERENCES, EXACT_RULE, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH\n" + 
>+								"Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH");
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+	// Test inner class
>+	public void testBug123836d() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			// create the common project and create an interface
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Test.java", 
>+				"class Test {\n"+
>+				"    void calc(Property prop, Property<? extends Serializable> p2) {\n"+
>+				"        prop.compute(null);\n"+
>+				"        p2.compute(null);\n"+
>+				"    }\n"+
>+				"	class StringProperty extends Property<String> {\n"+
>+				"    @Override public void compute(String e) {\n"+
>+				"        System.out.println(e);\n"+
>+				"    }\n"+
>+				"}\n"+
>+				"abstract class Property<E> {\n"+
>+				"    public abstract void compute(E e);\n"+
>+				"}");
>+				
>+			IType type = getCompilationUnit("/P/Test.java").getType("Test").getType("StringProperty");
>+			IMethod method = type.getMethod("compute", new String[]{"QString;"});
>+			search(method, REFERENCES, EXACT_RULE, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH\n" + 
>+								"Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH");
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+	// Test local class
>+	public void testBug123836e() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			// create the common project and create an interface
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Test.java", 
>+				"class Test {\n"+
>+				"    void calc(Property prop, Property<? extends Serializable> p2) {\n"+
>+				"        prop.compute(null);\n"+
>+				"        p2.compute(null);\n"+
>+				"		class StringProperty extends Property<String> {\n"+
>+				"   		@Override public void compute(String e) {\n"+
>+				"        		System.out.println(e);\n"+
>+				"    		}\n"+
>+				"		}\n"+
>+				"    }\n"+
>+				"}\n"+
>+				"abstract class Property<E> {\n"+
>+				"    public abstract void compute(E e);\n"+
>+				"}");
>+			IMethod method = selectMethod(getCompilationUnit("/P/Test.java"), "compute", 3);
>+			search(method, REFERENCES, EXACT_RULE, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH\n" + 
>+								"Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH");
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+	// test inner class
>+	public void testBug123836f() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			// create the common project and create an interface
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Test.java", 
>+				"class Test {\n"+
>+				"    void calc(Property prop, Property<? extends Serializable> p2) {\n"+
>+				"        prop.compute(null);\n"+
>+				"        p2.compute(null);\n"+
>+				"		 new Property<String>() {\n"+
>+				"   		@Override public void compute(String e) {\n"+
>+				"        		System.out.println(e);\n"+
>+				"    		}\n"+
>+				"		};\n"+
>+				"    }\n"+
>+				"}\n"+
>+				"abstract class Property<E> {\n"+
>+				"    public abstract void compute(E e);\n"+
>+				"}");
>+			IMethod method = selectMethod(getCompilationUnit("/P/Test.java"), "compute", 3);
>+			search(method, REFERENCES, EXACT_RULE, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH\n" + 
>+								"Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH");
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+	// test in initializer block
>+	public void testBug123836g() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			// create the common project and create an interface
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Test.java", 
>+				"class Test {\n"+
>+				"	{\n" +
>+				"		new Property<String>() {\n" +
>+				"			@Override public void compute(String e) {}\n" +
>+				"		};\n"+
>+				"	 }\n"+
>+				"	void calc(Property prop, Property<? extends Serializable> p2) {\n"+
>+				"		prop.compute(null);\n"+
>+				"		p2.compute(null);\n"+
>+				"	}\n"+
>+				"}\n"+
>+				"abstract class Property<E> {\n"+
>+				"	public abstract void compute(E e);\n"+
>+				"}");
>+			IMethod method = selectMethod(getCompilationUnit("/P/Test.java"), "compute", 1);
>+			search(method, REFERENCES, EXACT_RULE, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH\n" + 
>+								"Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH");
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+	// test in static initializer
>+	public void testBug123836h() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			// create the common project and create an interface
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Test.java", 
>+				"class Test {\n"+
>+				"	static {\n" +
>+				"		new Property<String>() {\n" +
>+				"			@Override public void compute(String e) {}\n" +
>+				"		};\n"+
>+				"	 }\n"+
>+				"	void calc(Property prop, Property<? extends Serializable> p2) {\n"+
>+				"		prop.compute(null);\n"+
>+				"		p2.compute(null);\n"+
>+				"	}\n"+
>+				"}\n"+
>+				"abstract class Property<E> {\n"+
>+				"	public abstract void compute(E e);\n"+
>+				"}");
>+			IMethod method = selectMethod(getCompilationUnit("/P/Test.java"), "compute", 1);
>+			search(method, REFERENCES, EXACT_RULE, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH\n" + 
>+								"Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH");
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+	// test in static initializer
>+	public void testBug123836i() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			// create the common project and create an interface
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Test.java", 
>+				"class Test {\n"+
>+				"	Property <?>p = new Property<String>() {\n" +
>+				"			@Override public void compute(String e) {}\n" +
>+				"		};\n"+
>+				"	void calc(Property prop, Property<? extends Serializable> p2) {\n"+
>+				"		prop.compute(null);\n"+
>+				"		p2.compute(null);\n"+
>+				"	}\n"+
>+				"}\n"+
>+				"abstract class Property<E> {\n"+
>+				"	public abstract void compute(E e);\n"+
>+				"}");
>+			IMethod method = selectMethod(getCompilationUnit("/P/Test.java"), "compute", 1);
>+			search(method, REFERENCES, EXACT_RULE, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH\n" + 
>+								"Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH");
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+	public void testBug123836j() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			// create the common project and create an interface
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Test.java", 
>+				"class Test {\n"+
>+				"    void calc(Property prop, Property<? extends Serializable> p2) {\n"+
>+				"        prop.compute(null);\n"+
>+				"        p2.compute(null);\n"+
>+				"    }\n"+
>+				"}\n"+
>+				"abstract class Property<E> {\n"+
>+				"    public abstract void compute(E e);\n"+
>+				"}\n"+
>+				"class StringProperty extends Property<String> {\n"+
>+				"	@Override public void compute(String e) {\n"+
>+				"		 new Property<String>() {\n"+
>+				"			@Override public void compute(String e) {\n"+
>+				"				new Property<String>() {\n"+
>+				"					@Override public void compute(String e) {}\n"+
>+				"				};\n"+
>+				"			}\n"+
>+				"		};\n"+
>+				"	}\n"+
>+				"}");
>+			IMethod method = selectMethod(getCompilationUnit("/P/Test.java"), "compute", 6);
>+			search(method, REFERENCES, EXACT_RULE, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH\n" + 
>+								"Test.java void Test.calc(Property, Property<? extends Serializable>) [compute(null)] EXACT_MATCH");
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+	// test search of name
>+	public void _testBug123836g1() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			// create the common project and create an interface
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Sub.java", 
>+					"abstract class Sup<C> {\n" +
>+					"    protected void m(C classifier) {}\n"+
>+					"    public void use(C owner) { m (owner); }\n" +
>+					"}\n" +
>+					"public class Sub extends Sup<String>{\n" +
>+					"    @Override\n"+
>+					"    protected void m(String classifier) {}\n"+
>+					"    protected void m(Sub classifier) {}\n"+
>+					"}\n" );
>+			waitUntilIndexesReady();
>+			// search
>+			SearchPattern pattern = SearchPattern.createPattern("Sub.m(String)", METHOD, REFERENCES, EXACT_RULE);
>+			search(pattern, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("Sub.java void Sup.use(C) [m (owner)] EXACT_MATCH");
>+			
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+	// test search of name (negative)
>+	public void _testBug123836h1() throws CoreException {
>+		IJavaProject project = null;
>+		try
>+		{
>+			// create the common project and create an interface
>+			project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "","1.5");	
>+			createFile("/P/Sub.java", 
>+					"abstract class Sup<C> {\n" +
>+					"    protected void m(C classifier) {}\n"+
>+					"    public void use(C owner) { m (owner); }\n" +
>+					"}\n" +
>+					"public class Sub extends Sup<String>{\n" +
>+					"    @Override\n"+
>+					"    protected void m(String classifier) {}\n"+
>+					"    protected void m(Sub classifier) {}\n"+
>+					"}\n" );
>+			// search
>+			SearchPattern pattern = SearchPattern.createPattern("Sub.m(Sub)", METHOD, REFERENCES, EXACT_RULE);
>+			search(pattern, SearchEngine.createWorkspaceScope(), this.resultCollector);
>+			assertSearchResults("");
>+			
>+		} finally {
>+			deleteProject(project);
>+		}
>+	}
>+
>+	/**
>+	 * @bug 342393: Anonymous class' occurrence count is incorrect when two methods in a class have the same name.
>+	 * @test Search for Enumerators with anonymous types
>+	 *
>+	 * @throws CoreException
>+	 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=342393"
>+	 */
>+	public void testBug342393() throws CoreException {
>+		try {
>+			IJavaProject project = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB"}, "bin", "1.5");
>+			String content = "package b342393;\n" + "class Generic {\n"
>+					+ "enum A {\n" + "ONE {\n" + "A getSquare() {\n"
>+					+ "return ONE;\n" + "}\n" + "},\n" + "TWO {\n"
>+					+ "A getSquare() {\n" + "return TWO;\n" + "}\n" + "};\n"
>+					+ "abstract A getSquare();\n" + "}\n" + "}";
>+			createFolder("/P/b342393");
>+			createFile("/P/b342393/Generic.java", content);
>+			IJavaSearchScope scope = SearchEngine. createJavaSearchScope(
>+					new IJavaElement[] { project }, IJavaSearchScope.SOURCES);
>+			search("getSquare", METHOD, DECLARATIONS, EXACT_RULE, scope, this.resultCollector);
>+			assertSearchResults("b342393/Generic.java A b342393.Generic$A.ONE:<anonymous>#1.getSquare() [getSquare] EXACT_MATCH\n" + 
>+					"b342393/Generic.java A b342393.Generic$A.TWO:<anonymous>#1.getSquare() [getSquare] EXACT_MATCH\n" + 
>+					"b342393/Generic.java A b342393.Generic$A.getSquare() [getSquare] EXACT_MATCH");
>+		} finally {
>+			deleteProject("P");
>+		}
>+	}
>+}
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchScopeTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchScopeTests.java
>index deb70fd..52af315 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchScopeTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchScopeTests.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -1025,7 +1025,7 @@
> 
> 		// Index the output location as it is a library for the project
> 		IndexManager indexManager = JavaModelManager.getIndexManager();
>-		indexManager.indexLibrary(new Path("/P1/bin"), project.getProject());
>+		indexManager.indexLibrary(new Path("/P1/bin"), project.getProject(), null);
> 		waitUntilIndexesReady();
> 
> 		// Search for all types
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java
>index 923d153..316b1c7 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -2168,8 +2168,8 @@
> 		search("MissingFieldType.*", FIELD, DECLARATIONS,  getJavaSearchScope());
> 		assertSearchResults(
> 			"AbortCompilation.jar AbortCompilation.MissingFieldType.field [No source] EXACT_MATCH\n" +
>-			"AbortCompilation.jar AbortCompilation.MissingFieldType.otherField [No source] EXACT_MATCH\n" +
>-			"AbortCompilation.jar AbortCompilation.MissingFieldType.missing [No source] POTENTIAL_MATCH"
>+			"AbortCompilation.jar AbortCompilation.MissingFieldType.missing [No source] EXACT_MATCH\n" +
>+			"AbortCompilation.jar AbortCompilation.MissingFieldType.otherField [No source] EXACT_MATCH"
> 		);
> 	} finally {
> 		// reset classpath
>@@ -2229,8 +2229,8 @@
> 		search("MissingArgumentType.foo*", METHOD, DECLARATIONS, getJavaSearchScope());
> 		assertSearchResults(
> 			"AbortCompilation.jar void AbortCompilation.MissingArgumentType.foo() [No source] EXACT_MATCH\n" +
>-			"AbortCompilation.jar void AbortCompilation.MissingArgumentType.foo2() [No source] EXACT_MATCH\n" +
>-			"AbortCompilation.jar void AbortCompilation.MissingArgumentType.foo(java.util.EventListener) [No source] POTENTIAL_MATCH"
>+			"AbortCompilation.jar void AbortCompilation.MissingArgumentType.foo(java.util.EventListener) [No source] EXACT_MATCH\n" +
>+			"AbortCompilation.jar void AbortCompilation.MissingArgumentType.foo2() [No source] EXACT_MATCH"		
> 		);
> 	} finally {
> 		// reset classpath
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/NullAnnotationModelTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/NullAnnotationModelTests.java
>new file mode 100644
>index 0000000..82e5422
>--- /dev/null
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/NullAnnotationModelTests.java
>@@ -0,0 +1,489 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 GK Software AG and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Stephan Herrmann - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.core.tests.model;
>+
>+import java.io.File;
>+import java.io.IOException;
>+import java.io.ByteArrayInputStream;
>+import java.net.URL;
>+import java.util.Hashtable;
>+import java.util.List;
>+
>+import junit.framework.Test;
>+
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IMarker;
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.resources.IncrementalProjectBuilder;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.FileLocator;
>+import org.eclipse.core.runtime.Platform;
>+import org.eclipse.jdt.core.ICompilationUnit;
>+import org.eclipse.jdt.core.IJavaModelMarker;
>+import org.eclipse.jdt.core.IJavaProject;
>+import org.eclipse.jdt.core.JavaCore;
>+import org.eclipse.jdt.core.compiler.IProblem;
>+import org.eclipse.jdt.core.dom.AST;
>+import org.eclipse.jdt.core.dom.ASTParser;
>+import org.eclipse.jdt.core.dom.CompilationUnit;
>+import org.eclipse.jdt.core.dom.MarkerAnnotation;
>+import org.eclipse.jdt.core.dom.MethodDeclaration;
>+import org.eclipse.jdt.core.dom.Modifier;
>+import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
>+import org.eclipse.jdt.core.dom.TypeDeclaration;
>+
>+public class NullAnnotationModelTests extends ReconcilerTests {
>+
>+	String ANNOTATION_LIB;
>+
>+	public static Test suite() {
>+		return buildModelTestSuite(NullAnnotationModelTests.class);
>+	}
>+
>+	public NullAnnotationModelTests(String name) {
>+		super(name);
>+	}
>+
>+	static {
>+//		TESTS_NAMES = new String[] { "testMissingAnnotation5" };
>+	}
>+
>+	public void setUp() throws Exception {
>+		super.setUp();
>+		File bundleFile = FileLocator.getBundleFile(Platform.getBundle("org.eclipse.jdt.annotation"));
>+		this.ANNOTATION_LIB = bundleFile.isDirectory() ? bundleFile.getPath()+"/bin" : bundleFile.getPath();
>+	}
>+
>+	protected String testJarPath(String jarName) throws IOException {
>+		URL libEntry = Platform.getBundle("org.eclipse.jdt.core.tests.model").getEntry("/workspace/NullAnnotations/lib/"+jarName);
>+		return FileLocator.toFileURL(libEntry).getPath();
>+	}
>+
>+	// DISABLED due to dysfunctional global default after Bug 366063 - Compiler should not add synthetic @NonNull annotations
>+	public void _testConvertedSourceType1() throws CoreException, InterruptedException {
>+    	try {
>+			// Resources creation
>+			IJavaProject p = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB", this.ANNOTATION_LIB}, "bin", "1.5");
>+			p.setOption(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS, JavaCore.ENABLED);
>+			p.setOption(JavaCore.COMPILER_NONNULL_IS_DEFAULT, JavaCore.ENABLED);
>+
>+			this.createFolder("/P/p1");
>+			String c1SourceString =
>+				"package p1;\n" +
>+				"import org.eclipse.jdt.annotation.*;\n" +
>+				"public class C1 {\n" +
>+				"	 public String foo(@Nullable Object arg) {\n" + // this is consumed via SourceTypeConverter
>+				"		return arg == null ? \"\" : arg.toString();\n" +
>+				"	 }\n" +
>+				"}\n";
>+			this.createFile(
>+				"/P/p1/C1.java",
>+	    			c1SourceString);
>+
>+			this.createFolder("/P/p2");
>+			String c2SourceString =
>+				"package p2;\n" +
>+				"public class C2 {\n" +
>+				"	 String bar(p1.C1 c, C2 c2) {;\n" +
>+				"        return c.foo(null);\n" + // don't complain despite default nonnull, foo has explicit @Nullable
>+				"    }\n" +
>+				"	 String foo(Object arg) {\n" +
>+				"		return arg == null ? null : arg.toString();\n" +
>+				"	 }\n" +
>+				"}\n";
>+			this.createFile(
>+				"/P/p2/C2.java",
>+	    			c2SourceString);
>+
>+			char[] c2SourceChars = c2SourceString.toCharArray();
>+			this.problemRequestor.initialize(c2SourceChars);
>+
>+			getCompilationUnit("/P/p2/C2.java").getWorkingCopy(this.wcOwner, null);
>+
>+			assertProblems("Unexpected problems", "----------\n" +
>+					"1. WARNING in /P/p2/C2.java (at line 7)\n" +
>+					"	return arg == null ? null : arg.toString();\n" +
>+					"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
>+					"Potential type mismatch: required \'@NonNull String\' but nullness of the provided value is unknown\n" +
>+					"----------\n");
>+    	} finally {
>+    		deleteProject("P");
>+    	}
>+    }
>+
>+	// DISABLED due to dysfunctional global default after Bug 366063 - Compiler should not add synthetic @NonNull annotations
>+	public void _testBinaryType1() throws CoreException, InterruptedException, IOException {
>+    	try {
>+			// Resources creation
>+			IJavaProject p = createJavaProject("P", new String[] {""},
>+											   new String[] {"JCL15_LIB", this.ANNOTATION_LIB, testJarPath("example.jar")},
>+											   "bin", "1.5");
>+			p.setOption(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS, JavaCore.ENABLED);
>+			p.setOption(JavaCore.COMPILER_NONNULL_IS_DEFAULT, JavaCore.ENABLED);
>+
>+			// example.jar contains p1/C1.java just like testConvertedSourceType1()
>+
>+			this.createFolder("/P/p2");
>+			String c2SourceString =
>+				"package p2;\n" +
>+				"public class C2 {\n" +
>+				"	 String bar(p1.C1 c) {;\n" +
>+				"        return c.foo(null);\n" + // don't complain despite default nonnull, foo has explicit @Nullable
>+				"    }\n" +
>+				"	 String foo(Object arg) {\n" +
>+				"		return arg == null ? null : arg.toString();\n" +
>+				"	 }\n" +
>+				"}\n";
>+			this.createFile(
>+				"/P/p2/C2.java",
>+	    			c2SourceString);
>+
>+			char[] c2SourceChars = c2SourceString.toCharArray();
>+			this.problemRequestor.initialize(c2SourceChars);
>+
>+			getCompilationUnit("/P/p2/C2.java").getWorkingCopy(this.wcOwner, null);
>+
>+			assertProblems("Unexpected problems", "----------\n" +
>+					"1. WARNING in /P/p2/C2.java (at line 7)\n" +
>+					"	return arg == null ? null : arg.toString();\n" +
>+					"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
>+					"Potential type mismatch: required \'@NonNull String\' but nullness of the provided value is unknown\n" +
>+					"----------\n");
>+    	} finally {
>+    		deleteProject("P");
>+    	}
>+    }
>+
>+	// DISABLED: no longer a problem since bug 365531 - [compiler][null] investigate alternative strategy for internally encoding nullness defaults
>+	public void _testMissingAnnotation1() throws CoreException {
>+    	try {
>+			// Resources creation
>+			IJavaProject p = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB", this.ANNOTATION_LIB}, "bin", "1.5");
>+			p.setOption(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS, JavaCore.ENABLED);
>+			p.setOption(JavaCore.COMPILER_NONNULL_ANNOTATION_NAME, "in.valid");
>+
>+			this.createFolder("/P/p1");
>+			String c1SourceString =
>+				"package p1;\n" +
>+				"@org.eclipse.jdt.annotation.NonNullByDefault\n" +
>+				"public class C1 {\n" +
>+				"	 public String foo(Object arg) {\n" +
>+				"		return arg == null ? \"\" : arg.toString();\n" +
>+				"	 }\n" +
>+				"}\n";
>+			this.createFile(
>+				"/P/p1/C1.java",
>+	    			c1SourceString);
>+
>+			this.problemRequestor.initialize(c1SourceString.toCharArray());
>+
>+			getCompilationUnit("/P/p1/C1.java").getWorkingCopy(this.wcOwner, null);
>+
>+			assertProblems("Unexpected problems",
>+					"----------\n" +
>+					"1. ERROR in /P/p1/C1.java (at line 1)\n" +
>+					"	package p1;\n" +
>+					"	^\n" +
>+					"Buildpath problem: the type in.valid, which is configured as a null annotation type, cannot be resolved\n" +
>+					"----------\n");
>+    	} finally {
>+    		deleteProject("P");
>+    	}
>+	}
>+
>+	// DISABLED: no longer a problem since bug 365531 - [compiler][null] investigate alternative strategy for internally encoding nullness defaults
>+	public void _testMissingAnnotation2() throws CoreException {
>+		Hashtable javaOptions = JavaCore.getOptions();
>+    	try {
>+			// Resources creation
>+			IJavaProject p = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB", this.ANNOTATION_LIB}, "bin", "1.5");
>+			IFile settings = (IFile) p.getProject().findMember(".settings/org.eclipse.jdt.core.prefs");
>+			settings.appendContents(new ByteArrayInputStream("\norg.eclipse.jdt.core.compiler.annotation.nonnull=not.valid\n".getBytes()), 0, null);
>+			p.setOption(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS, JavaCore.ENABLED);
>+
>+			this.createFolder("/P/p1");
>+			String c1SourceString =
>+				"package p1;\n" +
>+				"@org.eclipse.jdt.annotation.NonNullByDefault\n" +
>+				"public class C1 {\n" +
>+				"	 public String foo(Object arg) {\n" +
>+				"		return arg == null ? \"\" : arg.toString();\n" +
>+				"	 }\n" +
>+				"}\n";
>+			this.createFile(
>+				"/P/p1/C1.java",
>+	    			c1SourceString);
>+
>+			this.problemRequestor.initialize(c1SourceString.toCharArray());
>+
>+			getCompilationUnit("/P/p1/C1.java").getWorkingCopy(this.wcOwner, null);
>+
>+			assertProblems("Unexpected problems",
>+					"----------\n" +
>+					"1. ERROR in /P/p1/C1.java (at line 1)\n" +
>+					"	package p1;\n" +
>+					"	^\n" +
>+					"Buildpath problem: the type not.valid, which is configured as a null annotation type, cannot be resolved\n" +
>+					"----------\n");
>+    	} finally {
>+    		deleteProject("P");
>+    		JavaCore.setOptions(javaOptions);
>+    		// work against side-effect of JavaRuntime listening to change of prefs-file.
>+    		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=302850#c25
>+    	}
>+	}
>+
>+	// Bug 363858 - [dom] early throwing of AbortCompilation causes NPE in CompilationUnitResolver
>+	// currently not actually challenging the NPE, because we no longer report
>+	// "Cannot use the unqualified name \'invalid\' as an annotation name for null specification"
>+	// DISABLED: no longer a problem since bug 365531 - [compiler][null] investigate alternative strategy for internally encoding nullness defaults
>+	public void _testMissingAnnotation3() throws CoreException {
>+    	try {
>+			// Resources creation
>+			IJavaProject p = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB", this.ANNOTATION_LIB}, "bin", "1.5");
>+			p.setOption(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS, JavaCore.ENABLED);
>+			p.setOption(JavaCore.COMPILER_NONNULL_ANNOTATION_NAME, "invalid");
>+
>+			this.createFolder("/P/p1");
>+			String c1SourceString =
>+				"package p1;\n" +
>+				"@org.eclipse.jdt.annotation.NonNullByDefault\n" +
>+				"public class C1 {\n" +
>+				"	 public String foo(Object arg) {\n" +
>+				"		return arg == null ? \"\" : arg.toString();\n" +
>+				"	 }\n" +
>+				"}\n";
>+			this.createFile(
>+				"/P/p1/C1.java",
>+	    			c1SourceString);
>+
>+			this.problemRequestor.initialize(c1SourceString.toCharArray());
>+
>+			final ICompilationUnit unit = getCompilationUnit("/P/p1/C1.java").getWorkingCopy(this.wcOwner, null);
>+			assertProblems("Unexpected problems",
>+					"----------\n" +
>+					"1. ERROR in /P/p1/C1.java (at line 1)\n" +
>+					"	package p1;\n" +
>+					"	^\n" +
>+					"Buildpath problem: the type invalid, which is configured as a null annotation type, cannot be resolved\n" +
>+					"----------\n");
>+
>+			ASTParser parser = ASTParser.newParser(AST.JLS4);
>+			parser.setProject(p);
>+			parser.setResolveBindings(true);
>+			parser.setSource(unit);
>+			CompilationUnit ast = (CompilationUnit) parser.createAST(null);
>+			assertNotNull("ast should not be null", ast);
>+			this.problemRequestor.reset();
>+			this.problemRequestor.beginReporting();
>+			IProblem[] problems = ast.getProblems();
>+			for (int i=0; i<problems.length; i++)
>+				this.problemRequestor.acceptProblem(problems[i]);
>+			assertProblems("Unexpected problems (2)",
>+					"----------\n" +
>+					"1. ERROR in /P/p1/C1.java (at line 1)\n" +
>+					"	package p1;\n" +
>+					"	^\n" +
>+					"Buildpath problem: the type invalid, which is configured as a null annotation type, cannot be resolved\n" +
>+					"----------\n");
>+    	} finally {
>+    		deleteProject("P");
>+    	}
>+	}
>+
>+	// initialization of null annotations is triggered from package-info.java: illegal simple name
>+	public void testMissingAnnotation4() throws CoreException, InterruptedException {
>+    	try {
>+			// Resources creation
>+			IJavaProject p = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB", this.ANNOTATION_LIB}, "bin", "1.5");
>+			p.setOption(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS, JavaCore.ENABLED);
>+			p.setOption(JavaCore.COMPILER_NONNULL_ANNOTATION_NAME, "invalid");
>+
>+			this.createFolder("/P/p1");
>+			String piSourceString =
>+				"@org.eclipse.jdt.annotation.NonNullByDefault\n" +
>+				"package p1;\n";
>+			this.createFile(
>+				"/P/p1/package-info.java",
>+	    			piSourceString);
>+
>+			this.problemRequestor.initialize(piSourceString.toCharArray());
>+
>+			// Challenge CompilationUnitProblemFinder:
>+			final ICompilationUnit unit = getCompilationUnit("/P/p1/package-info.java").getWorkingCopy(this.wcOwner, null);
>+// This error is not raised currently:
>+//			String expectedError = "----------\n" +
>+//								   "1. ERROR in /P/p1/package-info.java (at line 0)\n" +
>+//								   "	@org.eclipse.jdt.annotation.NonNullByDefault\n" +
>+//								   "	^\n" +
>+//								   "Cannot use the unqualified name \'invalid\' as an annotation name for null specification\n" +
>+//								   "----------\n";
>+//			assertProblems("Unexpected problems from CompilationUnitProblemFinder", expectedError);
>+			assertNoProblem(unit.getBuffer().getCharacters(), unit);
>+
>+			// Challenge JavaBuilder:
>+			p.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
>+			IMarker[] markers = p.getProject().findMarkers(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
>+//			assertMarkers("Unexpected markers",
>+//					"Cannot use the unqualified name 'invalid' as an annotation name for null specification",
>+//					markers);
>+//			assertEquals("Unexpected marker path", "/P", markers[0].getResource().getFullPath().toString());
>+			assertEquals("Should have no markers", 0, markers.length);
>+
>+			// Challenge CompilationUnitResolver:
>+			ASTParser parser = ASTParser.newParser(AST.JLS4);
>+			parser.setProject(p);
>+			parser.setResolveBindings(true);
>+			parser.setSource(unit);
>+			CompilationUnit ast = (CompilationUnit) parser.createAST(null);
>+			assertNotNull("ast should not be null", ast);
>+//			this.problemRequestor.reset();
>+//			this.problemRequestor.beginReporting();
>+//			IProblem[] problems = ast.getProblems();
>+//			for (int i=0; i<problems.length; i++)
>+//				this.problemRequestor.acceptProblem(problems[i]);
>+//			assertProblems("Unexpected problems from CompilationUnitResolver", expectedError);
>+			assertEquals("Should have no problems", 0, ast.getProblems().length);
>+    	} finally {
>+    		deleteProject("P");
>+    	}
>+	}
>+
>+	// initialization of null annotations is
>+	// - triggered from resolveTypesFor(MethodBinding)
>+	// - default is defined in package-info.java:
>+	// must detect missing non-null annotation and report against the project
>+	// DISABLED: no longer a problem since bug 365531 - [compiler][null] investigate alternative strategy for internally encoding nullness defaults
>+	public void _testMissingAnnotation5() throws CoreException, InterruptedException {
>+    	try {
>+			// Resources creation
>+			IJavaProject p = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB", this.ANNOTATION_LIB}, "bin", "1.5");
>+			p.setOption(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS, JavaCore.ENABLED);
>+			p.setOption(JavaCore.COMPILER_NONNULL_ANNOTATION_NAME, "pack.Missing");
>+
>+			this.createFolder("/P/p1");
>+			String piSourceString =
>+				"@org.eclipse.jdt.annotation.NonNullByDefault\n" +
>+				"package p1;\n";
>+			this.createFile("/P/p1/package-info.java", piSourceString);
>+
>+			String c1SourceString =
>+				"package p1;\n" +
>+				"public class C1 {\n" +
>+				"    String foo(String arg) { return arg; }\n" +
>+				"}\n";
>+			this.createFile("/P/p1/C1.java", c1SourceString);
>+
>+			this.problemRequestor.initialize(piSourceString.toCharArray());
>+
>+			// Challenge CompilationUnitProblemFinder:
>+			assertNoProblem(piSourceString.toCharArray(), getCompilationUnit("/P/p1/package-info.java"));
>+
>+			this.problemRequestor.initialize(c1SourceString.toCharArray());
>+
>+			// Challenge CompilationUnitProblemFinder:
>+			ICompilationUnit unit = getCompilationUnit("/P/p1/C1.java").getWorkingCopy(this.wcOwner, null);
>+			String expectedError = "----------\n" +
>+								   "1. ERROR in /P/p1/C1.java (at line 1)\n" +
>+								   "	package p1;\n" +
>+								   "	^\n" +
>+								   "Buildpath problem: the type pack.Missing, which is configured as a null annotation type, cannot be resolved\n" +
>+								   "----------\n";
>+			assertProblems("Unexpected problems", expectedError);
>+
>+			// Challenge JavaBuilder:
>+			p.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
>+			IMarker[] markers = p.getProject().findMarkers(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
>+			assertMarkers("Unexpected markers",
>+					"Buildpath problem: the type pack.Missing, which is configured as a null annotation type, cannot be resolved",
>+					markers);
>+// toggle expectation depending on how CAT_BUILDPATH problems are reported (see AbstractImageBuilder.storeProblemsFor(..))
>+//			assertEquals("Unexpected marker path", "/P", markers[0].getResource().getFullPath().toString());
>+			assertEquals("Unexpected marker path", "/P/p1/C1.java", markers[0].getResource().getFullPath().toString());
>+
>+			// Challenge CompilationUnitResolver:
>+			ASTParser parser = ASTParser.newParser(AST.JLS4);
>+			parser.setProject(p);
>+			parser.setResolveBindings(true);
>+			parser.setSource(unit);
>+			CompilationUnit ast = (CompilationUnit) parser.createAST(null);
>+			assertNotNull("ast should not be null", ast);
>+			this.problemRequestor.reset();
>+			this.problemRequestor.beginReporting();
>+			IProblem[] problems = ast.getProblems();
>+			for (int i=0; i<problems.length; i++)
>+				this.problemRequestor.acceptProblem(problems[i]);
>+			assertProblems("Unexpected problems (2)", expectedError);
>+    	} finally {
>+    		deleteProject("P");
>+    	}
>+	}
>+
>+	// A synthetic annotation from a default should not be converted to DOM AST
>+	public void testAnnotationAST1() throws CoreException, InterruptedException {
>+    	try {
>+			// Resources creation
>+			IJavaProject p = createJavaProject("P", new String[] {""}, new String[] {"JCL15_LIB", this.ANNOTATION_LIB}, "bin", "1.5");
>+			p.setOption(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS, JavaCore.ENABLED);
>+
>+			this.createFolder("/P/p1");
>+			// bug could only be triggered if ASTConvert actually finds a '@'
>+			// so in addition to the synthetic annotation there must also be a real one:
>+			String annotSourceString =
>+				"package p1;\n" +
>+				"import java.lang.annotation.ElementType;\n" + 
>+				"import java.lang.annotation.Target;\n" + 
>+				"@Target({ElementType.PARAMETER,ElementType.METHOD})\n" +
>+				"public @interface Annot {}\n";
>+			this.createFile(
>+				"/P/p1/Annot.java",
>+	    			annotSourceString);
>+			String c1SourceString =
>+				"package p1;\n" +
>+				"@org.eclipse.jdt.annotation.NonNullByDefault\n" +
>+				"public class C1 {\n" +
>+				"	 public @Annot Object foo(@Annot Object arg) {\n" +
>+				"         return this;\n" +
>+				"	 }\n" +
>+				"}\n";
>+			this.createFile(
>+				"/P/p1/C1.java",
>+	    			c1SourceString);
>+
>+			this.problemRequestor.initialize(c1SourceString.toCharArray());
>+
>+			final ICompilationUnit unit = getCompilationUnit("/P/p1/C1.java").getWorkingCopy(this.wcOwner, null);
>+			assertNoProblem(c1SourceString.toCharArray(), unit);
>+
>+			ASTParser parser = ASTParser.newParser(AST.JLS4);
>+			parser.setProject(p);
>+			parser.setResolveBindings(true);
>+			parser.setSource(unit);
>+			CompilationUnit ast = (CompilationUnit) parser.createAST(null);
>+			assertNotNull("ast should not be null", ast);
>+			TypeDeclaration type = (TypeDeclaration) ast.types().get(0);
>+			assertNotNull("type should not be null", type);
>+			MethodDeclaration method = (MethodDeclaration) type.bodyDeclarations().get(0);
>+			assertNotNull("method should not be null", method);
>+			SingleVariableDeclaration arg = (SingleVariableDeclaration) method.parameters().get(0);
>+			assertNotNull("argument should not be null", arg);
>+			List modifiers = arg.modifiers();
>+			assertEquals("Should have exactly one modifier", 1, modifiers.size());
>+			assertEquals("Unexpected modifier", "@Annot", ((MarkerAnnotation)modifiers.get(0)).toString());
>+			modifiers = method.modifiers();
>+			assertEquals("Method should have exactly two modifiers", 2, modifiers.size());
>+			assertEquals("Unexpected modifier #1 for method", "public", ((Modifier)modifiers.get(0)).toString());
>+			assertEquals("Unexpected modifier #2 for method", "@Annot", ((MarkerAnnotation)modifiers.get(1)).toString());
>+    	} finally {
>+    		deleteProject("P");
>+    	}
>+	}
>+}
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RenameTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RenameTests.java
>index f08ed7a..92b80fa 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RenameTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RenameTests.java
>@@ -115,9 +115,9 @@
> 			assertTrue("moved from handle should be original", destDelta.getMovedFromElement().equals(e.getParent()));
> 		} else {
> 			assertTrue("Destination container not changed", destDelta != null && deltaChildrenChanged(destDelta));
>-			IJavaElementDelta[] deltas = destDelta.getAddedChildren();
>+			IJavaElementDelta[] deltas = force ? destDelta.getChangedChildren() : destDelta.getAddedChildren();
> 			assertTrue("Added children not correct for element rename", deltas.length > i && deltas[i].getElement().equals(renamed));
>-			assertTrue("kind should be K_ADDED", deltas[i].getKind() == IJavaElementDelta.ADDED);
>+			assertTrue("kind should be K_ADDED", deltas[i].getKind() == (force? IJavaElementDelta.CHANGED : IJavaElementDelta.ADDED));
> 			deltas = destDelta.getRemovedChildren();
> 			assertTrue("Removed children not correct for element rename", deltas.length > i && deltas[i].getElement().equals(e));
> 			assertTrue("kind should be K_REMOVED", deltas[i].getKind() == IJavaElementDelta.REMOVED);
>@@ -364,11 +364,12 @@
> 
> 	assertDeltas(
> 		"Unexpected deltas",
>-		"P[*]: {CHILDREN}\n" +
>-		"	src[*]: {CHILDREN}\n" +
>-		"		<default>[*]: {CHILDREN}\n" +
>-		"			X.java[-]: {MOVED_TO(Y.java [in <default> [in src [in P]]])}\n" +
>-		"			Y.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}"
>+		"P[*]: {CHILDREN}\n" + 
>+				"	src[*]: {CHILDREN}\n" + 
>+				"		<default>[*]: {CHILDREN}\n" + 
>+				"			X.java[-]: {MOVED_TO(Y.java [in <default> [in src [in P]]])}\n" + 
>+				"			Y.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + 
>+				"				Y[+]: {MOVED_FROM(X [in X.java [in <default> [in src [in P]]]])}"
> 	);
> }
> /*
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests.java
>index 429a4cb..73f1d9d 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -2686,4 +2686,43 @@
> 		);
> 	assertTrue("Not a parameter", ((ILocalVariable)elements[0]).isParameter());
> }
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=244544
>+public void testConstantInLocal() throws JavaModelException {
>+	this.workingCopies = new ICompilationUnit[2];
>+	this.workingCopies[0] = getWorkingCopy(
>+			"/Resolve/src/Test2.java",
>+			"class X {\n" +
>+			"    public static void main(String[] args) {\n" +
>+			"        class Local {\n" +
>+			"            private static final long CONSTANT = 1L; // code select fails\n" +
>+			"        }\n" +
>+			"        new X() {\n" +
>+			"            private static final long FINAL = 1L; // code select fails\n" +
>+			"        };\n" +
>+			"    }\n" +
>+			"}\n");
>+
>+	String str = this.workingCopies[0].getSource();
>+	String selectAt = "FINAL";
>+	String selection = "FINAL";
>+	int start = str.indexOf(selectAt);
>+	int length = selection.length();
>+	IJavaElement[] elements = this.workingCopies[0].codeSelect(start, length, this.wcOwner);
>+
>+	assertElementsEqual(
>+			"Unexpected elements",
>+			"FINAL [in <anonymous #1> [in main(String[]) [in X [in [Working copy] Test2.java [in <default> [in src [in Resolve]]]]]]]",
>+			elements);
>+
>+	selectAt = "CONSTANT";
>+	selection = "CONSTANT";
>+	start = str.indexOf(selectAt);
>+	length = selection.length();
>+	elements = this.workingCopies[0].codeSelect(start, length, this.wcOwner);
>+
>+	assertElementsEqual(
>+			"Unexpected elements",
>+			"CONSTANT [in Local [in main(String[]) [in X [in [Working copy] Test2.java [in <default> [in src [in Resolve]]]]]]]",
>+			elements);
>+}
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests2.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests2.java
>index 91034b6..4126938 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests2.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests2.java
>@@ -1203,4 +1203,48 @@
> 		this.deleteProject("P1");
> 	}
> }
>+public void testBug356325() throws Exception{
>+	try {
>+		// create P1
>+		this.createJavaProject(
>+			"P1",
>+			new String[]{"src"},
>+			new String[]{"JCL15_LIB"},
>+			 "bin",
>+			 "1.5");
>+
>+		this.createFolder("/P1/src/p");
>+		this.createFile("/P1/src/p/C.java",
>+				"package p;" + 
>+				"\n" + 
>+				"public class C {\n" + 
>+				"	public void m() {\n" +
>+				"		class Inner<T> {\n" +
>+				"			Inner() {\n"+
>+				"       }\n"+
>+				"		Inner<String> i = new Inner<String>();\n"+
>+				"	}\n" +
>+				"}\n");
>+		
>+		waitUntilIndexesReady();
>+
>+		// do code select
>+		ICompilationUnit cu= getCompilationUnit("P1", "src", "p", "C.java");
>+
>+		String str = cu.getSource();
>+
>+		String selection = "Inner";
>+		int start = str.lastIndexOf(selection);
>+		int length = selection.length();
>+		IJavaElement[] elements = cu.codeSelect(start, length);
>+
>+		assertElementsEqual(
>+			"Unexpected elements",
>+			"Inner() [in Inner [in m() [in C [in C.java [in p [in src [in P1]]]]]]]",
>+			elements
>+		);
>+	} finally {
>+		this.deleteProject("P1");
>+	}
>+}
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunJavaSearchGenericTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunJavaSearchGenericTests.java
>index d33e9c5..0a06040 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunJavaSearchGenericTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunJavaSearchGenericTests.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -45,6 +45,7 @@
> 	AbstractJavaSearchTests.JAVA_SEARCH_SUITES = new ArrayList(Arrays.asList(getJavaSearchTestClasses()));
> 	List allClasses = new ArrayList(AbstractJavaSearchTests.JAVA_SEARCH_SUITES);
> 	allClasses.add(JavaSearchBugsTests.class);
>+	allClasses.add(JavaSearchBugsTests2.class);
> 
> 	// Reset forgotten subsets of tests
> 	TestCase.TESTS_PREFIX = null;
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunJavaSearchTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunJavaSearchTests.java
>index 8917c29..36977b7 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunJavaSearchTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RunJavaSearchTests.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -58,10 +58,12 @@
> 		// Get all classes
> 		List allClasses = new ArrayList(TEST_CLASSES);
> 		allClasses.add(JavaSearchBugsTests.class);
>+		allClasses.add(JavaSearchBugsTests2.class);
> 		allClasses.add(JavaSearchMultipleProjectsTests.class);
> 		allClasses.add(SearchTests.class);
> 		allClasses.add(JavaSearchScopeTests.class);
> 		allClasses.add(MatchingRegionsTest.class);
>+		allClasses.add(JavaIndexTests.class);
> 
> 		// Reset forgotten subsets of tests
> 		TestCase.TESTS_PREFIX = null;
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/TypeResolveTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/TypeResolveTests.java
>index 4bb846e..6625053 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/TypeResolveTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/TypeResolveTests.java
>@@ -33,6 +33,7 @@
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.tests.util.Util;
> import org.eclipse.jdt.internal.core.LocalVariable;
>+import org.eclipse.jdt.internal.core.SourceType;
> 
> public class TypeResolveTests extends ModifyingResourceTests {
> 	ICompilationUnit cu;
>@@ -700,4 +701,107 @@
> 		deleteProject("P");
> 	}
> }
>+/**
>+ * @bug 342393: Anonymous class' occurrence count is incorrect when two methods in a class have the same name.
>+ *
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=342393"
>+ */
>+public void testBug342393() throws Exception {
>+	try {
>+		IJavaProject project = createJavaProject("Test342393", new String[] {"src"}, new String[] {"JCL15_LIB"}, "bin", "1.5");
>+		project.open(null);
>+			String fileContent =  "package p;\n"
>+					 + "public class Test {\n"
>+					 + "Test() {\n"
>+					 + "    class A {\n"
>+					 + "    	// one \n"
>+					 + "        public void foo() {\n"
>+					 + "            Throwable a1 = new Throwable(){ // two \n"
>+					 + "            };\n"
>+					 + "            Throwable b1 = new Throwable(){ // three \n"
>+					 + "            };\n"
>+					 + "        }\n"
>+					 + "        public void bar() {\n"
>+					 + "            Throwable b2 = new Throwable(){ // four\n"
>+					 + "            	Throwable bi2 = new Throwable() { // five\n"
>+					 + "            	};\n"
>+					 + "            };\n"
>+					 + "        }\n"
>+					 + "        class B {\n"
>+					 + "        	Throwable t1 = new Throwable() { // six\n"
>+					 + "        	};\n"
>+					 + "        	Throwable t2 = new Throwable() { // seven\n"
>+					 + "        	};\n"
>+					 + "        }\n"
>+					 + "    };\n"
>+					 + "    {\n"
>+					 + "        Throwable a3 = new Throwable(){ // eight\n"
>+					 + "        	Throwable ai3 = new Throwable() { // nine\n"
>+					 + "        	};\n"
>+					 + "        };\n"
>+					 + "    }\n"
>+					 + "}\n"
>+					 + "public static void main(String[] args) throws Exception {\n"
>+					 + "	Throwable c1 = new Throwable() { // ten\n"
>+					 + "	};\n"
>+					 + "	Throwable c2 = new Throwable() { // eleven\n"
>+					 + "	};\n"
>+					 + "}\n"
>+					 + "}\n";
>+			createFolder("/Test342393/src/p");
>+			createFile(	"/Test342393/src/p/Test.java",	fileContent);
>+
>+			ICompilationUnit unit = getCompilationUnit("/Test342393/src/p/Test.java");
>+			int index = fileContent.indexOf("// one");
>+			IJavaElement element = unit.getElementAt(index);
>+			assertEquals("Incorrect Type selected", "p.Test$A", ((SourceType)element.getParent()).getFullyQualifiedName());
>+			index = fileContent.indexOf("// two");
>+			element = unit.getElementAt(index);
>+			assertEquals("Incorrect Type selected", "p.Test$A$1", ((SourceType)element).getFullyQualifiedName());
>+			index = fileContent.indexOf("// three");
>+			element = unit.getElementAt(index);
>+			assertEquals("Incorrect Type selected", "p.Test$A$2", ((SourceType)element).getFullyQualifiedName());
>+			index = fileContent.indexOf("// four");
>+			element = unit.getElementAt(index);
>+			assertEquals("Incorrect Type selected", "p.Test$A$3", ((SourceType)element).getFullyQualifiedName());
>+			index = fileContent.indexOf("// five");
>+			element = unit.getElementAt(index);
>+			assertEquals("Incorrect Type selected", "p.Test$A$3$1", ((SourceType)element).getFullyQualifiedName());
>+			index = fileContent.indexOf("// six");
>+			element = unit.getElementAt(index);
>+			assertEquals("Incorrect Type selected", "p.Test$A$B$1", ((SourceType)element).getFullyQualifiedName());
>+			index = fileContent.indexOf("// seven");
>+			element = unit.getElementAt(index);
>+			assertEquals("Incorrect Type selected", "p.Test$A$B$2", ((SourceType)element).getFullyQualifiedName());
>+
>+			String handleId = ((SourceType)element).getHandleMemento();
>+			IJavaElement newElement = JavaCore.create(handleId);
>+			assertEquals("Incorrect Element", element, newElement);
>+
>+			index = fileContent.indexOf("// eight");
>+			element = unit.getElementAt(index);
>+			assertEquals("Incorrect Type selected", "p.Test$1", ((SourceType)element).getFullyQualifiedName());
>+			index = fileContent.indexOf("// nine");
>+			element = unit.getElementAt(index);
>+			assertEquals("Incorrect Type selected", "p.Test$1$1", ((SourceType)element).getFullyQualifiedName());
>+
>+			handleId = ((SourceType)element).getHandleMemento();
>+			newElement = JavaCore.create(handleId);
>+			assertEquals("Incorrect Element", element, newElement);
>+
>+			index = fileContent.indexOf("// ten");
>+			element = unit.getElementAt(index);
>+			assertEquals("Incorrect Type selected", "p.Test$2", ((SourceType)element).getFullyQualifiedName());
>+			index = fileContent.indexOf("// eleven");
>+			element = unit.getElementAt(index);
>+			assertEquals("Incorrect Type selected", "p.Test$3", ((SourceType)element).getFullyQualifiedName());
>+
>+			handleId = ((SourceType)element).getHandleMemento();
>+			newElement = JavaCore.create(handleId);
>+			assertEquals("Incorrect Element", element, newElement);
>+	}
>+	finally {
>+		deleteProject("Test342393");
>+	}
>+}
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/WorkingCopyTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/WorkingCopyTests.java
>index f23e3ca..8849aff 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/WorkingCopyTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/WorkingCopyTests.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -202,8 +202,9 @@
> 
> /**
>  * Test creating a working copy on a class file with a customized buffer.
>+ * As of https://bugs.eclipse.org/337935 this test is no longer valid.
>  */
>-public void testOnClassFile() throws JavaModelException, IOException {
>+public void _testOnClassFile() throws JavaModelException, IOException {
> 	// ensure the external JCL is copied
> 	setupExternalJCL("jclMin");
> 
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/rewrite/describing/ASTRewritingStatementsTest.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/rewrite/describing/ASTRewritingStatementsTest.java
>index 5ea8bc1..429dce8 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/rewrite/describing/ASTRewritingStatementsTest.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/rewrite/describing/ASTRewritingStatementsTest.java
>@@ -15,6 +15,7 @@
> import junit.framework.TestSuite;
> 
> import org.eclipse.jdt.core.ICompilationUnit;
>+import org.eclipse.jdt.core.IJavaProject;
> import org.eclipse.jdt.core.IPackageFragment;
> import org.eclipse.jdt.core.IPackageFragmentRoot;
> import org.eclipse.jdt.core.JavaCore;
>@@ -5694,7 +5695,157 @@
> 		assertEqualString(preview, buf.toString());
> 
> 	}
>+	
>+	
>+	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=350285
>+	// Test that converting a multi catch into a normal catch using complete block copy doesn't change indentation
>+	public void testTryStatementWithMultiCatch1() throws Exception {
>+		createProject("P_17", JavaCore.VERSION_1_7);
>+		IPackageFragmentRoot currentSourceFolder = getPackageFragmentRoot("P_17", "src");
>+		try {
>+			IPackageFragment pack1= currentSourceFolder.createPackageFragment("test1", false, null);
>+			StringBuffer buf= new StringBuffer();
>+			buf.append("package test1;\n");
>+			buf.append("public class E {\n");
>+			buf.append("    public void foo(int i) {\n");
>+			buf.append("        try {\n");
>+			buf.append("            System.out.println(\"foo\");\n");
>+			buf.append("        } catch (IllegalArgumentException | NullPointerException exe) {\n");
>+			buf.append("            System.out.println(exe);\n");
>+			buf.append("        }\n");
>+			buf.append("    }\n");
>+			buf.append("}\n");
>+			ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
> 
>+			CompilationUnit astRoot= createAST(AST.JLS4, cu, false);
>+			AST ast= astRoot.getAST();
>+			ASTRewrite rewrite= ASTRewrite.create(ast);
>+
>+			assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
>+			TypeDeclaration type= findTypeDeclaration(astRoot, "E");
>+			MethodDeclaration methodDecl= findMethodDeclaration(type, "foo");
>+			Block block= methodDecl.getBody();
>+			List blockStatements= block.statements();
>+			assertTrue("Number of statements not 1", blockStatements.size() == 1);
>+			{ // convert multicatch to normal catch blocks
>+				TryStatement tryStatement= (TryStatement) blockStatements.get(0);
>+				List catchClauses= tryStatement.catchClauses();
>+				assertTrue("Number of catch clauses not 1", catchClauses.size() == 1);
>+				CatchClause catchClause = (CatchClause) catchClauses.get(0);
>+				
>+				SingleVariableDeclaration singleVariableDeclaration= catchClause.getException();
>+				UnionType unionType = (UnionType) singleVariableDeclaration.getType();
>+				List types = unionType.types();
>+				assertTrue("Number of union types", types.size() == 2);
>+				for (int i= types.size() - 1; i >= 0; i--) {
>+					Type type2= (Type)types.get(i);
>+					CatchClause newCatchClause= ast.newCatchClause();
>+					SingleVariableDeclaration newSingleVariableDeclaration= ast.newSingleVariableDeclaration();
>+					newSingleVariableDeclaration.setType((Type) rewrite.createCopyTarget(type2));
>+					newSingleVariableDeclaration.setName((SimpleName) rewrite.createCopyTarget(singleVariableDeclaration.getName()));
>+					newCatchClause.setException(newSingleVariableDeclaration);
>+					newCatchClause.setBody((Block) rewrite.createCopyTarget(catchClause.getBody()));
>+					rewrite.getListRewrite(tryStatement, TryStatement.CATCH_CLAUSES_PROPERTY).insertAfter(newCatchClause, catchClause, null);
>+				}
>+				rewrite.remove(catchClause, null);
>+			}
>+			String preview= evaluateRewrite(cu, rewrite);
>+
>+			buf= new StringBuffer();
>+			buf.append("package test1;\n");
>+			buf.append("public class E {\n");
>+			buf.append("    public void foo(int i) {\n");
>+			buf.append("        try {\n");
>+			buf.append("            System.out.println(\"foo\");\n");
>+			buf.append("        } catch (IllegalArgumentException exe) {\n");
>+			buf.append("            System.out.println(exe);\n");
>+			buf.append("        } catch (NullPointerException exe) {\n");
>+			buf.append("            System.out.println(exe);\n");
>+			buf.append("        }\n");
>+			buf.append("    }\n");
>+			buf.append("}\n");
>+			assertEqualString(preview, buf.toString());
>+		} finally {
>+			deleteProject("P_17");
>+		}
>+	}
>+
>+	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=350285
>+	// similar to testTryStatementWithMultiCatch1() but has a different brace position
>+	public void testTryStatementWithMultiCatch2() throws Exception {
>+		IJavaProject project = createProject("P_17", JavaCore.VERSION_1_7);
>+		project.setOption(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, DefaultCodeFormatterConstants.NEXT_LINE);
>+		IPackageFragmentRoot currentSourceFolder = getPackageFragmentRoot("P_17", "src");
>+		try {
>+			IPackageFragment pack1= currentSourceFolder.createPackageFragment("test1", false, null);
>+			StringBuffer buf= new StringBuffer();
>+			buf.append("package test1;\n");
>+			buf.append("public class E {\n");
>+			buf.append("    public void foo(int i) {\n");
>+			buf.append("        try {\n");
>+			buf.append("            System.out.println(\"foo\");\n");
>+			buf.append("        } catch (IllegalArgumentException | NullPointerException exe)\n");
>+			buf.append("        {\n");
>+			buf.append("            System.out.println(exe);\n");
>+			buf.append("        }\n");
>+			buf.append("    }\n");
>+			buf.append("}\n");
>+			ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
>+
>+			CompilationUnit astRoot= createAST(AST.JLS4, cu, false);
>+			AST ast= astRoot.getAST();
>+			ASTRewrite rewrite= ASTRewrite.create(ast);
>+
>+			assertTrue("Parse errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
>+			TypeDeclaration type= findTypeDeclaration(astRoot, "E");
>+			MethodDeclaration methodDecl= findMethodDeclaration(type, "foo");
>+			Block block= methodDecl.getBody();
>+			List blockStatements= block.statements();
>+			assertTrue("Number of statements not 1", blockStatements.size() == 1);
>+			{ // convert multicatch to normal catch blocks
>+				TryStatement tryStatement= (TryStatement) blockStatements.get(0);
>+				List catchClauses= tryStatement.catchClauses();
>+				assertTrue("Number of catch clauses not 1", catchClauses.size() == 1);
>+				CatchClause catchClause = (CatchClause) catchClauses.get(0);
>+				
>+				SingleVariableDeclaration singleVariableDeclaration= catchClause.getException();
>+				UnionType unionType = (UnionType) singleVariableDeclaration.getType();
>+				List types = unionType.types();
>+				assertTrue("Number of union types", types.size() == 2);
>+				for (int i= types.size() - 1; i >= 0; i--) {
>+					Type type2= (Type)types.get(i);
>+					CatchClause newCatchClause= ast.newCatchClause();
>+					SingleVariableDeclaration newSingleVariableDeclaration= ast.newSingleVariableDeclaration();
>+					newSingleVariableDeclaration.setType((Type) rewrite.createCopyTarget(type2));
>+					newSingleVariableDeclaration.setName((SimpleName) rewrite.createCopyTarget(singleVariableDeclaration.getName()));
>+					newCatchClause.setException(newSingleVariableDeclaration);
>+					newCatchClause.setBody((Block) rewrite.createCopyTarget(catchClause.getBody()));
>+					rewrite.getListRewrite(tryStatement, TryStatement.CATCH_CLAUSES_PROPERTY).insertAfter(newCatchClause, catchClause, null);
>+				}
>+				rewrite.remove(catchClause, null);
>+			}
>+			String preview= evaluateRewrite(cu, rewrite);
>+
>+			buf= new StringBuffer();
>+			buf.append("package test1;\n");
>+			buf.append("public class E {\n");
>+			buf.append("    public void foo(int i) {\n");
>+			buf.append("        try {\n");
>+			buf.append("            System.out.println(\"foo\");\n");
>+			buf.append("        } catch (IllegalArgumentException exe)\n");
>+			buf.append("        {\n");
>+			buf.append("            System.out.println(exe);\n");
>+			buf.append("        } catch (NullPointerException exe)\n");
>+			buf.append("        {\n");
>+			buf.append("            System.out.println(exe);\n");
>+			buf.append("        }\n");
>+			buf.append("    }\n");
>+			buf.append("}\n");
>+			assertEqualString(preview, buf.toString());
>+		} finally {
>+			deleteProject("P_17");
>+		}
>+	}
> }
> 
> 
>diff --git a/org.eclipse.jdt.core.tests.model/test.xml b/org.eclipse.jdt.core.tests.model/test.xml
>index ebf09ed..256892d 100644
>--- a/org.eclipse.jdt.core.tests.model/test.xml
>+++ b/org.eclipse.jdt.core.tests.model/test.xml
>@@ -1,6 +1,7 @@
>-<?xml version="1.0"?>
>-
 ignore last character
> 								this.currentPosition--;
> 							} else {
>-								digit = ScannerHelper.getNumericValue(this.currentCharacter);
>+								digit = ScannerHelper.getHexadecimalValue(this.currentCharacter);
> 								if (digit >= 0 && digit <= 7){ // has read \ZeroToThree OctalDigit OctalDigit
> 									number = (number * 8) + digit;
> 								} else {// has read \ZeroToThree OctalDigit NonOctalDigit --> ignore last character
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java
>index 69c1107..4ee486e 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java
>@@ -475,6 +475,50 @@
> 	}
> 	return Character.getNumericValue(c);
> }
>+public static int getHexadecimalValue(char c) {
>+	switch(c) {
>+		case '0' :
>+			return 0;
>+		case '1' :
>+			return 1;
>+		case '2' :
>+			return 2;
>+		case '3' :
>+			return 3;
>+		case '4' :
>+			return 4;
>+		case '5' :
>+			return 5;
>+		case '6' :
>+			return 6;
>+		case '7' :
>+			return 7;
>+		case '8' :
>+			return 8;
>+		case '9' :
>+			return 9;
>+		case 'A' :
>+		case 'a' :
>+			return 10;
>+		case 'B' :
>+		case 'b' :
>+			return 11;
>+		case 'C' :
>+		case 'c' :
>+			return 12;
>+		case 'D' :
>+		case 'd' :
>+			return 13;
>+		case 'E' :
>+		case 'e' :
>+			return 14;
>+		case 'F' :
>+		case 'f' :
>+			return 15;
>+		default:
>+			return -1;
>+	}
>+}
> public static char toUpperCase(char c) {
> 	if (c < MAX_OBVIOUS) {
> 		if ((ScannerHelper.OBVIOUS_IDENT_CHAR_NATURES[c] & ScannerHelper.C_UPPER_LETTER) != 0) {
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java
>index bda4da2..e1406d0 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java
>@@ -1,146 +1,146 @@
>-/*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *     IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.jdt.internal.compiler.parser;
>-
>-/**
>- * IMPORTANT NOTE: These constants are dedicated to the internal Scanner implementation.
>- * It is mirrored in org.eclipse.jdt.core.compiler public package where it is API.
>- * The mirror implementation is using the backward compatible ITerminalSymbols constant
>- * definitions (stable with 2.0), whereas the internal implementation uses TerminalTokens
>- * which constant values reflect the latest parser generation state.
>- */
>-/**
>- * Maps each terminal symbol in the java-grammar into a unique integer.
>- * This integer is used to represent the terminal when computing a parsing action.
>- *
>- * Disclaimer : These constant values are generated automatically using a Java
>- * grammar, therefore their actual values are subject to change if new keywords
>- * were added to the language (for instance, 'assert' is a keyword in 1.4).
>- */
>-public interface TerminalTokens {
>-
>-	// special tokens not part of grammar - not autogenerated
>-	int TokenNameWHITESPACE = 1000,
>-		TokenNameCOMMENT_LINE = 1001,
>-		TokenNameCOMMENT_BLOCK = 1002,
>-		TokenNameCOMMENT_JAVADOC = 1003;
>-
>-	int TokenNameIdentifier = 26,
>-		TokenNameabstract = 56,
>-		TokenNameassert = 74,
>-		TokenNameboolean = 32,
>-		TokenNamebreak = 75,
>-		TokenNamebyte = 33,
>-		TokenNamecase = 102,
>-		TokenNamecatch = 100,
>-		TokenNamechar = 34,
>-		TokenNameclass = 72,
>-		TokenNamecontinue = 76,
>-		TokenNameconst = 108,
>-		TokenNamedefault = 97,
>-		TokenNamedo = 77,
>-		TokenNamedouble = 35,
>-		TokenNameelse = 104,
>-		TokenNameenum = 98,
>-		TokenNameextends = 99,
>-		TokenNamefalse = 44,
>-		TokenNamefinal = 57,
>-		TokenNamefinally = 103,
>-		TokenNamefloat = 36,
>-		TokenNamefor = 78,
>-		TokenNamegoto = 109,
>-		TokenNameif = 79,
>-		TokenNameimplements = 106,
>-		TokenNameimport = 101,
>-		TokenNameinstanceof = 13,
>-		TokenNameint = 37,
>-		TokenNameinterface = 95,
>-		TokenNamelong = 38,
>-		TokenNamenative = 58,
>-		TokenNamenew = 43,
>-		TokenNamenull = 45,
>-		TokenNamepackage = 96,
>-		TokenNameprivate = 59,
>-		TokenNameprotected = 60,
>-		TokenNamepublic = 61,
>-		TokenNamereturn = 80,
>-		TokenNameshort = 39,
>-		TokenNamestatic = 54,
>-		TokenNamestrictfp = 62,
>-		TokenNamesuper = 41,
>-		TokenNameswitch = 81,
>-		TokenNamesynchronized = 55,
>-		TokenNamethis = 42,
>-		TokenNamethrow = 82,
>-		TokenNamethrows = 105,
>-		TokenNametransient = 63,
>-		TokenNametrue = 46,
>-		TokenNametry = 83,
>-		TokenNamevoid = 40,
>-		TokenNamevolatile = 64,
>-		TokenNamewhile = 73,
>-		TokenNameIntegerLiteral = 47,
>-		TokenNameLongLiteral = 48,
>-		TokenNameFloatingPointLiteral = 49,
>-		TokenNameDoubleLiteral = 50,
>-		TokenNameCharacterLiteral = 51,
>-		TokenNameStringLiteral = 52,
>-		TokenNamePLUS_PLUS = 8,
>-		TokenNameMINUS_MINUS = 9,
>-		TokenNameEQUAL_EQUAL = 18,
>-		TokenNameLESS_EQUAL = 14,
>-		TokenNameGREATER_EQUAL = 15,
>-		TokenNameNOT_EQUAL = 19,
>-		TokenNameLEFT_SHIFT = 17,
>-		TokenNameRIGHT_SHIFT = 10,
>-		TokenNameUNSIGNED_RIGHT_SHIFT = 12,
>-		TokenNamePLUS_EQUAL = 84,
>-		TokenNameMINUS_EQUAL = 85,
>-		TokenNameMULTIPLY_EQUAL = 86,
>-		TokenNameDIVIDE_EQUAL = 87,
>-		TokenNameAND_EQUAL = 88,
>-		TokenNameOR_EQUAL = 89,
>-		TokenNameXOR_EQUAL = 90,
>-		TokenNameREMAINDER_EQUAL = 91,
>-		TokenNameLEFT_SHIFT_EQUAL = 92,
>-		TokenNameRIGHT_SHIFT_EQUAL = 93,
>-		TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL = 94,
>-		TokenNameOR_OR = 25,
>-		TokenNameAND_AND = 24,
>-		TokenNamePLUS = 1,
>-		TokenNameMINUS = 2,
>-		TokenNameNOT = 66,
>-		TokenNameREMAINDER = 5,
>-		TokenNameXOR = 21,
>-		TokenNameAND = 20,
>-		TokenNameMULTIPLY = 4,
>-		TokenNameOR = 22,
>-		TokenNameTWIDDLE = 67,
>-		TokenNameDIVIDE = 6,
>-		TokenNameGREATER = 11,
>-		TokenNameLESS = 7,
>-		TokenNameLPAREN = 29,
>-		TokenNameRPAREN = 28,
>-		TokenNameLBRACE = 68,
>-		TokenNameRBRACE = 31,
>-		TokenNameLBRACKET = 16,
>-		TokenNameRBRACKET = 70,
>-		TokenNameSEMICOLON = 27,
>-		TokenNameQUESTION = 23,
>-		TokenNameCOLON = 65,
>-		TokenNameCOMMA = 30,
>-		TokenNameDOT = 3,
>-		TokenNameEQUAL = 71,
>-		TokenNameAT = 53,
>-		TokenNameELLIPSIS = 107,
>-		TokenNameEOF = 69,
>-		TokenNameERROR = 110;
>-}
>+/*******************************************************************************
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.internal.compiler.parser;
>+
>+/**
>+ * IMPORTANT NOTE: These constants are dedicated to the internal Scanner implementation.
>+ * It is mirrored in org.eclipse.jdt.core.compiler public package where it is API.
>+ * The mirror implementation is using the backward compatible ITerminalSymbols constant
>+ * definitions (stable with 2.0), whereas the internal implementation uses TerminalTokens
>+ * which constant values reflect the latest parser generation state.
>+ */
>+/**
>+ * Maps each terminal symbol in the java-grammar into a unique integer.
>+ * This integer is used to represent the terminal when computing a parsing action.
>+ *
>+ * Disclaimer : These constant values are generated automatically using a Java
>+ * grammar, therefore their actual values are subject to change if new keywords
>+ * were added to the language (for instance, 'assert' is a keyword in 1.4).
>+ */
>+public interface TerminalTokens {
>+
>+	// special tokens not part of grammar - not autogenerated
>+	int TokenNameWHITESPACE = 1000,
>+		TokenNameCOMMENT_LINE = 1001,
>+		TokenNameCOMMENT_BLOCK = 1002,
>+		TokenNameCOMMENT_JAVADOC = 1003;
>+
>+	int TokenNameIdentifier = 26,
>+		TokenNameabstract = 56,
>+		TokenNameassert = 74,
>+		TokenNameboolean = 32,
>+		TokenNamebreak = 75,
>+		TokenNamebyte = 33,
>+		TokenNamecase = 102,
>+		TokenNamecatch = 100,
>+		TokenNamechar = 34,
>+		TokenNameclass = 72,
>+		TokenNamecontinue = 76,
>+		TokenNameconst = 108,
>+		TokenNamedefault = 97,
>+		TokenNamedo = 77,
>+		TokenNamedouble = 35,
>+		TokenNameelse = 104,
>+		TokenNameenum = 98,
>+		TokenNameextends = 99,
>+		TokenNamefalse = 44,
>+		TokenNamefinal = 57,
>+		TokenNamefinally = 103,
>+		TokenNamefloat = 36,
>+		TokenNamefor = 78,
>+		TokenNamegoto = 109,
>+		TokenNameif = 79,
>+		TokenNameimplements = 106,
>+		TokenNameimport = 101,
>+		TokenNameinstanceof = 13,
>+		TokenNameint = 37,
>+		TokenNameinterface = 95,
>+		TokenNamelong = 38,
>+		TokenNamenative = 58,
>+		TokenNamenew = 43,
>+		TokenNamenull = 45,
>+		TokenNamepackage = 96,
>+		TokenNameprivate = 59,
>+		TokenNameprotected = 60,
>+		TokenNamepublic = 61,
>+		TokenNamereturn = 80,
>+		TokenNameshort = 39,
>+		TokenNamestatic = 54,
>+		TokenNamestrictfp = 62,
>+		TokenNamesuper = 41,
>+		TokenNameswitch = 81,
>+		TokenNamesynchronized = 55,
>+		TokenNamethis = 42,
>+		TokenNamethrow = 82,
>+		TokenNamethrows = 105,
>+		TokenNametransient = 63,
>+		TokenNametrue = 46,
>+		TokenNametry = 83,
>+		TokenNamevoid = 40,
>+		TokenNamevolatile = 64,
>+		TokenNamewhile = 73,
>+		TokenNameIntegerLiteral = 47,
>+		TokenNameLongLiteral = 48,
>+		TokenNameFloatingPointLiteral = 49,
>+		TokenNameDoubleLiteral = 50,
>+		TokenNameCharacterLiteral = 51,
>+		TokenNameStringLiteral = 52,
>+		TokenNamePLUS_PLUS = 8,
>+		TokenNameMINUS_MINUS = 9,
>+		TokenNameEQUAL_EQUAL = 18,
>+		TokenNameLESS_EQUAL = 14,
>+		TokenNameGREATER_EQUAL = 15,
>+		TokenNameNOT_EQUAL = 19,
>+		TokenNameLEFT_SHIFT = 17,
>+		TokenNameRIGHT_SHIFT = 10,
>+		TokenNameUNSIGNED_RIGHT_SHIFT = 12,
>+		TokenNamePLUS_EQUAL = 84,
>+		TokenNameMINUS_EQUAL = 85,
>+		TokenNameMULTIPLY_EQUAL = 86,
>+		TokenNameDIVIDE_EQUAL = 87,
>+		TokenNameAND_EQUAL = 88,
>+		TokenNameOR_EQUAL = 89,
>+		TokenNameXOR_EQUAL = 90,
>+		TokenNameREMAINDER_EQUAL = 91,
>+		TokenNameLEFT_SHIFT_EQUAL = 92,
>+		TokenNameRIGHT_SHIFT_EQUAL = 93,
>+		TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL = 94,
>+		TokenNameOR_OR = 25,
>+		TokenNameAND_AND = 24,
>+		TokenNamePLUS = 1,
>+		TokenNameMINUS = 2,
>+		TokenNameNOT = 66,
>+		TokenNameREMAINDER = 5,
>+		TokenNameXOR = 21,
>+		TokenNameAND = 20,
>+		TokenNameMULTIPLY = 4,
>+		TokenNameOR = 22,
>+		TokenNameTWIDDLE = 67,
>+		TokenNameDIVIDE = 6,
>+		TokenNameGREATER = 11,
>+		TokenNameLESS = 7,
>+		TokenNameLPAREN = 29,
>+		TokenNameRPAREN = 28,
>+		TokenNameLBRACE = 68,
>+		TokenNameRBRACE = 31,
>+		TokenNameLBRACKET = 16,
>+		TokenNameRBRACKET = 70,
>+		TokenNameSEMICOLON = 27,
>+		TokenNameQUESTION = 23,
>+		TokenNameCOLON = 65,
>+		TokenNameCOMMA = 30,
>+		TokenNameDOT = 3,
>+		TokenNameEQUAL = 71,
>+		TokenNameAT = 53,
>+		TokenNameELLIPSIS = 107,
>+		TokenNameEOF = 69,
>+		TokenNameERROR = 110;
>+}
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser1.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser1.rsc
>index 2c68a20..c8d86dd 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser1.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser1.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser10.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser10.rsc
>index c0bd267..c5e7edf 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser10.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser10.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser11.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser11.rsc
>index e7c268c..5edc22c 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser11.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser11.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser12.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser12.rsc
>index 93630f6..6ea6cc3 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser12.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser12.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser13.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser13.rsc
>index fdcceda..b64633f 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser13.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser13.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser14.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser14.rsc
>index b02adc0..113160e 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser14.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser14.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser15.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser15.rsc
>index f1ca75e..a82641f 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser15.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser15.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser16.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser16.rsc
>index 98b3731..e57ff72 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser16.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser16.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser17.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser17.rsc
>index fc9a891..f39a839 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser17.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser17.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser18.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser18.rsc
>index 2ed1aae..aa0255e 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser18.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser18.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser19.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser19.rsc
>index 235e18f..34ffef8 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser19.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser19.rsc
>@@ -1,2 +1,2 @@
>-hhgFFFDDgAAA!FdAfAID
>+hhgFFFDDgAAA!FdAfAID
> JJD!DDbGG_!!H!Ab!!!!55!
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser2.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser2.rsc
>index 6cf6750..5c7a1bb 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser2.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser2.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser20.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser20.rsc
>index a6fa5a3..7a6589a 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser20.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser20.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser21.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser21.rsc
>index 05e26c7..705733d 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser21.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser21.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser22.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser22.rsc
>index 1477402..554be4b 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser22.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser22.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser24.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser24.rsc
>index 6a14007..3ca03ec 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser24.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser24.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser3.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser3.rsc
>index 6bb7a1e..f84aba4 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser3.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser3.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser4.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser4.rsc
>index 405f8e6..ddff383 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser4.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser4.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser5.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser5.rsc
>index 664cd36..440655f 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser5.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser5.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser6.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser6.rsc
>index 745efaf..46a0b80 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser6.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser6.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser8.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser8.rsc
>index c408cba..8b6d06f 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser8.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser8.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser9.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser9.rsc
>index b1ab05f..f327272 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser9.rsc
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser9.rsc
>Binary files differ
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/readableNames.properties b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/readableNames.properties
>index 629dc96..a2e9a35 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/readableNames.properties
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/readableNames.properties
>@@ -1,15 +1,5 @@
>-###############################################################################
>-# Copyright (c) 2011 IBM Corporation and others.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>-#
>-# Contributors:
>-#     IBM Corporation - initial API and implementation
>-###############################################################################
> ,opt=,
>-\;opt=;
>+;opt=;
> AbstractMethodDeclaration=MethodDeclaration
> AdditionalBound1=AdditionalBound1
> AdditionalBound=AdditionalBound
>@@ -109,6 +99,7 @@
> EnhancedForStatementHeaderInit=EnhancedForStatementHeaderInit
> EnhancedForStatementNoShortIf=EnhancedForStatementNoShortIf
> EnterCompilationUnit=EnterCompilationUnit
>+EnterInstanceCreationArgumentList=EnterInstanceCreationArgumentList
> EnterMemberValue=EnterMemberValue
> EnterMemberValueArrayInitializer=EnterMemberValueArrayInitializer
> EnterVariable=EnterVariable
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemHandler.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemHandler.java
>index 6baad99..afa8a97 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemHandler.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemHandler.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -12,9 +12,12 @@
> 
> import org.eclipse.jdt.core.compiler.CategorizedProblem;
> import org.eclipse.jdt.core.compiler.CharOperation;
>+import org.eclipse.jdt.core.compiler.IProblem;
> import org.eclipse.jdt.internal.compiler.CompilationResult;
> import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy;
> import org.eclipse.jdt.internal.compiler.IProblemFactory;
>+import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
>+import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
> import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
> import org.eclipse.jdt.internal.compiler.impl.ReferenceContext;
> import org.eclipse.jdt.internal.compiler.util.Util;
>@@ -114,6 +117,17 @@
> 	if (severity == ProblemSeverities.Ignore)
> 		return;
> 
>+	if ((severity & ProblemSeverities.Optional) != 0 && problemId != IProblem.Task) {
>+		ICompilationUnit cu = unitResult.getCompilationUnit();
>+		try{
>+			if (cu != null && cu.ignoreOptionalProblems())
>+				return;
>+		// workaround for illegal implementation of ICompilationUnit, see https://bugs.eclipse.org/372351
>+		} catch (AbstractMethodError ex) {
>+			// continue
>+		}
>+	}
>+
> 	// if no reference context, we need to abort from the current compilation process
> 	if (referenceContext == null) {
> 		if ((severity & ProblemSeverities.Error) != 0) { // non reportable error is fatal
>@@ -150,6 +164,13 @@
> 		case ProblemSeverities.Error :
> 			record(problem, unitResult, referenceContext);
> 			if ((severity & ProblemSeverities.Fatal) != 0) {
>+				// don't abort or tag as error if the error is suppressed
>+				if (!referenceContext.hasErrors() && (severity & ProblemSeverities.Optional) != 0 && this.options.suppressOptionalErrors) {
>+					CompilationUnitDeclaration unitDecl = referenceContext.getCompilationUnitDeclaration();
>+					if (unitDecl != null && unitDecl.isSuppressed(problem)) {
>+						return;
>+					}
>+				}
> 				referenceContext.tagAsHavingErrors();
> 				// should abort ?
> 				int abortLevel;
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
>index a51fde1..3dd639a 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -8,9 +8,14 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *     Benjamin Muskalla - Contribution for bug 239066
>- *     Stephan Herrmann  - Contributions for 
>- *     						bug 236385 - 
>- *     						bug 338303 - Warning about Redundant assignment conflicts with definite assignment
>+ *     Stephan Herrmann  - Contributions for
>+ *	     						bug 236385 - [compiler] Warn for potential programming problem if an object is created but not used
>+ *  	   						bug 338303 - Warning about Redundant assignment conflicts with definite assignment
>+ *								bug 349326 - [1.7] new warning for missing try-with-resources
>+ *								bug 186342 - [compiler][null] Using annotations for null checking
>+ *								bug 365519 - editorial cleanup after bug 186342 and bug 365387
>+ *								bug 365662 - [compiler][null] warn on contradictory and redundant null annotations
>+ *								bug 365531 - [compiler][null] investigate alternative strategy for internally encoding nullness defaults
>  *******************************************************************************/
> package org.eclipse.jdt.internal.compiler.problem;
> 
>@@ -51,6 +56,7 @@
> import org.eclipse.jdt.internal.compiler.ast.EqualExpression;
> import org.eclipse.jdt.internal.compiler.ast.ExplicitConstructorCall;
> import org.eclipse.jdt.internal.compiler.ast.Expression;
>+import org.eclipse.jdt.internal.compiler.ast.FakedTrackingVariable;
> import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration;
> import org.eclipse.jdt.internal.compiler.ast.FieldReference;
> import org.eclipse.jdt.internal.compiler.ast.ImportReference;
>@@ -82,6 +88,7 @@
> import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
> import org.eclipse.jdt.internal.compiler.env.AccessRestriction;
> import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
>+import org.eclipse.jdt.internal.compiler.flow.FlowInfo;
> import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
> import org.eclipse.jdt.internal.compiler.impl.ReferenceContext;
> import org.eclipse.jdt.internal.compiler.lookup.ArrayBinding;
>@@ -91,6 +98,7 @@
> import org.eclipse.jdt.internal.compiler.lookup.InvocationSite;
> import org.eclipse.jdt.internal.compiler.lookup.LocalVariableBinding;
> import org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
>+import org.eclipse.jdt.internal.compiler.lookup.PackageBinding;
> import org.eclipse.jdt.internal.compiler.lookup.ParameterizedGenericMethodBinding;
> import org.eclipse.jdt.internal.compiler.lookup.ProblemMethodBinding;
> import org.eclipse.jdt.internal.compiler.lookup.ProblemReasons;
>@@ -285,6 +293,7 @@
> 			return CompilerOptions.NullReference;
> 
> 		case IProblem.PotentialNullLocalVariableReference:
>+		case IProblem.PotentialNullMessageSendReference:
> 			return CompilerOptions.PotentialNullReference;
> 
> 		case IProblem.RedundantLocalVariableNullAssignment:
>@@ -293,7 +302,28 @@
> 		case IProblem.NonNullLocalVariableComparisonYieldsFalse:
> 		case IProblem.NullLocalVariableComparisonYieldsFalse:
> 		case IProblem.NullLocalVariableInstanceofYieldsFalse:
>+		case IProblem.RedundantNullCheckOnNonNullMessageSend:
> 			return CompilerOptions.RedundantNullCheck;
>+
>+		case IProblem.RequiredNonNullButProvidedNull:
>+		case IProblem.IllegalReturnNullityRedefinition:
>+		case IProblem.IllegalRedefinitionToNonNullParameter:
>+		case IProblem.IllegalDefinitionToNonNullParameter:
>+		case IProblem.ParameterLackingNonNullAnnotation:
>+		case IProblem.ParameterLackingNullableAnnotation:
>+		case IProblem.CannotImplementIncompatibleNullness:
>+			return CompilerOptions.NullSpecViolation;
>+
>+		case IProblem.RequiredNonNullButProvidedPotentialNull:
>+			return CompilerOptions.PotentialNullSpecViolation;
>+		case IProblem.RequiredNonNullButProvidedUnknown:
>+			return CompilerOptions.NullSpecInsufficientInfo;
>+		case IProblem.RedundantNullAnnotation:
>+		case IProblem.RedundantNullDefaultAnnotation:
>+		case IProblem.RedundantNullDefaultAnnotationPackage:
>+		case IProblem.RedundantNullDefaultAnnotationType:
>+		case IProblem.RedundantNullDefaultAnnotationMethod:
>+			return CompilerOptions.RedundantNullAnnotation;
> 
> 		case IProblem.BoxingConversion :
> 		case IProblem.UnboxingConversion :
>@@ -426,6 +456,15 @@
> 			
> 		case IProblem.MethodCanBePotentiallyStatic:
> 			return CompilerOptions.MethodCanBePotentiallyStatic;
>+
>+		case IProblem.UnclosedCloseable:
>+		case IProblem.UnclosedCloseableAtExit:
>+			return CompilerOptions.UnclosedCloseable;
>+		case IProblem.PotentiallyUnclosedCloseable:
>+		case IProblem.PotentiallyUnclosedCloseableAtExit:
>+			return CompilerOptions.PotentiallyUnclosedCloseable;
>+		case IProblem.ExplicitlyClosedAutoCloseable:
>+			return CompilerOptions.ExplicitlyClosedAutoCloseable;
> 				
> 		case IProblem.RedundantSpecificationOfTypeArguments:
> 			return CompilerOptions.RedundantSpecificationOfTypeArguments;
>@@ -461,6 +500,7 @@
> 			case CompilerOptions.ParameterAssignment :
> 			case CompilerOptions.MethodCanBeStatic :
> 			case CompilerOptions.MethodCanBePotentiallyStatic :
>+			case CompilerOptions.ExplicitlyClosedAutoCloseable :
> 				return CategorizedProblem.CAT_CODE_STYLE;
> 
> 			case CompilerOptions.MaskedCatchBlock :
>@@ -482,6 +522,8 @@
> 			case CompilerOptions.ShouldImplementHashcode :
> 			case CompilerOptions.DeadCode :
> 			case CompilerOptions.UnusedObjectAllocation :
>+			case CompilerOptions.UnclosedCloseable :
>+			case CompilerOptions.PotentiallyUnclosedCloseable :
> 				return CategorizedProblem.CAT_POTENTIAL_PROGRAMMING_PROBLEM;
> 			
> 			case CompilerOptions.OverriddenPackageDefaultMethod :
>@@ -527,7 +569,14 @@
> 			case CompilerOptions.ForbiddenReference :
> 			case CompilerOptions.DiscouragedReference :
> 				return CategorizedProblem.CAT_RESTRICTION;
>-			
>+
>+			case CompilerOptions.NullSpecViolation :
>+			case CompilerOptions.PotentialNullSpecViolation :
>+			case CompilerOptions.NullSpecInsufficientInfo :
>+				return CategorizedProblem.CAT_POTENTIAL_PROGRAMMING_PROBLEM;
>+			case CompilerOptions.RedundantNullAnnotation :
>+				return CategorizedProblem.CAT_UNNECESSARY_CODE;
>+
> 			default:
> 				break categorizeOnIrritant;
> 		}
>@@ -2849,12 +2898,21 @@
> 					expression.sourceStart,
> 					expression.sourceEnd);
> 		} else {
>-			this.handle(
>-				IProblem.IncorrectSwitchType,
>-				new String[] {new String(testType.readableName())},
>-				new String[] {new String(testType.shortReadableName())},
>-				expression.sourceStart,
>-				expression.sourceEnd);
>+			if (this.options.sourceLevel < ClassFileConstants.JDK1_5 && testType.isEnum()) {
>+				this.handle(
>+						IProblem.SwitchOnEnumNotBelow15,
>+						new String[] {new String(testType.readableName())},
>+						new String[] {new String(testType.shortReadableName())},
>+						expression.sourceStart,
>+						expression.sourceEnd);
>+			} else {
>+				this.handle(
>+						IProblem.IncorrectSwitchType,
>+						new String[] {new String(testType.readableName())},
>+						new String[] {new String(testType.shortReadableName())},
>+						expression.sourceStart,
>+						expression.sourceEnd);
>+			}
> 		}
> 	} else {
> 		this.handle(
>@@ -3214,6 +3272,27 @@
> 				        typesAsString(shownConstructor, true),
> 				        new String(shownConstructor.declaringClass.shortReadableName()),
> 				        typesAsString(targetConstructor, true) },
>+				sourceStart,
>+				sourceEnd);
>+			return;
>+		case ProblemReasons.VarargsElementTypeNotVisible :
>+			problemConstructor = (ProblemMethodBinding) targetConstructor;
>+			shownConstructor = problemConstructor.closestMatch;
>+			TypeBinding varargsElementType = shownConstructor.parameters[shownConstructor.parameters.length - 1].leafComponentType();
>+			this.handle(
>+				IProblem.VarargsElementTypeNotVisibleForConstructor,
>+				new String[] {
>+						new String(shownConstructor.declaringClass.sourceName()),
>+						typesAsString(shownConstructor, false),
>+						new String(shownConstructor.declaringClass.readableName()),
>+						new String(varargsElementType.readableName())
>+				},
>+				new String[] {
>+						new String(shownConstructor.declaringClass.sourceName()),
>+						typesAsString(shownConstructor, true),
>+						new String(shownConstructor.declaringClass.shortReadableName()),
>+						new String(varargsElementType.shortReadableName())
>+				},
> 				sourceStart,
> 				sourceEnd);
> 			return;
>@@ -3700,6 +3779,29 @@
> 				        typesAsString(shownMethod, true),
> 				        new String(shownMethod.declaringClass.shortReadableName()),
> 				        typesAsString(method, true) },
>+				(int) (messageSend.nameSourcePosition >>> 32),
>+				(int) messageSend.nameSourcePosition);
>+			return;
>+		case ProblemReasons.VarargsElementTypeNotVisible: // https://bugs.eclipse.org/bugs/show_bug.cgi?id=346042
>+			problemMethod = (ProblemMethodBinding) method;
>+			if (problemMethod.closestMatch != null) {
>+			    shownMethod = problemMethod.closestMatch.original();
>+		    }
>+			TypeBinding varargsElementType = shownMethod.parameters[shownMethod.parameters.length - 1].leafComponentType();
>+			this.handle(
>+				IProblem.VarargsElementTypeNotVisible,
>+				new String[] {
>+				        new String(shownMethod.selector),
>+				        typesAsString(shownMethod, false),
>+				        new String(shownMethod.declaringClass.readableName()),
>+				        new String(varargsElementType.readableName())
>+				},
>+				new String[] {
>+				        new String(shownMethod.selector),
>+				        typesAsString(shownMethod, true),
>+				        new String(shownMethod.declaringClass.shortReadableName()),
>+				        new String(varargsElementType.shortReadableName())
>+				},
> 				(int) (messageSend.nameSourcePosition >>> 32),
> 				(int) messageSend.nameSourcePosition);
> 			return;
>@@ -7497,7 +7599,9 @@
> 
> 	int severity = computeSeverity(IProblem.UnusedPrivateConstructor);
> 	if (severity == ProblemSeverities.Ignore) return;
>-
>+	
>+	if (excludeDueToAnnotation(constructorDecl.annotations)) return;
>+	
> 	MethodBinding constructor = constructorDecl.binding;
> 	this.handle(
> 			IProblem.UnusedPrivateConstructor,
>@@ -7543,6 +7647,7 @@
> 			}
> 		}
> 	}
>+	if (excludeDueToAnnotation(fieldDecl.annotations)) return;
> 	this.handle(
> 			IProblem.UnusedPrivateField,
> 		new String[] {
>@@ -7596,10 +7701,8 @@
> 			&& CharOperation.equals(method.selector, TypeConstants.WRITEREPLACE)) {
> 		return;
> 	}
>-	if ((method.tagBits & (TagBits.AnnotationPostConstruct | TagBits.AnnotationPreDestroy)) != 0) {
>-		// PostConstruct and PreDestroy method are ignored
>-		return;
>-	}
>+	if (excludeDueToAnnotation(methodDecl.annotations)) return;
>+	
> 	this.handle(
> 			IProblem.UnusedPrivateMethod,
> 		new String[] {
>@@ -7616,10 +7719,43 @@
> 		methodDecl.sourceStart,
> 		methodDecl.sourceEnd);
> }
>+
>+/**
>+ * Returns true if a private member should not be warned as unused if
>+ * annotated with a non-standard annotation.
>+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=365437
>+ */
>+private boolean excludeDueToAnnotation(Annotation[] annotations) {
>+	int annotationsLen = 0;
>+	if (annotations != null) {
>+		annotationsLen = annotations.length;
>+	} else {
>+		return false;
>+	}
>+	if (annotationsLen == 0) return false;
>+	for (int i = 0; i < annotationsLen; i++) {
>+		TypeBinding resolvedType = annotations[i].resolvedType;
>+		if (resolvedType != null) {
>+			switch (resolvedType.id) {
>+				case TypeIds.T_JavaLangSuppressWarnings:
>+				case TypeIds.T_JavaLangDeprecated:
>+				case TypeIds.T_JavaLangSafeVarargs:
>+				case TypeIds.T_ConfiguredAnnotationNonNull:
>+				case TypeIds.T_ConfiguredAnnotationNullable:
>+				case TypeIds.T_ConfiguredAnnotationNonNullByDefault:
>+					break;
>+				default:
>+					// non-standard annotation found, don't warn
>+					return true;
>+			}
>+		}
>+	}
>+	return false;
>+}
> public void unusedPrivateType(TypeDeclaration typeDecl) {
> 	int severity = computeSeverity(IProblem.UnusedPrivateType);
> 	if (severity == ProblemSeverities.Ignore) return;
>-
>+	if (excludeDueToAnnotation(typeDecl.annotations)) return;
> 	ReferenceBinding type = typeDecl.binding;
> 	this.handle(
> 			IProblem.UnusedPrivateType,
>@@ -7931,4 +8067,256 @@
> 			location.sourceEnd);
>     }
> }
>-}
>\ No newline at end of file
>+public void potentiallyUnclosedCloseable(FakedTrackingVariable trackVar, ASTNode location) {
>+	String[] args = { String.valueOf(trackVar.name) };
>+	if (location == null) {
>+		this.handle(
>+			IProblem.PotentiallyUnclosedCloseable,
>+			args,
>+			args,
>+			trackVar.sourceStart,
>+			trackVar.sourceEnd);
>+	} else {
>+		this.handle(
>+			IProblem.PotentiallyUnclosedCloseableAtExit,
>+			args,
>+			args,
>+			location.sourceStart,
>+			location.sourceEnd);
>+	}
>+}
>+public void unclosedCloseable(FakedTrackingVariable trackVar, ASTNode location) {
>+	String[] args = { String.valueOf(trackVar.name) };
>+	if (location == null) {
>+		this.handle(
>+			IProblem.UnclosedCloseable,
>+			args,
>+			args,
>+			trackVar.sourceStart,
>+			trackVar.sourceEnd);
>+	} else {
>+		this.handle(
>+			IProblem.UnclosedCloseableAtExit,
>+			args,
>+			args,
>+			location.sourceStart,
>+			location.sourceEnd);
>+	}
>+}
>+public void explicitlyClosedAutoCloseable(FakedTrackingVariable trackVar) {
>+	String[] args = { String.valueOf(trackVar.name) };
>+	this.handle(
>+		IProblem.ExplicitlyClosedAutoCloseable,
>+		args,
>+		args,
>+		trackVar.sourceStart,
>+		trackVar.sourceEnd);	
>+}
>+
>+public void nullityMismatch(Expression expression, TypeBinding requiredType, int nullStatus, char[][] annotationName) {
>+	int problemId = IProblem.RequiredNonNullButProvidedUnknown;
>+	if ((nullStatus & FlowInfo.NULL) != 0)
>+		problemId = IProblem.RequiredNonNullButProvidedNull;
>+	if ((nullStatus & FlowInfo.POTENTIALLY_NULL) != 0)
>+		problemId = IProblem.RequiredNonNullButProvidedPotentialNull;
>+	String[] arguments = new String[] {
>+			String.valueOf(CharOperation.concatWith(annotationName, '.')),
>+			String.valueOf(requiredType.readableName())
>+	};
>+	String[] argumentsShort = new String[] {
>+			String.valueOf(annotationName[annotationName.length-1]),
>+			String.valueOf(requiredType.shortReadableName())
>+	};
>+	this.handle(
>+		problemId,
>+		arguments,
>+		argumentsShort,
>+		expression.sourceStart,
>+		expression.sourceEnd);
>+}
>+public void illegalRedefinitionToNonNullParameter(Argument argument, ReferenceBinding declaringClass, char[][] inheritedAnnotationName) {
>+	int sourceStart = argument.type.sourceStart;
>+	if (argument.annotations != null) {
>+		for (int i=0; i<argument.annotations.length; i++) {
>+			Annotation annotation = argument.annotations[i];
>+			if (   annotation.resolvedType.id == TypeIds.T_ConfiguredAnnotationNullable
>+				|| annotation.resolvedType.id == TypeIds.T_ConfiguredAnnotationNonNull)
>+			{
>+				sourceStart = annotation.sourceStart;
>+				break;
>+			}
>+		}
>+	}
>+	if (inheritedAnnotationName == null) {
>+		this.handle(
>+			IProblem.IllegalDefinitionToNonNullParameter, 
>+			new String[] { new String(argument.name), new String(declaringClass.readableName()) },
>+			new String[] { new String(argument.name), new String(declaringClass.shortReadableName()) },
>+			sourceStart,
>+			argument.type.sourceEnd);
>+	} else {
>+		this.handle(
>+			IProblem.IllegalRedefinitionToNonNullParameter, 
>+			new String[] { new String(argument.name), new String(declaringClass.readableName()), CharOperation.toString(inheritedAnnotationName)},
>+			new String[] { new String(argument.name), new String(declaringClass.shortReadableName()), new String(inheritedAnnotationName[inheritedAnnotationName.length-1])},
>+			sourceStart,
>+			argument.type.sourceEnd);
>+	}
>+}
>+public void parameterLackingNullAnnotation(Argument argument, ReferenceBinding declaringClass, boolean needNonNull, char[][] inheritedAnnotationName) {
>+	this.handle(
>+		needNonNull ? IProblem.ParameterLackingNonNullAnnotation : IProblem.ParameterLackingNullableAnnotation, 
>+		new String[] { new String(argument.name), new String(declaringClass.readableName()), CharOperation.toString(inheritedAnnotationName)},
>+		new String[] { new String(argument.name), new String(declaringClass.shortReadableName()), new String(inheritedAnnotationName[inheritedAnnotationName.length-1])},
>+		argument.type.sourceStart,
>+		argument.type.sourceEnd);
>+}
>+public void illegalReturnRedefinition(AbstractMethodDeclaration abstractMethodDecl,
>+									  MethodBinding inheritedMethod, char[][] nonNullAnnotationName)
>+{
>+	MethodDeclaration methodDecl = (MethodDeclaration) abstractMethodDecl;
>+	StringBuffer methodSignature = new StringBuffer();
>+	methodSignature
>+		.append(inheritedMethod.declaringClass.readableName())
>+		.append('.')
>+		.append(inheritedMethod.readableName());
>+
>+	StringBuffer shortSignature = new StringBuffer();
>+	shortSignature
>+		.append(inheritedMethod.declaringClass.shortReadableName())
>+		.append('.')
>+		.append(inheritedMethod.shortReadableName());
>+	int sourceStart = methodDecl.returnType.sourceStart;
>+	Annotation[] annotations = methodDecl.annotations;
>+	Annotation annotation = findAnnotation(annotations, TypeIds.T_ConfiguredAnnotationNullable);
>+	if (annotation != null) {
>+		sourceStart = annotation.sourceStart;
>+	}
>+	this.handle(
>+		IProblem.IllegalReturnNullityRedefinition, 
>+		new String[] { methodSignature.toString(), CharOperation.toString(nonNullAnnotationName)},
>+		new String[] { shortSignature.toString(), new String(nonNullAnnotationName[nonNullAnnotationName.length-1])},
>+		sourceStart,
>+		methodDecl.returnType.sourceEnd);
>+}
>+public void messageSendPotentialNullReference(MethodBinding method, ASTNode location) {
>+	String[] arguments = new String[] {new String(method.readableName())};
>+	this.handle(
>+		IProblem.PotentialNullMessageSendReference,
>+		arguments,
>+		arguments,
>+		location.sourceStart,
>+		location.sourceEnd);
>+}
>+public void messageSendRedundantCheckOnNonNull(MethodBinding method, ASTNode location) {
>+	String[] arguments = new String[] {new String(method.readableName())  };
>+	this.handle(
>+		IProblem.RedundantNullCheckOnNonNullMessageSend,
>+		arguments,
>+		arguments,
>+		location.sourceStart,
>+		location.sourceEnd);
>+}
>+
>+public void cannotImplementIncompatibleNullness(MethodBinding currentMethod, MethodBinding inheritedMethod) {
>+	int sourceStart = 0, sourceEnd = 0;
>+	if (this.referenceContext instanceof TypeDeclaration) {
>+		sourceStart = ((TypeDeclaration) this.referenceContext).sourceStart;
>+		sourceEnd =   ((TypeDeclaration) this.referenceContext).sourceEnd;
>+	}
>+	String[] problemArguments = {
>+			new String(currentMethod.readableName()),
>+			new String(currentMethod.declaringClass.readableName()),
>+			new String(inheritedMethod.declaringClass.readableName())
>+		};
>+	String[] messageArguments = {
>+			new String(currentMethod.shortReadableName()),
>+			new String(currentMethod.declaringClass.shortReadableName()),
>+			new String(inheritedMethod.declaringClass.shortReadableName())
>+		};
>+	this.handle(
>+			IProblem.CannotImplementIncompatibleNullness,
>+			problemArguments,
>+			messageArguments,
>+			sourceStart,
>+			sourceEnd);
>+}
>+
>+public void nullAnnotationIsRedundant(AbstractMethodDeclaration sourceMethod, int i) {
>+	int sourceStart, sourceEnd;
>+	if (i == -1) {
>+		MethodDeclaration methodDecl = (MethodDeclaration) sourceMethod;
>+		Annotation annotation = findAnnotation(methodDecl.annotations, TypeIds.T_ConfiguredAnnotationNonNull);
>+		sourceStart = annotation != null ? annotation.sourceStart : methodDecl.returnType.sourceStart;
>+		sourceEnd = methodDecl.returnType.sourceEnd;
>+	} else {
>+		Argument arg = sourceMethod.arguments[i];
>+		sourceStart = arg.declarationSourceStart;
>+		sourceEnd = arg.sourceEnd;
>+	}
>+	this.handle(IProblem.RedundantNullAnnotation, ProblemHandler.NoArgument, ProblemHandler.NoArgument, sourceStart, sourceEnd);
>+}
>+
>+public void nullDefaultAnnotationIsRedundant(ASTNode location, Annotation[] annotations, Binding outer) {
>+	Annotation annotation = findAnnotation(annotations, TypeIds.T_ConfiguredAnnotationNonNullByDefault);
>+	int start = annotation != null ? annotation.sourceStart : location.sourceStart;
>+	int end = annotation != null ? annotation.sourceEnd : location.sourceStart;
>+	String[] args = NoArgument;
>+	String[] shortArgs = NoArgument;
>+	if (outer != null) {
>+		args = new String[] { new String(outer.readableName()) };
>+		shortArgs = new String[] { new String(outer.shortReadableName()) };
>+	}
>+	int problemId = IProblem.RedundantNullDefaultAnnotation;
>+	if (outer instanceof PackageBinding) {
>+		problemId = IProblem.RedundantNullDefaultAnnotationPackage;
>+	} else if (outer instanceof ReferenceBinding) {
>+		problemId = IProblem.RedundantNullDefaultAnnotationType;
>+	} else if (outer instanceof MethodBinding) {
>+		problemId = IProblem.RedundantNullDefaultAnnotationMethod;
>+	}
>+	this.handle(problemId, args, shortArgs, start, end);
>+}
>+
>+public void contradictoryNullAnnotations(Annotation annotation) {
>+	// when this error is triggered we can safely assume that both annotations have been configured
>+	char[][] nonNullAnnotationName = this.options.nonNullAnnotationName;
>+	char[][] nullableAnnotationName = this.options.nullableAnnotationName;
>+	String[] arguments = {
>+		new String(CharOperation.concatWith(nonNullAnnotationName, '.')),
>+		new String(CharOperation.concatWith(nullableAnnotationName, '.'))
>+	};
>+	String[] shortArguments = {
>+			new String(nonNullAnnotationName[nonNullAnnotationName.length-1]),
>+			new String(nullableAnnotationName[nullableAnnotationName.length-1])
>+		};
>+	this.handle(IProblem.ContradictoryNullAnnotations, arguments, shortArguments, annotation.sourceStart, annotation.sourceEnd);
>+}
>+
>+public void illegalAnnotationForBaseType(TypeReference type, Annotation[] annotations, char[] annotationName, long nullAnnotationTagBit)
>+{
>+	int typeId = (nullAnnotationTagBit == TagBits.AnnotationNullable) 
>+			? TypeIds.T_ConfiguredAnnotationNullable : TypeIds.T_ConfiguredAnnotationNonNull;
>+	String[] args = new String[] { new String(annotationName), new String(type.getLastToken()) };
>+	Annotation annotation = findAnnotation(annotations, typeId);
>+	int start = annotation != null ? annotation.sourceStart : type.sourceStart;
>+	this.handle(IProblem.IllegalAnnotationForBaseType,
>+			args,
>+			args,
>+			start,
>+			type.sourceEnd);
>+}
>+
>+private Annotation findAnnotation(Annotation[] annotations, int typeId) {
>+	if (annotations != null) {
>+		// should have a @NonNull/@Nullable annotation, search for it:
>+		int length = annotations.length;
>+		for (int j=0; j<length; j++) {
>+			if (annotations[j].resolvedType != null && annotations[j].resolvedType.id == typeId) {
>+				return annotations[j];
>+			}
>+		}
>+	}
>+	return null;
>+}
>+}
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties
>index 2193910..265efae 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties
>@@ -8,7 +8,12 @@
> # Contributors:
> #     IBM Corporation - initial API and implementation
> #		Benjamin Muskalla - Contribution for bug 239066
>-#		Stephan Herrmann <stephan@cs.tu-berlin.de> - Contribution for bug 185682 - Increment/decrement operators mark local variables as read
>+#		Stephan Herrmann <stephan@cs.tu-berlin.de> - Contributions for 
>+#							bug 185682 - Increment/decrement operators mark local variables as read
>+#							bug 349326 - [1.7] new warning for missing try-with-resources
>+#							bug 186342 - [compiler][null] Using annotations for null checking
>+#							bug 365662 - [compiler][null] warn on contradictory and redundant null annotations
>+#							bug 365531 - [compiler][null] investigate alternative strategy for internally encoding nullness defaults
> ###############################################################################
> 0 = {0}
> 1 = super cannot be used in java.lang.Object
>@@ -143,7 +148,7 @@
> 162 = Cannot return from within an initializer
> 163 = Initializer does not complete normally
> 164 = Expression must return a value
>-165 = Unreachable catch block for {0}. Only more specific exceptions are thrown and handled by previous catch block(s).
>+165 = Unreachable catch block for {0}. Only more specific exceptions are thrown and they are handled by previous catch block(s).
> 166 = The default case is already defined
> 167 = Unreachable catch block for {0}. This exception is never thrown from the try statement body
> 168 = Unhandled exception type {0}
>@@ -287,7 +292,7 @@
> 343 = Illegal modifier for the interface field {0}.{1}; only public, static & final are permitted
> 344 = The field {0} can only set one of public / protected / private
> 345 = The field {0} can be either final or volatile, not both
>-346 = The field {0} cannot be declared static; static fields can only be declared in static or top level types
>+346 = The field {0} cannot be declared static in a non-static inner type, unless initialized with a constant expression
> 
> ###[obsolete] 350 = {2} cannot be resolved (or is not a valid type) for the field {1}.{0}
> ###[obsolete] 351 = The type {2} is not visible for the field {1}.{0}
>@@ -615,6 +620,8 @@
> 804 = @SafeVarargs annotation cannot be applied to fixed arity method {0}
> 805 = @SafeVarargs annotation cannot be applied to non-final instance method {0}
> 806 = Type safety: Potential heap pollution via varargs parameter {0}
>+807 = The method {0}({1}) of type {2} is not applicable as the formal varargs element type {3} is not accessible here
>+808 = The constructor {0}({1}) of type {2} is not applicable as the formal varargs element type {3} is not accessible here
> 
> ### GENERIC JAVADOC
> 850 = Bound mismatch: The generic method {0}({1}) of type {2} is not applicable for the arguments ({3}). The inferred type {4} is not a valid substitute for the bounded parameter <{5} extends {6}>
>@@ -644,6 +651,33 @@
> 882 = Unhandled exception type {0} thrown by automatic close() invocation on {1}
> 883 = '<>' operator is not allowed for source level below 1.7
> 884 = Redundant specification of type arguments <{0}>
>+885 = Potential resource leak: ''{0}'' may not be closed
>+886 = Potential resource leak: ''{0}'' may not be closed at this location
>+887 = Resource leak: ''{0}'' is never closed
>+888 = Resource leak: ''{0}'' is not closed at this location
>+889 = Resource ''{0}'' should be managed by try-with-resource
>+890 = Cannot switch on an enum value for source level below 1.5. Only convertible int values are permitted
>+
>+### NULL ANNOTATIONS
>+910 = Type mismatch: required ''@{0} {1}'' but the provided value is null
>+911 = Type mismatch: required ''@{0} {1}'' but the provided value can be null
>+912 = Potential type mismatch: required ''@{0} {1}'' but nullness of the provided value is unknown
>+#913 removed
>+914 = The return type is incompatible with the @{1} return from {0}
>+915 = Illegal redefinition of parameter {0}, inherited method from {1} declares this parameter as @{2}
>+916 = Illegal redefinition of parameter {0}, inherited method from {1} does not constrain this parameter
>+917 = Missing non-null annotation: inherited method from {1} declares this parameter as @{2}
>+918 = Missing nullable annotation: inherited method from {1} declares this parameter as @{2}
>+919 = Potential null pointer access: The method {0} may return null
>+920 = Redundant null check: The method {0} cannot return null
>+921 = The method {0} from {1} cannot implement the corresponding method from {2} due to incompatible nullness constraints
>+922 = The nullness annotation is redundant with a default that applies to this location
>+923 = The nullness annotation @{0} is not applicable for the primitive type {1}
>+925 = Nullness default is redundant with the global default
>+926 = Nullness default is redundant with a default specified for the enclosing package {0}
>+927 = Nullness default is redundant with a default specified for the enclosing type {0}
>+928 = Nullness default is redundant with a default specified for the enclosing method {0}
>+929 = Contradictory null specification; only one of @{0} and @{1} can be specified at any location
> 
> ### ELABORATIONS
> ## Access restrictions
>diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java
>index 155a979..24f96ab 100644
>--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java
>+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -102,6 +102,7 @@
> 
> 	/**
> 	 * Constant for indicating the AST API that handles JLS2.
>+	 * <p>
> 	 * This API is capable of handling all constructs
> 	 * in the Java language as described in the Java Language
>      * Specification, Second Edition (JLS2).
>@@ -109,6 +110,7 @@
>      * Java language, and the JLS2 API can be used to manipulate
>      * programs written in all versions of the Java language
>      * up to and including J2SE 1.4.
>+     * </p>
>      *
> 	 * @since 3.0
> 	 * @deprecated Clients should use the {@link #JLS4} AST API instead.
>@@ -124,6 +126,7 @@
> 	
> 	/**
> 	 * Constant for indicating the AST API that handles JLS3.
>+	 * <p>
> 	 * This API is capable of handling all constructs in the
> 	 * Java language as described in the Java Language
> 	 * Specification, Third Edition (JLS3).
>@@ -131,21 +134,23 @@
>      * Java language, and the JLS3 API can be used to manipulate
>      * programs written in all versions of the Java language
>      * up to and including J2SE 5 (aka JDK 1.5).
>+     * </p>
>      *
> 	 * @since 3.1
> 	 */
> 	public static final int JLS3 = 3;
> 
> 	/**
>-	 * Constant for indicating the AST API that handles JLS4.
>+	 * Constant for indicating the AST API that handles JLS4 (aka JLS7).
>+	 * <p>
> 	 * This API is capable of handling all constructs in the
> 	 * Java language as described in the Java Language
>-	 * Specification, Third Edition (JLS3) plus all the new language
>-	 * features described in the JSR334.
>+	 * Specification, Java SE 7 Edition (JLS7) as specified by JSR336.
> 	 * JLS4 is a superset of all earlier versions of the
> 	 * Java language, and the JLS4 API can be used to manipulate
> 	 * programs written in all versions of the Java language
>-	 * up to and including J2SE 7 (aka JDK 1.7).
>+	 * up to and including Java SE 7 (aka JDK 1.7).
>+	 * </p>
> 	 *
> 	 * @since 3.7.1
> 	 */
>@@ -163,7 +168,7 @@
> 	 * into a compilation unit. This method is not intended to be called by clients.
> 	 * </p>
> 	 *
>- 	 * @param level the API level; one of the LEVEL constants
>+ 	 * @param level the API level; one of the <code>JLS*</code> level constants
> 	 * @param compilationUnitDeclaration an internal AST node for a compilation unit declaration
> 	 * @param source the string of the Java compilation unit
> 	 * @param options compiler options
>@@ -194,7 +199,7 @@
> 	 * into a compilation unit. This method is not intended to be called by clients.
> 	 * </p>
> 	 *
>- 	 * @param level the API level; one of the LEVEL constants
>+ 	 * @param level the API level; one of the <code>JLS*</code> level constants
> 	 * @param compilationUnitDeclaration an internal AST node for a compilation unit declaration
> 	 * @param options compiler options
> 	 * @param workingCopy the working copy that the AST is created from
>@@ -245,11 +250,11 @@
>      * AST level in all cases, even when dealing with source of earlier JDK versions like 1.3 or 1.4.
>      * </p>
>      *
>- 	 * @param level the API level; one of the LEVEL constants
>+ 	 * @param level the API level; one of the <code>JLS*</code> level constants
> 	 * @return new AST instance following the specified set of API rules.
> 	 * @exception IllegalArgumentException if:
> 	 * <ul>
>-	 * <li>the API level is not one of the LEVEL constants</li>
>+	 * <li>the API level is not one of the <code>JLS*</code> level constants</li>
> 	 * </ul>
>      * @since 3.0
> 	 */
>@@ -632,7 +637,7 @@
> 	 * Creates a new Java abstract syntax tree
>      * (AST) following the specified set of API rules.
>      *
>- 	 * @param level the API level; one of the JLS* level constants
>+ 	 * @param level the API level; one of the <code>JLS*</code> level constants
>      * @since 3.0
> 	 */
> 	private AST(int level) {
>@@ -727,7 +732,7 @@
> 	/**
> 	 * Return the API level supported by this AST.
> 	 *
>-	 * @return level the API level; one of the <code>JLS*</code>LEVEL
>+	 * @return level the API level; one of the <code>JLS*</code> level constants
>      * declared on <code>AST</code>; assume this set is open-ended
>      * @since 3.0
> 	 */
>@@ -1060,7 +1065,6 @@
> 	 * <ul>
> 	 * <li>the node belongs to a different AST</li>
> 	 * <li>the node already has a parent</li>
>-	 * <li>a cycle in would be created</li>
> 	 * </ul>
> 	 */
> 	public ArrayType newArrayType(Type componentType) {
>@@ -1071,28 +1075,26 @@
> 
> 	/**
> 	 * Creates and returns a new unparented array type node with the given
>-	 * element type and number of dimensions.
>+	 * element type and number of (additional) dimensions.
> 	 * <p>
> 	 * Note that if the element type passed in is an array type, the
> 	 * element type of the result will not be the same as what was passed in.
> 	 * </p>
> 	 *
>-	 * @param elementType the element type (never an array type)
>+	 * @param elementType the element type (can be an array type)
> 	 * @param dimensions the number of dimensions, a positive number
> 	 * @return a new unparented array type node
> 	 * @exception IllegalArgumentException if:
> 	 * <ul>
> 	 * <li>the node belongs to a different AST</li>
> 	 * <li>the node already has a parent</li>
>-	 * <li>a cycle in would be created</li>
> 	 * <li>the element type is null</li>
>-	 * <li>the element type is an array type</li>
> 	 * <li>the number of dimensions is lower than 1</li>
> 	 * <li>the number of dimensions is greater than 1000</li>
> 	 * </ul>
> 	 */
> 	public ArrayType newArrayType(Type elementType, int dimensions) {
>-		if (elementType == null || elementType.isArrayType()) {
>+		if (elementType == null) {
> 			throw new IllegalArgumentException();
> 		}
> 		if (dimensions < 1 || dimensions > 1000) {
>@@ -1386,7 +1388,6 @@
> 	 * <ul>
> 	 * <li>the node belongs to a different AST</li>
> 	 * <li>the node already has a parent</li>
>-	 * <li>a cycle in would be created</li>
> 	 * </ul>
> 	 */
> 	public ExpressionStatement newExpressionStatement(Expression expression) {
>@@ -1426,7 +1427,6 @@
> 	 * <ul>
> 	 * <li>the node belongs to a different AST</li>
> 	 * <li>the node already has a parent</li>
>-	 * <li>a cycle in would be created</li>
> 	 * <li>the given fragment is null</li>
> 	 * </ul>
> 	 */
>@@ -2271,7 +2271,6 @@
> 	 * <ul>
> 	 * <li>the node belongs to a different AST</li>
> 	 * <li>the node already has a parent</li>
>-	 * <li>a cycle in would be created</li>
> 	 * </ul>
> 	 * @since 3.0
> 	 */
>@@ -2302,7 +2301,6 @@
> 	 * <ul>
> 	 * <li>the node belongs to a different AST</li>
> 	 * <li>the node already has a parent</li>
>-	 * <li>a cycle in would be created</li>
> 	 * </ul>
> 	 */
> 	public TypeDeclarationStatement
>@@ -2355,9 +2353,7 @@
> 	 * <ul>
> 	 * <li>the node belongs to a different AST</li>
> 	 * <li>the node already has a parent</li>
>-	 * <li>a cycle in would be created</li>
> 	 * <li>the given fragment is null</li>
>-	 * <li>a cycle in would be created</li>
> 	 * </ul>
> 	 */
> 	public VariableDeclarationExpression
>@@ -2402,7 +2398,6 @@
> 	 * <ul>
> 	 * <li>the node belongs to a different AST</li>
> 	 * <li>the node already has a parent</li>
>-	 * <li>a cycle in would be created</li>
> 	 * <li>the variable declaration fragment is null</li>
> 	 * </ul>
> 	 */
>diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTParser.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTParser.java
>index 714e6db..2faa9b2 100644
>--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTParser.java
>+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTParser.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2011 IBM Corporation and others.
>+ * Copyright (c) 2004, 2012 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
>@@ -117,8 +117,8 @@
> 	 * Creates a new object for creating a Java abstract syntax tree
>      * (AST) following the specified set of API rules.
>      *
>- 	 * @param level the API level; one of the LEVEL constants
>-     * declared on <code>AST</code>
>+ 	 * @param level the API level; one of the <code>.JLS*</code> level constants
>+     * declared on {@link AST}
> 	 * @return new ASTParser instance
> 	 */
> 	public static ASTParser newParser(int level) {
>@@ -213,8 +213,8 @@
> 	 * N.B. This constructor is package-private.
> 	 * </p>
> 	 *
>-	 * @param level the API level; one of the LEVEL constants
>-	 * declared on <code>AST</code>
>+	 * @param level the API level; one of the <code>JLS*</code> level constants
>+	 * declared on {@link AST}
> 	 */
> 	ASTParser(int level) {
> 		switch(level) {
>diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnit.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnit.java
>index 3765130..e599f9f 100644
>--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnit.java
>+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnit.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -867,7 +867,7 @@
> 
> 	/**
> 	 * Enables the recording of changes to this compilation
>-	 * unit and its descendents. The compilation unit must have
>+	 * unit and its descendants. The compilation unit must have
> 	 * been created by <code>ASTParser</code> and still be in
> 	 * its original state. Once recording is on,
> 	 * arbitrary changes to the subtree rooted at this compilation
>diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnitResolver.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnitResolver.java
>index 0fdbd0a..00b8222 100644
>--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnitResolver.java
>+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnitResolver.java
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Stephan Herrmann - Contribution for bug 363858 - [dom] early throwing of AbortCompilation causes NPE in CompilationUnitResolver
>  *******************************************************************************/
> package org.eclipse.jdt.core.dom;
> 
>@@ -99,6 +100,7 @@
> 	DefaultBindingResolver.BindingTables bindingTables;
> 
> 	boolean hasCompilationAborted;
>+	CategorizedProblem abortProblem;
> 
> 	private IProgressMonitor monitor;
> 	
>@@ -364,6 +366,7 @@
> 			removeUnresolvedBindings(unit);
> 		}
> 		this.hasCompilationAborted = true;
>+		this.abortProblem = abortException.problem;
> 	}
> 
> 	public static void parse(ICompilationUnit[] compilationUnits, ASTRequestor astRequestor, int apiLevel, Map options, int flags, IProgressMonitor monitor) {
>@@ -689,11 +692,16 @@
> 				// the bindings could not be resolved due to missing types in name environment
> 				// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=86541
> 				CompilationUnitDeclaration unitDeclaration = parse(sourceUnit, nodeSearcher, options, flags);
>-				final int problemCount = unit.compilationResult.problemCount;
>-				if (problemCount != 0) {
>-					unitDeclaration.compilationResult.problems = new CategorizedProblem[problemCount];
>-					System.arraycopy(unit.compilationResult.problems, 0, unitDeclaration.compilationResult.problems, 0, problemCount);
>-					unitDeclaration.compilationResult.problemCount = problemCount;
>+				if (unit != null) {
>+					final int problemCount = unit.compilationResult.problemCount;
>+					if (problemCount != 0) {
>+						unitDeclaration.compilationResult.problems = new CategorizedProblem[problemCount];
>+						System.arraycopy(unit.compilationResult.problems, 0, unitDeclaration.compilationResult.problems, 0, problemCount);
>+						unitDeclaration.compilationResult.problemCount = problemCount;
>+					}
>+				} else if (resolver.abortProblem != null) {
>+					unitDeclaration.compilationResult.problemCount = 1;
>+					unitDeclaration.compilationResult.problems = new CategorizedProblem[] { resolver.abortProblem };
> 				}
> 				return unitDeclaration;
> 			}
>diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java
>index fcb5eb5..18a231a 100644
>--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java
>+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DefaultBindingResolver.java
>@@ -1384,7 +1384,7 @@
> 			org.eclipse.jdt.internal.compiler.ast.ASTNode node = (org.eclipse.jdt.internal.compiler.ast.ASTNode) this.newAstToOldAst.get(pkg);
> 			if (node instanceof ImportReference) {
> 				ImportReference importReference = (ImportReference) node;
>-				Binding binding = this.scope.getTypeOrPackage(CharOperation.subarray(importReference.tokens, 0, importReference.tokens.length));
>+				Binding binding = this.scope.getOnlyPackage(CharOperation.subarray(importReference.tokens, 0, importReference.tokens.length));
> 				if ((binding != null) && (binding.isValidBinding())) {
> 					if (binding instanceof ReferenceBinding) {
> 						// this only happens if a type name has the same name as its package
>diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TryStatement.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TryStatement.java
>index bd85911..79575e1 100644
>--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TryStatement.java
>+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TryStatement.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTRewrite.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTRewrite.java
>index ce07ee7..a8add6a 100644
>--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTRewrite.java
>+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTRewrite.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2010 IBM Corporation and others.
>+ * Copyright (c) 2004, 2012 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
>@@ -692,9 +692,10 @@
> 
> 	/**
> 	 * Creates and returns a placeholder node for the new locations of the given node.
>-	 * After obtaining a placeholder, the node should then to be removed or replaced.
>+	 * After obtaining a placeholder, the node must be removed or replaced.
> 	 * The placeholder node can either be inserted as new or used to replace an
>-	 * existing node. When the document is rewritten, the source code for the given
>+	 * existing node. The placeholder must be used somewhere in the AST and must not be dropped
>+	 * by subsequent modifications. When the document is rewritten, the source code for the given
> 	 * node is inserted into the output document at the position corresponding to the
> 	 * placeholder (indentation is adjusted).
> 	 *
>diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ListRewrite.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ListRewrite.java
>index 0e6dd82..a460d47 100644
>--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ListRewrite.java
>+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ListRewrite.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2009 IBM Corporation and others.
>+ * Copyright (c) 2004, 2011 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
>@@ -145,7 +145,7 @@
> 
> 	/**
> 	 * Inserts the given node into the list after the given element.
>-	 * The existing node must be in the list, either as an original or as a new
>+	 * The existing node <code>previousElement</code> must be in the list, either as an original or as a new
> 	 * node that has been inserted.
> 	 * The inserted node must either be brand new (not part of the original AST)
> 	 * or a placeholder node (for example, one created by
>@@ -156,20 +156,20 @@
>      * a note that this node has been inserted into the list.
> 	 *
> 	 * @param node the node to insert
>-	 * @param element the element after which the given node is to be inserted
>+	 * @param previousElement the element after which the given node is to be inserted
> 	 * @param editGroup the edit group in which to collect the corresponding
> 	 * text edits, or <code>null</code> if ungrouped
> 	 * @throws IllegalArgumentException if the node or element is null,
> 	 * or if the node is not part of this rewriter's AST, or if the inserted node
>-	 * is not a new node (or placeholder), or if <code>element</code> is not a member
>+	 * is not a new node (or placeholder), or if <code>previousElement</code> is not a member
> 	 * of the list (original or new), or if the described modification is
> 	 * otherwise invalid
> 	 */
>-	public void insertAfter(ASTNode node, ASTNode element, TextEditGroup editGroup) {
>-		if (node == null || element == null) {
>+	public void insertAfter(ASTNode node, ASTNode previousElement, TextEditGroup editGroup) {
>+		if (node == null || previousElement == null) {
> 			throw new IllegalArgumentException();
> 		}
>-		int index= getEvent().getIndex(element, ListRewriteEvent.BOTH);
>+		int index= getEvent().getIndex(previousElement, ListRewriteEvent.BOTH);
> 		if (index == -1) {
> 			throw new IllegalArgumentException("Node does not exist"); //$NON-NLS-1$
> 		}
>@@ -178,7 +178,7 @@
> 
> 	/**
> 	 * Inserts the given node into the list before the given element.
>-	 * The existing node must be in the list, either as an original or as a new
>+	 * The existing node <code>nextElement</code> must be in the list, either as an original or as a new
> 	 * node that has been inserted.
> 	 * The inserted node must either be brand new (not part of the original AST)
> 	 * or a placeholder node (for example, one created by
>@@ -189,20 +189,20 @@
>      * a note that this node has been inserted into the list.
> 	 *
> 	 * @param node the node to insert
>-	 * @param element the element before which the given node is to be inserted
>+	 * @param nextElement the element before which the given node is to be inserted
> 	 * @param editGroup the edit group in which to collect the corresponding
> 	 * text edits, or <code>null</code> if ungrouped
>-	 * @throws IllegalArgumentException if the node or element is null,
>+	 * @throws IllegalArgumentException if the node or next element is null,
> 	 * or if the node is not part of this rewriter's AST, or if the inserted node
>-	 * is not a new node (or placeholder), or if <code>element</code> is not a member
>+	 * is not a new node (or placeholder), or if <code>nextElement</code> is not a member
> 	 * of the list (original or new), or if the described modification is
> 	 * otherwise invalid
> 	 */
>-	public void insertBefore(ASTNode node, ASTNode element, TextEditGroup editGroup) {
>-		if (node == null || element == null) {
>+	public void insertBefore(ASTNode node, ASTNode nextElement, TextEditGroup editGroup) {
>+		if (node == null || nextElement == null) {
> 			throw new IllegalArgumentException();
> 		}
>-		int index= getEvent().getIndex(element, ListRewriteEvent.BOTH);
>+		int index= getEvent().getIndex(nextElement, ListRewriteEvent.BOTH);
> 		if (index == -1) {
> 			throw new IllegalArgumentException("Node does not exist"); //$NON-NLS-1$
> 		}
>diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java
>index 9394af1..b53e418 100644
>--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java
>+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -1528,9 +1528,9 @@
> 	public boolean visit(TryStatement node) {
> 		printIndent();
> 		this.buffer.append("try ");//$NON-NLS-1$
>-		List resources = node.resources();
> 		if (node.getAST().apiLevel() >= AST.JLS4) {
>-			if (!node.resources().isEmpty()) {
>+			List resources = node.resources();
>+			if (!resources.isEmpty()) {
> 				this.buffer.append('(');
> 				for (Iterator it = resources.iterator(); it.hasNext(); ) {
> 					VariableDeclarationExpression variable = (VariableDeclarationExpression) it.next();
>diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java
>index ffdab27..82701fc 100644
>--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java
>+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java
>@@ -881,10 +881,10 @@
> 						insertedPrefix = getLineDelimiter() + this.formatter.createIndentString(indent) + insertedPrefix.trim() + ' ';
> 					}
> 					doTextInsert(offset, insertedPrefix, editGroup);
>-					String lineInPrefix= getCurrentLine(prefix, prefix.length());
>-					if (prefix.length() != lineInPrefix.length()) {
>+					int lineStart= getCurrentLineStart(prefix, prefix.length());
>+					if (lineStart != 0) {
> 						// prefix contains a new line: update the indent to the one used in the prefix
>-						indent= this.formatter.computeIndentUnits(lineInPrefix);
>+						indent= this.formatter.computeIndentUnits(prefix.substring(lineStart));
> 					}
> 					doTextInsert(offset, replacingNode, indent, true, editGroup);
> 					doTextInsert(offset, strings[1], editGroup);
>@@ -1316,7 +1316,12 @@
> 				}
> 				currPos= offset;
> 			} else {
>-				String destIndentString=  this.formatter.getIndentString(getCurrentLine(formatted, offset));
>+				// If in the first line, there are cases (eg: catch clause) where the line will not be prefixed with 
>+				// proper indentation - see https://bugs.eclipse.org/bugs/show_bug.cgi?id=350285
>+				int lineOffset = getCurrentLineStart(formatted, offset);
>+				String destIndentString = (lineOffset == 0)
>+						? this.formatter.createIndentString(initialIndentLevel)
>+						: this.formatter.getIndentString(formatted.substring(lineOffset, offset));
> 				if (data instanceof CopyPlaceholderData) { // replace with a copy/move target
> 					CopySourceInfo copySource= ((CopyPlaceholderData) data).copySource;
> 					int srcIndentLevel= getIndent(copySource.getNode().getStartPosition());
>@@ -1349,17 +1354,16 @@
> 		return offset < formatted.length() && !IndentManipulation.isLineDelimiterChar(formatted.charAt(offset));
> 	}
> 
>-	private String getCurrentLine(String str, int pos) {
>+	private int getCurrentLineStart(String str, int pos) {
> 		for (int i= pos - 1; i>= 0; i--) {
> 			char ch= str.charAt(i);
> 			if (IndentManipulation.isLineDelimiterChar(ch)) {
>-				return str.substring(i + 1, pos);
>+				return i+1;
> 			}
> 		}
>-		return str.substring(0, pos);
>+		return 0;
> 	}
>-
>-
>+	
> 	private void rewriteModifiers(ASTNode parent, StructuralPropertyDescriptor property, int offset) {
> 		RewriteEvent event= getEvent(parent, property);
> 		if (event == null || event.getChangeKind() != RewriteEvent.REPLACED) {
>diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ImportRewriteAnalyzer.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ImportRewriteAnalyzer.java
>index 5a43daf..06dc65c 100644
>--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ImportRewriteAnalyzer.java
>+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ImportRewriteAnalyzer.java
>@@ -758,9 +758,12 @@
> 						} else if (doStarImport && !currDecl.isOnDemand()) {
> 							String simpleName = currDecl.getTypeQualifiedName();
> 							if (simpleName.indexOf('.') != -1) {
>+								//If there is '.' in a Simple typename it is safe to assume that we are working with a Nested import
> 								String str= getNewImportString(currDecl.getElementName(), isStatic, lineDelim);
>-								if (stringsToInsert.indexOf(str) == -1) {
>-									stringsToInsert.add(str);
>+								String nextedStarImport = getNestedStarImport(
>+										lineDelim, str);
>+								if (stringsToInsert.indexOf(nextedStarImport) == -1) {
>+									stringsToInsert.add(nextedStarImport);
> 								}
> 							}
> 						}
>@@ -770,6 +773,7 @@
> 						stringsToInsert.clear();
> 						currPos= offset + region.getLength();
> 					} else if (doStarImport && !currDecl.isOnDemand()) {
>+						//If there is '.' in a Simple typename it is safe to assume that we are working with a Nested import
> 						String simpleName = currDecl.getTypeQualifiedName();
> 						if (simpleName.indexOf('.') != -1) {
> 							IRegion rangeBefore = currDecl.getPrecedingCommentRange();
>@@ -782,8 +786,10 @@
> 								trailingComment = buffer.getText(rangeAfter.getOffset(), rangeAfter.getLength());
> 							}
> 							String str= getNewImportString(currDecl.getElementName(), isStatic, trailingComment, lineDelim);
>-							if (stringsToInsert.indexOf(str) == -1) {
>-								stringsToInsert.add(str);
>+							String nextedStarImport = getNestedStarImport(
>+									lineDelim, str);
>+							if (stringsToInsert.indexOf(nextedStarImport) == -1) {
>+								stringsToInsert.add(nextedStarImport);
> 							}
> 						}
> 					}
>@@ -977,7 +983,7 @@
> 		for (int i= 0; i < nImports; i++) {
> 			ImportDeclEntry curr= packageEntry.getImportAt(i);
> 			String simpleName = curr.getTypeQualifiedName();
>-			if (simpleName.indexOf('.') != -1) {
>+			if (simpleName.indexOf('.') != -1 &&!isStarImportAdded) {
> 				// member type imports - we preserve it
> 				IRegion rangeBefore = curr.getPrecedingCommentRange();
> 				if (rangeBefore != null) {
>@@ -988,7 +994,10 @@
> 				if (rangeAfter != null) {
> 					trailingComment = buffer.getText(rangeAfter.getOffset(), rangeAfter.getLength());
> 				}
>-				allImports.add(getNewImportString(curr.getElementName(), isStatic, trailingComment, lineDelim));
>+				String starImportString = getNestedImports(packageEntry.getName(),
>+						simpleName);
>+				allImports.add(getNewImportString(starImportString, isStatic, trailingComment, lineDelim));
>+				isStarImportAdded=true;
> 			} else if (!isStarImportAdded) {
> 				String starImportString= packageEntry.getName() + ".*"; //$NON-NLS-1$
> 				allImports.add(getNewImportString(starImportString, isStatic, lineDelim));
>@@ -1016,6 +1025,23 @@
> 		}
> 		return (String[]) allImports.toArray(new String[allImports.size()]);
> 	}
>+	
>+	private String getNestedStarImport(String lineDelim, String str) {
>+		StringBuffer buff=new StringBuffer();
>+		buff.append(str.substring(0, str.lastIndexOf('.')));
>+		buff.append(".*;");//$NON-NLS-1$
>+		buff.append(lineDelim);
>+		return buff.toString();
>+	}
>+	
>+	private String getNestedImports(String packageEntry,String simpleName) {
>+		StringBuffer starImportString= new StringBuffer();
>+		starImportString.append(packageEntry);
>+		starImportString.append(".");//$NON-NLS-1$
>+		starImportString.append(simpleName.substring(0, simpleName.lastIndexOf('.')));
>+		starImportString.append(".*"); //$NON-NLS-1$
>+		return starImportString.toString();
>+	}
> 
> 	private static int getFirstTypeBeginPos(CompilationUnit root) {
> 		List types= root.types();
>diff --git a/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java b/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java
>index e894759..f0090b1 100644
>--- a/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java
>+++ b/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Stephan Herrmann - Contribution for bug 186342 - [compiler][null] Using annotations for null checking
>  *******************************************************************************/
> package org.eclipse.jdt.internal.eval;
> 
>@@ -64,6 +65,9 @@
> 		public IBinaryAnnotation[] getParameterAnnotations(int index) {
> 			return null;
> 		}
>+		public int getAnnotatedParametersCount() {
>+			return 0;
>+		}
> 		public char[] getSelector() {
> 			return this.selector;
> 		}
>diff --git a/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/EvaluationContext.java b/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/EvaluationContext.java
>index ed5dc37..33c30f4 100644
>--- a/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/EvaluationContext.java
>+++ b/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/EvaluationContext.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -156,6 +156,9 @@
> 		}
> 		public char[][] getPackageName() {
> 			return null;
>+		}
>+		public boolean ignoreOptionalProblems() {
>+			return false;
> 		}
> 	};
> 
>@@ -601,6 +604,9 @@
> 		public char[][] getPackageName() {
> 			return null;
> 		}
>+		public boolean ignoreOptionalProblems() {
>+			return false;
>+		}
> 	};
> 	SelectionEngine engine = new SelectionEngine(environment, mapper.getSelectionRequestor(requestor), options, owner);
> 	engine.select(sourceUnit, mapper.startPosOffset + selectionSourceStart, mapper.startPosOffset + selectionSourceEnd);
>diff --git a/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/Evaluator.java b/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/Evaluator.java
>index de5c56e..de07b66 100644
>--- a/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/Evaluator.java
>+++ b/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/Evaluator.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -141,6 +141,9 @@
> 		public char[][] getPackageName() {
> 			return null;
> 		}
>+		public boolean ignoreOptionalProblems() {
>+			return false;
>+		}
> 	}});
> 	if (compilerRequestor.hasErrors) {
> 		return null;
>diff --git a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java
>index 4889826..71e22b6 100644
>--- a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java
>+++ b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java
>@@ -109,7 +109,6 @@
> import org.eclipse.jdt.internal.compiler.ast.Wildcard;
> import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
> import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
>-import org.eclipse.jdt.internal.compiler.impl.Constant;
> import org.eclipse.jdt.internal.compiler.lookup.BlockScope;
> import org.eclipse.jdt.internal.compiler.lookup.ClassScope;
> import org.eclipse.jdt.internal.compiler.lookup.CompilationUnitScope;
>@@ -3670,8 +3669,7 @@
> 		if (numberOfParens > 0) {
> 			manageOpeningParenthesizedExpression(doubleLiteral, numberOfParens);
> 		}
>-		Constant constant = doubleLiteral.constant;
>-		if (constant != null && constant.doubleValue() < 0) {
>+		if (isNextToken(TerminalTokens.TokenNameMINUS)) {
> 			this.scribe.printNextToken(TerminalTokens.TokenNameMINUS);
> 		}
> 		this.scribe.printNextToken(TerminalTokens.TokenNameDoubleLiteral);
>@@ -3895,8 +3893,7 @@
> 		if (numberOfParens > 0) {
> 			manageOpeningParenthesizedExpression(floatLiteral, numberOfParens);
> 		}
>-		Constant constant = floatLiteral.constant;
>-		if (constant != null && floatLiteral.constant.floatValue() < 0) {
>+		if (isNextToken(TerminalTokens.TokenNameMINUS)) {
> 			this.scribe.printNextToken(TerminalTokens.TokenNameMINUS);
> 		}
> 		this.scribe.printNextToken(TerminalTokens.TokenNameFloatingPointLiteral);
>@@ -4209,8 +4206,7 @@
> 		if (numberOfParens > 0) {
> 			manageOpeningParenthesizedExpression(intLiteral, numberOfParens);
> 		}
>-		Constant constant = intLiteral.constant;
>-		if (constant != null && constant.intValue() < 0) {
>+		if (isNextToken(TerminalTokens.TokenNameMINUS)) {
> 			this.scribe.printNextToken(TerminalTokens.TokenNameMINUS);
> 		}
> 		this.scribe.printNextToken(TerminalTokens.TokenNameIntegerLiteral);
>@@ -4260,8 +4256,7 @@
> 		if (numberOfParens > 0) {
> 			manageOpeningParenthesizedExpression(longLiteral, numberOfParens);
> 		}
>-		Constant constant = longLiteral.constant;
>-		if (constant != null && constant.longValue() < 0) {
>+		if (isNextToken(TerminalTokens.TokenNameMINUS)) {
> 			this.scribe.printNextToken(TerminalTokens.TokenNameMINUS);
> 		}
> 		this.scribe.printNextToken(TerminalTokens.TokenNameLongLiteral);
>diff --git a/org.eclipse.jdt.core/grammar/java.g b/org.eclipse.jdt.core/grammar/java.g
>index 8eb0d0c..7e22ac1 100644
>--- a/org.eclipse.jdt.core/grammar/java.g
>+++ b/org.eclipse.jdt.core/grammar/java.g
>@@ -1234,28 +1234,32 @@
> /.$putCase consumeAllocationHeader(); $break ./
> /:$readableName AllocationHeader:/
> 
>-ClassInstanceCreationExpression ::= 'new' OnlyTypeArguments ClassType '(' ArgumentListopt ')' UnqualifiedClassBodyopt
>+ClassInstanceCreationExpression ::= 'new' OnlyTypeArguments ClassType EnterInstanceCreationArgumentList '(' ArgumentListopt ')' UnqualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpressionWithTypeArguments(); $break ./
> 
>-ClassInstanceCreationExpression ::= 'new' ClassType '(' ArgumentListopt ')' UnqualifiedClassBodyopt
>+ClassInstanceCreationExpression ::= 'new' ClassType EnterInstanceCreationArgumentList '(' ArgumentListopt ')' UnqualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpression(); $break ./
> --1.1 feature
> 
>-ClassInstanceCreationExpression ::= Primary '.' 'new' OnlyTypeArguments ClassType '(' ArgumentListopt ')' QualifiedClassBodyopt
>+ClassInstanceCreationExpression ::= Primary '.' 'new' OnlyTypeArguments ClassType EnterInstanceCreationArgumentList '(' ArgumentListopt ')' QualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ; $break ./
> 
>-ClassInstanceCreationExpression ::= Primary '.' 'new' ClassType '(' ArgumentListopt ')' QualifiedClassBodyopt
>+ClassInstanceCreationExpression ::= Primary '.' 'new' ClassType EnterInstanceCreationArgumentList '(' ArgumentListopt ')' QualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpressionQualified() ; $break ./
> 
> --1.1 feature
>-ClassInstanceCreationExpression ::= ClassInstanceCreationExpressionName 'new' ClassType '(' ArgumentListopt ')' QualifiedClassBodyopt
>+ClassInstanceCreationExpression ::= ClassInstanceCreationExpressionName 'new' ClassType EnterInstanceCreationArgumentList '(' ArgumentListopt ')' QualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpressionQualified() ; $break ./
> /:$readableName ClassInstanceCreationExpression:/
> 
>-ClassInstanceCreationExpression ::= ClassInstanceCreationExpressionName 'new' OnlyTypeArguments ClassType '(' ArgumentListopt ')' QualifiedClassBodyopt
>+ClassInstanceCreationExpression ::= ClassInstanceCreationExpressionName 'new' OnlyTypeArguments ClassType EnterInstanceCreationArgumentList '(' ArgumentListopt ')' QualifiedClassBodyopt
> /.$putCase consumeClassInstanceCreationExpressionQualifiedWithTypeArguments() ; $break ./
> /:$readableName ClassInstanceCreationExpression:/
> 
>+EnterInstanceCreationArgumentList ::= $empty
>+/.$putCase consumeEnterInstanceCreationArgumentList(); $break ./
>+/:$readableName EnterInstanceCreationArgumentList:/
>+
> ClassInstanceCreationExpressionName ::= Name '.'
> /.$putCase consumeClassInstanceCreationExpressionName() ; $break ./
> /:$readableName ClassInstanceCreationExpressionName:/
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathAttribute.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathAttribute.java
>index d90ab15..dc2c826 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathAttribute.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathAttribute.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2010 IBM Corporation and others.
>+ * Copyright (c) 2005, 2012 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
>@@ -58,6 +58,47 @@
> 	 * @since 3.1
> 	 */
> 	String JAVADOC_LOCATION_ATTRIBUTE_NAME = "javadoc_location"; //$NON-NLS-1$
>+	
>+	/**
>+	 * Constant for the name of the index location attribute.
>+	 * 
>+	 * <p>The value for this attribute has to be the string representation of a URL.
>+	 * It should point to an existing index file in a folder or a jar. The URL can also be of platform protocol.</p>
>+	 * 
>+	 * @since 3.8
>+	 */
>+	String INDEX_LOCATION_ATTRIBUTE_NAME = "index_location"; //$NON-NLS-1$
>+
>+	/**
>+	 * Constant for the name of the encoding to be used for source attachments.
>+	 * 
>+	 * <p>The value of this attribute has to be a string representation of a valid encoding. The encoding
>+	 * for a source attachment is determined in the following order: </p>
>+	 *
>+	 * <ul>
>+	 * <li>	Encoding explicitly set on the source file (java or zip), i.e. <code>org.eclipse.core.resources.IFile#getCharset(false)</code> </li>
>+	 * <li>	Encoding set on the corresponding classpath entry </li>
>+	 * <li> If the source attachment is a folder, then the encoding determined by the file content if detectable </li>
>+	 * <li> If the source attachment is in the workspace, then the encoding of the enclosing resources</li>
>+	 * </ul>
>+	 *
>+	 * @see org.eclipse.core.resources.IFile#getCharset()
>+	 * @since 3.8
>+	 */
>+	String SOURCE_ATTACHMENT_ENCODING = "source_encoding"; //$NON-NLS-1$
>+
>+	/**
>+	 * Constant for the name of the ignore optional compile problems attribute.
>+	 * This attribute is valid only for classpath entries describing source folders.
>+	 * The possible values for this attribute are <code>"true"</code> or
>+	 * <code>"false"</code>. When not present, <code>"false"</code> is assumed.
>+	 * If the value of this attribute is <code>"true"</code>, all optional problems
>+	 * from the source folder described by this classpath entry will not be reported
>+	 * by the compiler.
>+	 *
>+	 * @since 3.8
>+	 */
>+	String IGNORE_OPTIONAL_PROBLEMS = "ignore_optional_problems"; //$NON-NLS-1$
> 
> 	/**
> 	 * Constant for the name of the optional attribute. The possible values
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java
>index dbc6e55..8d485ab 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -114,4 +114,13 @@
> 	 * @since 2.0
> 	 */
> 	String CLASSPATH_FILE_FORMAT = "classpathFileFormat"; //$NON-NLS-1$
>+	
>+	/**
>+	 * Output overlapping another source attribute (value <code>"outputOverlappingSource"</code>). 
>+	 * Used only on buildpath problem markers. The value of this attribute is 
>+	 * either "true" or "false".
>+	 * 
>+	 * @since 3.6.4
>+	 */
>+	String OUTPUT_OVERLAPPING_SOURCE = "outputOverlappingSource"; //$NON-NLS-1$
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelStatusConstants.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelStatusConstants.java
>index 4cc2f45..a88db5e 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelStatusConstants.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelStatusConstants.java
>@@ -345,4 +345,11 @@
> 	 * @since 3.7
> 	 */
> 	public static final int CANNOT_RETRIEVE_ATTACHED_JAVADOC_TIMEOUT = 1012;
>+	
>+	/**
>+	 * <p>Status constant indicating that the default or specific output folder is overlapping
>+	 * with another source location. </p>
>+	 * @since 3.6.4
>+	 */
>+	public static final int OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE = 1013;
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java
>index 5d80813..8ae6fdc 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -581,11 +581,13 @@
> 	 *   <li> The project output location path cannot be null, must be absolute and located inside the project.
> 	 *   <li> Specific output locations (specified on source entries) can be null, if not they must be located inside the project,
> 	 *   <li> A project entry cannot refer to itself directly (that is, a project cannot prerequisite itself).
>-     *   <li> Classpath entries or output locations cannot coincidate or be nested in each other, except for the following scenarii listed below:
>-	 *      <ul><li> A source folder can coincidate with its own output location, in which case this output can then contain library archives.
>-	 *                     However, a specific output location cannot coincidate with any library or a distinct source folder than the one referring to it. </li>
>+     *   <li> Classpath entries or output locations cannot coincide or be nested in each other, except for the following scenarios listed below:
>+	 *      <ul><li> A source folder can coincide with its own output location, in which case this output can then contain library archives.
>+	 *                     However, a specific output location cannot coincide with any library or a distinct source folder than the one referring to it.<br>
>+	 *                     Note: Since 3.8, this behavior can be overridden by configuring {@link JavaCore#CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE}
>+	 *                     </li>
> 	 *              <li> A source/library folder can be nested in any source folder as long as the nested folder is excluded from the enclosing one. </li>
>-	 * 			<li> An output location can be nested in a source folder, if the source folder coincidates with the project itself, or if the output
>+	 * 			<li> An output location can be nested in a source folder, if the source folder coincides with the project itself, or if the output
> 	 * 					location is excluded from the source folder.
> 	 *      </ul>
> 	 * </ul>
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java
>index 7a4a96a..1888747 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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,6 +83,16 @@
>  *     Benjamin Muskalla - added COMPILER_PB_MISSING_SYNCHRONIZED_ON_INHERITED_METHOD
>  *     Stephan Herrmann  - added COMPILER_PB_UNUSED_OBJECT_ALLOCATION
>  *     Stephan Herrmann  - added COMPILER_PB_SUPPRESS_OPTIONAL_ERRORS
>+ *     Stephan Herrmann  - added the following constants:
>+ *     								COMPILER_PB_UNCLOSED_CLOSEABLE,
>+ *     								COMPILER_PB_POTENTIALLY_UNCLOSED_CLOSEABLE
>+ *     								COMPILER_PB_EXPLICITLY_CLOSED_AUTOCLOSEABLE
>+ *     								COMPILER_ANNOTATION_NULL_ANALYSIS
>+ *     								COMPILER_NULLABLE_ANNOTATION_NAME
>+ *     								COMPILER_NONNULL_ANNOTATION_NAME
>+ *     								COMPILER_PB_NULL_SPECIFICATION_VIOLATION
>+ *     								COMPILER_PB_POTENTIAL_NULL_SPECIFICATION_VIOLATION
>+ *     								COMPILER_PB_NULL_SPECIFICATION_INSUFFICIENT_INFO
>  *******************************************************************************/
> 
> package org.eclipse.jdt.core;
>@@ -1357,6 +1367,276 @@
> 	 */
> 	public static final String COMPILER_PB_POTENTIALLY_MISSING_STATIC_ON_METHOD = PLUGIN_ID + ".compiler.problem.reportMethodCanBePotentiallyStatic"; //$NON-NLS-1$
> 	/**
>+	 * Compiler option ID: Reporting a resource that is not closed properly.
>+	 * <p>When enabled, the compiler will issue an error or a warning if
>+	 *    a local variable holds a value of type <code>java.lang.AutoCloseable</code> (compliance>=1.7) 
>+	 *    or a value of type <code>java.io.Closeable</code> (compliance<=1.6) and if
>+	 *    flow analysis shows that the method <code>close()</code> is not invoked locally on that value.
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.reportUnclosedCloseable"</code></dd>
>+	 * <dt>Possible values:</dt><dd><code>{ "error", "warning", "ignore" }</code></dd>
>+	 * <dt>Default:</dt><dd><code>"warning"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_PB_UNCLOSED_CLOSEABLE = PLUGIN_ID + ".compiler.problem.unclosedCloseable"; //$NON-NLS-1$
>+	/**
>+	 * Compiler option ID: Reporting a resource that may not be closed properly.
>+	 * <p>When enabled, the compiler will issue an error or a warning if
>+	 *    a local variable holds a value of type <code>java.lang.AutoCloseable</code> (compliance>=1.7) 
>+	 *    or a value of type <code>java.io.Closeable</code> (compliance<=1.6) and if
>+	 *    flow analysis shows that the method <code>close()</code> is 
>+	 *    not invoked locally on that value for all execution paths.
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.reportPotentiallyUnclosedCloseable"</code></dd>
>+	 * <dt>Possible values:</dt><dd><code>{ "error", "warning", "ignore" }</code></dd>
>+	 * <dt>Default:</dt><dd><code>"ignore"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_PB_POTENTIALLY_UNCLOSED_CLOSEABLE = PLUGIN_ID + ".compiler.problem.potentiallyUnclosedCloseable"; //$NON-NLS-1$
>+	/**
>+	 * Compiler option ID: Reporting a resource that is not managed by try-with-resources.
>+	 * <p>When enabled, the compiler will issue an error or a warning if a local variable 
>+	 * 	  holds a value of type <code>java.lang.AutoCloseable</code>, and if the method
>+	 *    <code>close()</code> is explicitly invoked on that resource, but the resource is
>+	 *    not managed by a try-with-resources block.
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.reportPotentiallyUnclosedCloseable"</code></dd>
>+	 * <dt>Possible values:</dt><dd><code>{ "error", "warning", "ignore" }</code></dd>
>+	 * <dt>Default:</dt><dd><code>"ignore"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_PB_EXPLICITLY_CLOSED_AUTOCLOSEABLE = PLUGIN_ID + ".compiler.problem.explicitlyClosedAutoCloseable"; //$NON-NLS-1$
>+	/**
>+	 * Compiler option ID: Annotation-based Null Analysis.
>+	 * <p>This option controls whether the compiler will use null annotations for
>+	 *    improved analysis of (potential) null references.</p>
>+	 * <p>When enabled, the compiler will interpret the annotation types defined using
>+	 *    {@link #COMPILER_NONNULL_ANNOTATION_NAME} and {@link #COMPILER_NULLABLE_ANNOTATION_NAME}
>+	 *    as specifying whether or not a given type includes the value <code>null</code>.</p>
>+	 * <p>The effect of these analyses is further controlled by the options
>+	 *    {@link #COMPILER_PB_NULL_SPECIFICATION_VIOLATION},
>+	 *    {@link #COMPILER_PB_POTENTIAL_NULL_SPECIFICATION_VIOLATION} and
>+	 *    {@link #COMPILER_PB_NULL_SPECIFICATION_INSUFFICIENT_INFO}.
>+	 * </p>
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.annotation.nullanalysis"</code></dd>
>+	 * <dt>Possible values:</dt><dd><code>{ "disabled", "enabled" }</code></dd>
>+	 * <dt>Default:</dt><dd><code>"disabled"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_ANNOTATION_NULL_ANALYSIS = PLUGIN_ID + ".compiler.annotation.nullanalysis"; //$NON-NLS-1$
>+	/**
>+	 * Compiler option ID: Name of Annotation Type for Nullable Types.
>+	 * <p>This option defines a fully qualified Java type name that the compiler may use
>+	 *    to perform special null analysis.</p>
>+	 * <p>If the annotation specified by this option is applied to a type in a method
>+	 *    signature or variable declaration, this will be interpreted as a specification
>+	 *    that <code>null</code> is a legal value in that position. Currently supported
>+	 *    positions are: method parameters, method return type and local variables.</p>
>+	 * <p>If a value whose type
>+	 *    is annotated with this annotation is dereferenced without checking for null,
>+	 *    the compiler will trigger a diagnostic as further controlled by
>+	 *    {@link #COMPILER_PB_POTENTIAL_NULL_REFERENCE}.</p>
>+	 * <p>The compiler may furthermore check adherence to the null specification as
>+	 *    further controlled by {@link #COMPILER_PB_NULL_SPECIFICATION_VIOLATION},
>+	 *    {@link #COMPILER_PB_POTENTIAL_NULL_SPECIFICATION_VIOLATION} and
>+	 *    {@link #COMPILER_PB_NULL_SPECIFICATION_INSUFFICIENT_INFO}.</p>
>+	 * <p>This option only has an effect if the option {@link #COMPILER_ANNOTATION_NULL_ANALYSIS} is enabled.</p>
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.annotation.nullable"</code></dd>
>+	 * <dt>Possible values:</dt><dd>any legal, fully qualified Java type name; must resolve to an annotation type.</dd>
>+	 * <dt>Default:</dt><dd><code>"org.eclipse.jdt.annotation.Nullable"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_NULLABLE_ANNOTATION_NAME = PLUGIN_ID + ".compiler.annotation.nullable"; //$NON-NLS-1$
>+	/**
>+	 * Compiler option ID: Name of Annotation Type for Non-Null Types.
>+	 * <p>This option defines a fully qualified Java type name that the compiler may use
>+	 *    to perform special null analysis.</p>
>+	 * <p>If the annotation specified by this option is applied to a type in a method
>+	 *    signature or variable declaration, this will be interpreted as a specification
>+	 *    that <code>null</code> is <b>not</b> a legal value in that position. Currently
>+	 *    supported positions are: method parameters, method return type and local variables.</p>
>+	 * <p>For values declared with this annotation, the compiler will never trigger a null
>+	 *    reference diagnostic (as controlled by {@link #COMPILER_PB_POTENTIAL_NULL_REFERENCE}
>+	 *    and {@link #COMPILER_PB_NULL_REFERENCE}), because the assumption is made that null
>+	 *    will never occur at runtime in these positions.</p>
>+	 * <p>The compiler may furthermore check adherence to the null specification as further
>+	 *    controlled by {@link #COMPILER_PB_NULL_SPECIFICATION_VIOLATION},
>+	 *    {@link #COMPILER_PB_POTENTIAL_NULL_SPECIFICATION_VIOLATION} and
>+	 *    {@link #COMPILER_PB_NULL_SPECIFICATION_INSUFFICIENT_INFO}.</p>
>+	 * <p>This option only has an effect if the option {@link #COMPILER_ANNOTATION_NULL_ANALYSIS} is enabled.</p>
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.annotation.nonnull"</code></dd>
>+	 * <dt>Possible values:</dt><dd>any legal, fully qualified Java type name; must resolve to an annotation type.</dd>
>+	 * <dt>Default:</dt><dd><code>"org.eclipse.jdt.annotation.NonNull"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_NONNULL_ANNOTATION_NAME = PLUGIN_ID + ".compiler.annotation.nonnull"; //$NON-NLS-1$
>+	/**
>+	 * Compiler option ID: Name of Annotation Type to specify a nullness default for unannotated types.
>+	 * <p>This option defines a fully qualified Java type name that the compiler may use
>+	 *    to perform special null analysis.</p>
>+	 * <p>If the annotation is applied without an argument, all unannotated types in method signatures
>+	 *    within the annotated element will be treated as if they were specified with the non-null annotation
>+	 *    (see {@link #COMPILER_NONNULL_ANNOTATION_NAME}).</p>
>+	 * <p>If the annotation is applied with the constant <code>false</code> as its argument
>+	 *    all corresponding defaults at outer scopes will be canceled for the annotated element.
>+	 *    This includes defaults specified using this annotation type or a default defined using
>+	 *    the compiler option {@link #COMPILER_NONNULL_IS_DEFAULT}.</p>
>+	 * <p>This option only has an effect if the option {@link #COMPILER_ANNOTATION_NULL_ANALYSIS} is enabled.</p>
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.annotation.nonnullbydefault"</code></dd>
>+	 * <dt>Possible values:</dt><dd>any legal, fully qualified Java type name; must resolve to an annotation type.
>+	 *     That annotation type should have exactly one boolean parameter.</dd>
>+	 * <dt>Default:</dt><dd><code>"org.eclipse.jdt.annotation.NonNullByDefault"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_NONNULL_BY_DEFAULT_ANNOTATION_NAME = PLUGIN_ID + ".compiler.annotation.nonnullbydefault"; //$NON-NLS-1$
>+	/**
>+	 * Compiler option ID: Globally specify non-null as the assumed default for unannotated types.
>+	 * <p>When enabled, this option globally achieves the same effect 
>+	 *    as specifying {@link #COMPILER_NONNULL_ANNOTATION_NAME} does for individual elements.</p>
>+	 * <p>This option only has an effect if the option {@link #COMPILER_ANNOTATION_NULL_ANALYSIS} is enabled.</p>
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.annotation.nonnullisdefault"</code></dd>
>+	 * <dt>Possible values:</dt><dd><code>{ "disabled", "enabled" }</code>.</dd>
>+	 * <dt>Default:</dt><dd><code>"disabled"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_NONNULL_IS_DEFAULT = PLUGIN_ID + ".compiler.annotation.nonnullisdefault"; //$NON-NLS-1$
>+	/**
>+	 * Compiler option ID: Reporting Violations of Null Specifications.
>+	 * <p>Depending on this option, the compiler will issue either an error or a warning
>+	 *    whenever one of the following situations is detected:
>+	 *    <ol>
>+	 *    <li>A method declared with a nonnull annotation returns an expression	that is
>+	 *          statically known to evaluate to a null value.</li>
>+	 *    <li>An expression that is statically known to evaluate to a null value is	passed
>+	 *        as an argument in a method call where the corresponding parameter of the called
>+	 *        method is declared with a nonnull annotation.</li>
>+	 *    <li>An expression that is statically known to evaluate to a null value is	assigned
>+	 *        to a local variable that is declared with a nonnull annotation.</li>
>+	 *    <li>A method that overrides an inherited method declared with a nonnull annotation
>+	 *        tries to relax that contract by specifying a nullable annotation
>+	 *        (prohibition of contravariant return).</li>
>+	 *    <li>A method that overrides an inherited method which has a nullable declaration
>+	 *        for at least one of its parameters, tries to tighten that null contract by
>+	 *        specifying a nonnull annotation for its corresponding parameter
>+	 *        (prohibition of covariant parameters).</li>
>+	 *    </ol>
>+	 * </p>
>+	 * <p>The compiler options {@link #COMPILER_NONNULL_ANNOTATION_NAME} and
>+	 *    {@link #COMPILER_NULLABLE_ANNOTATION_NAME} control which annotations the compiler
>+	 *    shall interpret as nonnull or nullable annotations, respectively.
>+	 * </p>
>+	 * <p>This option only has an effect if the option {@link #COMPILER_ANNOTATION_NULL_ANALYSIS} is enabled.</p>
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.nullSpecViolation"</code></dd>
>+	 * <dt>Possible values:</dt><dd><code>{ "error", "warning" }</code></dd>
>+	 * <dt>Default:</dt><dd><code>"error"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_PB_NULL_SPECIFICATION_VIOLATION = PLUGIN_ID + ".compiler.problem.nullSpecViolation"; //$NON-NLS-1$
>+	/**
>+	 * Compiler option ID: Reporting Violations of Null Specifications with Potential Null Value.
>+	 * <p>When enabled, the compiler will issue an error or a warning whenever one of the
>+	 *    following situations is detected:
>+	 *    <ol>
>+	 *    <li>A method declared with a nonnull annotation returns an expression that is
>+	 *          statically known to evaluate to a null value on some flow.</li>
>+	 *    <li>An expression that is statically known to evaluate to a null value on some flow
>+	 *        is passed as an argument in a method call where the corresponding parameter of
>+	 *        the called method is declared with a nonnull annotation.</li>
>+	 *    <li>An expression that is statically known to evaluate to a null value on some flow
>+	 *        is assigned to a local variable that is declared with a nonnull annotation.</li>
>+	 *    </ol>
>+	 * </p>
>+	 * <p>The compiler options {@link #COMPILER_NONNULL_ANNOTATION_NAME} and
>+	 *    {@link #COMPILER_NULLABLE_ANNOTATION_NAME} control which annotations the compiler
>+	 *    shall interpret as nonnull or nullable annotations, respectively.
>+	 * </p>
>+	 * <p>This option only has an effect if the option {@link #COMPILER_ANNOTATION_NULL_ANALYSIS} is enabled.</p>
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.potentialNullSpecViolation"</code></dd>
>+	 * <dt>Possible values:</dt><dd><code>{ "error", "warning", "ignore" }</code></dd>
>+	 * <dt>Default:</dt><dd><code>"error"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_PB_POTENTIAL_NULL_SPECIFICATION_VIOLATION = PLUGIN_ID + ".compiler.problem.potentialNullSpecViolation"; //$NON-NLS-1$
>+	/**
>+	 * Compiler option ID: Reporting Insufficient Information for Analysing Adherence to Null Specifications.
>+	 * <p>When enabled, the compiler will issue an error or a warning whenever one of the
>+	 *    following situations is detected:
>+	 *    <ol>
>+	 *    <li>A method declared with a nonnull annotation returns an expression for which
>+	 *        insufficient nullness information is available for statically proving that no
>+	 *        flow will pass a null value at runtime.</li>
>+	 *    <li>An expression for which insufficient nullness information is available for
>+	 *        statically proving that it will never evaluate to a null value at runtime
>+	 *        is passed as an argument in a method call where the corresponding parameter of
>+	 *        the called method is declared with a nonnull annotation.</li>
>+	 *    <li>An expression for which insufficient nullness information is available for
>+	 *        statically proving that it will never evaluate to a null value at runtime
>+	 *        is assigned to a local variable that is declared with a nonnull annotation.</li>
>+	 *    </ol>
>+	 *    Insufficient nullness information is usually a consequence of using other unannotated
>+	 *    variables or methods.
>+	 * </p>
>+	 * <p>The compiler options {@link #COMPILER_NONNULL_ANNOTATION_NAME} and
>+	 *    {@link #COMPILER_NULLABLE_ANNOTATION_NAME} control which annotations the compiler
>+	 *    shall interpret as nonnull or nullable annotations, respectively.
>+	 * </p>
>+	 * <p>This option only has an effect if the option {@link #COMPILER_ANNOTATION_NULL_ANALYSIS} is enabled.</p>
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo"</code></dd>
>+	 * <dt>Possible values:</dt><dd><code>{ "error", "warning", "ignore" }</code></dd>
>+	 * <dt>Default:</dt><dd><code>"warning"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_PB_NULL_SPECIFICATION_INSUFFICIENT_INFO = PLUGIN_ID + ".compiler.problem.nullSpecInsufficientInfo"; //$NON-NLS-1$
>+	/**
>+	 * Compiler option ID: Reporting Redundant Null Annotations.
>+	 * <p>When enabled, the compiler will issue an error or a warning when a non-null annotation
>+	 *    (see {@link #COMPILER_NONNULL_ANNOTATION_NAME})
>+	 *    is applied although the same effect is already achieved by a default applicable at the
>+	 *    current location. Such a default may be set by enabling the option
>+	 *    {@link #COMPILER_NONNULL_IS_DEFAULT} or by using the annotation specified by the option
>+	 *    {@link #COMPILER_NONNULL_BY_DEFAULT_ANNOTATION_NAME}.
>+	 * </p>
>+	 * <p>This option only has an effect if the option {@link #COMPILER_ANNOTATION_NULL_ANALYSIS} is enabled.</p>
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation"</code></dd>
>+	 * <dt>Possible values:</dt><dd><code>{ "error", "warning", "ignore" }</code></dd>
>+	 * <dt>Default:</dt><dd><code>"warning"</code></dd>
>+	 * </dl>
>+	 * @since 3.8
>+	 * @category CompilerOptionID
>+	 */
>+	public static final String COMPILER_PB_REDUNDANT_NULL_ANNOTATION = PLUGIN_ID + ".compiler.problem.redundantNullAnnotation"; //$NON-NLS-1$
>+	/**
> 	 * Compiler option ID: Setting Source Compatibility Mode.
> 	 * <p>Specify whether which source level compatibility is used. From 1.4 on, <code>'assert'</code> is a keyword
> 	 *    reserved for assertion support. Also note, than when toggling to 1.4 mode, the target VM
>@@ -1828,6 +2108,19 @@
> 	 * @category CoreOptionID
> 	 */
> 	public static final String CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS = PLUGIN_ID + ".classpath.multipleOutputLocations"; //$NON-NLS-1$
>+	/**
>+	 * Core option ID: Reporting an output location overlapping another source location.
>+	 * <p> Indicate the severity of the problem reported when a source entry's output location overlaps another
>+	 * source entry. </p>
>+	 * 
>+	 * <dl>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource"</code></dd>
>+	 * <dt>Possible values:</dt><dd><code>{ "error", "warning", "ignore" }</code></dd>
>+	 * <dt>Default:</dt><dd><code>"error"</code></dd>
>+	 * </dl>
>+	 * @since 3.6.4
>+	 */
>+	public static final String CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE = PLUGIN_ID + ".classpath.outputOverlappingAnotherSource";  //$NON-NLS-1$
> 	/**
> 	 * Core option ID: Set the timeout value for retrieving the method's parameter names from javadoc.
> 	 * <p>Timeout in milliseconds to retrieve the method's parameter names from javadoc.
>@@ -3684,6 +3977,7 @@
> 							try {
> 								if (JavaBuilder.DEBUG)
> 									System.out.println("Touching " + project.getElementName()); //$NON-NLS-1$
>+								new ClasspathValidation((JavaProject) project).validate(); // https://bugs.eclipse.org/bugs/show_bug.cgi?id=287164
> 								project.getProject().touch(progressMonitor2);
> 							} catch (CoreException e) {
> 								// could not touch this project: ignore
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/ByteCodeVisitorAdapter.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/ByteCodeVisitorAdapter.java
>index dd894ad..c23af13 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/ByteCodeVisitorAdapter.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/ByteCodeVisitorAdapter.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -923,8 +923,9 @@
> 		// default behavior is to do nothing
> 	}
> 	/**
>-	 * @see IBytecodeVisitor#_invokeinterface(int, int, byte, IConstantPoolEntry)
>+	 * @see IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry, IConstantPoolEntry)
> 	 * @since 3.6
>+	 * @deprecated This has been replaced with {@link IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry)}
> 	 */
> 	public void _invokedynamic(
> 			int pc,
>@@ -934,6 +935,16 @@
> 		// default behavior is to do nothing
> 	}
> 	/**
>+	 * @see IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry)
>+	 * @since 3.8
>+	 */
>+	public void _invokedynamic(
>+			int pc,
>+			int index,
>+			IConstantPoolEntry invokeDynamicEntry) {
>+		// default behavior is to do nothing
>+	}
>+	/**
> 	 * @see IBytecodeVisitor#_invokeinterface(int, int, byte, IConstantPoolEntry)
> 	 */
> 	public void _invokeinterface(
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IAttributeNamesConstants.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IAttributeNamesConstants.java
>index e5dafa4..da838ec 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IAttributeNamesConstants.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IAttributeNamesConstants.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -140,4 +140,10 @@
> 	 * @since 3.2
> 	 */
> 	char[] STACK_MAP = "StackMap".toCharArray(); //$NON-NLS-1$
>+	
>+	/**
>+	 * "BootstrapMethods" attribute (added in cldc1.0).
>+	 * @since 3.8
>+	 */
>+	char[] BOOTSTRAP_METHODS = "BootstrapMethods".toCharArray(); //$NON-NLS-1$
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IBootstrapMethodsAttribute.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IBootstrapMethodsAttribute.java
>new file mode 100644
>index 0000000..d7bbd91
>--- /dev/null
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IBootstrapMethodsAttribute.java
>@@ -0,0 +1,40 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.core.util;
>+
>+/**
>+ * Description of a bootstrap methods attribute as described in the JVM specifications.
>+ *
>+ * This interface may be implemented by clients.
>+ *
>+ * @since 3.8
>+ */
>+public interface IBootstrapMethodsAttribute extends IClassFileAttribute {
>+
>+	/**
>+	 * Answer back the number of bootstrap methods of this entry as specified in
>+	 * the JVM specifications.
>+	 *
>+	 * @return the number of bootstrap methods of this entry as specified in
>+	 * the JVM specifications
>+	 */
>+	int getBootstrapMethodsLength();
>+
>+	/**
>+	 * Answer back the bootstrap methods table of this entry as specified in
>+	 * the JVM specifications. Answer an empty array if none.
>+	 *
>+	 * @return the bootstrap methods table of this entry as specified in
>+	 * the JVM specifications. Answer an empty array if none
>+	 */
>+	IBootstrapMethodsEntry[] getBootstrapMethods();
>+
>+}
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IBootstrapMethodsEntry.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IBootstrapMethodsEntry.java
>new file mode 100644
>index 0000000..4078e85
>--- /dev/null
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IBootstrapMethodsEntry.java
>@@ -0,0 +1,24 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.core.util;
>+
>+/**
>+ * Description of a bootstrap method table entry as specified in the JVM specifications.
>+ *
>+ * This interface may be implemented by clients.
>+ *
>+ * @since 3.8
>+ */
>+public interface IBootstrapMethodsEntry {
>+
>+	int getBootstrapMethodReference();
>+	int[] getBootstrapArguments();
>+}
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IBytecodeVisitor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IBytecodeVisitor.java
>index 52ccb16..f36db8c 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IBytecodeVisitor.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IBytecodeVisitor.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -168,12 +168,20 @@
> 		IConstantPoolEntry constantClass);
> 	/**
> 	 * @since 3.6
>+	 * @deprecated This has been replaced with {@link #_invokedynamic(int, int, IConstantPoolEntry)}
> 	 */
> 	void _invokedynamic(
> 			int pc,
> 			int index,
> 			IConstantPoolEntry nameEntry,
> 			IConstantPoolEntry descriptorEntry);
>+	/**
>+	 * @since 3.8
>+	 */
>+	void _invokedynamic(
>+			int pc,
>+			int index,
>+			IConstantPoolEntry invokeDynamic);
> 	void _invokeinterface(
> 		int pc,
> 		int index,
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPool.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPool.java
>index 6952606..9f57bb1 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPool.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPool.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -27,8 +27,7 @@
> 	int getConstantPoolCount();
> 
> 	/**
>-	 * Answer back the type of the entry at the index @index
>-	 * in the constant pool.
>+	 * Answer back the type of the entry at the given index in the constant pool.
> 	 *
> 	 * @param index the index of the entry in the constant pool
> 	 * @return the type of the entry at the index @index in the constant pool
>@@ -36,11 +35,14 @@
> 	int getEntryKind(int index);
> 
> 	/**
>-	 * Answer back the entry at the index @index
>-	 * in the constant pool.
>+	 * Answer back the entry at the given index in the constant pool.
>+	 * 
>+	 * <p>The return value can be an instance of {@link IConstantPoolEntry2} if the value returned
>+	 * by {@link #getEntryKind(int)} is either {@link IConstantPoolConstant#CONSTANT_MethodHandle},
>+	 * {@link IConstantPoolConstant#CONSTANT_MethodType} or {@link IConstantPoolConstant#CONSTANT_InvokeDynamic}.</p>
> 	 *
> 	 * @param index the index of the entry in the constant pool
>-	 * @return the entry at the index @index in the constant pool
>+	 * @return the entry at the given index in the constant pool
> 	 */
> 	IConstantPoolEntry decodeEntry(int index);
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolConstant.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolConstant.java
>index bc7cb54..ff6ed22 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolConstant.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolConstant.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -29,6 +29,18 @@
> 	int CONSTANT_Double = 6;
> 	int CONSTANT_NameAndType = 12;
> 	int CONSTANT_Utf8 = 1;
>+	/**
>+	 * @since 3.8
>+	 */
>+	int CONSTANT_MethodHandle = 15;
>+	/**
>+	 * @since 3.8
>+	 */
>+	int CONSTANT_MethodType = 16;
>+	/**
>+	 * @since 3.8
>+	 */
>+	int CONSTANT_InvokeDynamic = 18;
> 
> 	int CONSTANT_Methodref_SIZE = 5;
> 	int CONSTANT_Class_SIZE = 3;
>@@ -41,5 +53,62 @@
> 	int CONSTANT_String_SIZE = 3;
> 	int CONSTANT_Utf8_SIZE = 3;
> 	int CONSTANT_NameAndType_SIZE = 5;
>+	/**
>+	 * @since 3.8
>+	 */
>+	int CONSTANT_MethodHandle_SIZE = 4;
>+	/**
>+	 * @since 3.8
>+	 */
>+	int CONSTANT_MethodType_SIZE = 3;
>+	/**
>+	 * @since 3.8
>+	 */
>+	int CONSTANT_InvokeDynamic_SIZE = 5;
> 
>+	/**
>+	 * The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
>+	 * @since 3.8
>+	 */
>+	int METHOD_TYPE_REF_GetField = 1;
>+	/**
>+	 * The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
>+	 * @since 3.8
>+	 */
>+	int METHOD_TYPE_REF_GetStatic = 2;
>+	/**
>+	 * The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
>+	 * @since 3.8
>+	 */
>+	int METHOD_TYPE_REF_PutField = 3;
>+	/**
>+	 * The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
>+	 * @since 3.8
>+	 */
>+	int METHOD_TYPE_REF_PutStatic = 4;
>+	/**
>+	 * The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
>+	 * @since 3.8
>+	 */
>+	int METHOD_TYPE_REF_InvokeVirtual = 5;
>+	/**
>+	 * The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
>+	 * @since 3.8
>+	 */
>+	int METHOD_TYPE_REF_InvokeStatic = 6;
>+	/**
>+	 * The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
>+	 * @since 3.8
>+	 */
>+	int METHOD_TYPE_REF_InvokeSpecial = 7;
>+	/**
>+	 * The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
>+	 * @since 3.8
>+	 */
>+	int METHOD_TYPE_REF_NewInvokeSpecial = 8;
>+	/**
>+	 * The constant is described at 5.4.3.5 in the Java 7 VM specification (part 3).
>+	 * @since 3.8
>+	 */
>+	int METHOD_TYPE_REF_InvokeInterface = 9;
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolEntry.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolEntry.java
>index 487ad82..c75bd40 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolEntry.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolEntry.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -32,6 +32,7 @@
> 	 * The value is unspecified otherwise.
> 	 *
> 	 * @return the name index for a CONSTANT_Class type entry
>+	 * @see IConstantPoolConstant#CONSTANT_Class
> 	 */
> 	int getClassInfoNameIndex();
> 
>@@ -42,16 +43,25 @@
> 	 *
> 	 * @return the class index for a CONSTANT_Fieldref,
> 	 * CONSTANT_Methodref, CONSTANT_InterfaceMethodref type entry
>+	 * @see IConstantPoolConstant#CONSTANT_Fieldref
>+	 * @see IConstantPoolConstant#CONSTANT_Methodref
>+	 * @see IConstantPoolConstant#CONSTANT_InterfaceMethodref
> 	 */
> 	int getClassIndex();
> 
> 	/**
> 	 * Returns the nameAndType index for a CONSTANT_Fieldref,
>-	 * CONSTANT_Methodref, CONSTANT_InterfaceMethodref type entry.
>+	 * CONSTANT_Methodref, CONSTANT_InterfaceMethodref,
>+	 * CONSTANT_InvokeDynamic type entry.
> 	 * The value is unspecified otherwise.
> 	 *
> 	 * @return the nameAndType index for a CONSTANT_Fieldref,
>-	 * CONSTANT_Methodref, CONSTANT_InterfaceMethodref type entry
>+	 * CONSTANT_Methodref, CONSTANT_InterfaceMethodref,
>+	 * CONSTANT_InvokeDynamic type entry
>+	 * @see IConstantPoolConstant#CONSTANT_Fieldref
>+	 * @see IConstantPoolConstant#CONSTANT_Methodref
>+	 * @see IConstantPoolConstant#CONSTANT_InterfaceMethodref
>+	 * @see IConstantPoolConstant#CONSTANT_InvokeDynamic
> 	 */
> 	int getNameAndTypeIndex();
> 
>@@ -60,6 +70,7 @@
> 	 * The value is unspecified otherwise.
> 	 *
> 	 * @return the string index for a CONSTANT_String type entry
>+	 * @see IConstantPoolConstant#CONSTANT_String
> 	 */
> 	int getStringIndex();
> 
>@@ -68,6 +79,7 @@
> 	 * Returns null otherwise.
> 	 *
> 	 * @return the string value for a CONSTANT_String type entry
>+	 * @see IConstantPoolConstant#CONSTANT_String
> 	 */
> 	String getStringValue();
> 
>@@ -76,6 +88,7 @@
> 	 * The value is unspecified otherwise.
> 	 *
> 	 * @return the integer value for a CONSTANT_Integer type entry
>+	 * @see IConstantPoolConstant#CONSTANT_Integer
> 	 */
> 	int getIntegerValue();
> 
>@@ -84,6 +97,7 @@
> 	 * The value is unspecified otherwise.
> 	 *
> 	 * @return the float value for a CONSTANT_Float type entry
>+	 * @see IConstantPoolConstant#CONSTANT_Float
> 	 */
> 	float getFloatValue();
> 
>@@ -92,6 +106,7 @@
> 	 * The value is unspecified otherwise.
> 	 *
> 	 * @return the double value for a CONSTANT_Double type entry
>+	 * @see IConstantPoolConstant#CONSTANT_Double
> 	 */
> 	double getDoubleValue();
> 
>@@ -100,6 +115,7 @@
> 	 * The value is unspecified otherwise.
> 	 *
> 	 * @return the long value for a CONSTANT_Long type entry
>+	 * @see IConstantPoolConstant#CONSTANT_Long
> 	 */
> 	long getLongValue();
> 
>@@ -108,6 +124,7 @@
> 	 * The value is unspecified otherwise.
> 	 *
> 	 * @return the descriptor index for a CONSTANT_NameAndType type entry
>+	 * @see IConstantPoolConstant#CONSTANT_NameAndType
> 	 */
> 	int getNameAndTypeInfoDescriptorIndex();
> 
>@@ -116,6 +133,7 @@
> 	 * The value is unspecified otherwise.
> 	 *
> 	 * @return the name index for a CONSTANT_NameAndType type entry
>+	 * @see IConstantPoolConstant#CONSTANT_NameAndType
> 	 */
> 	int getNameAndTypeInfoNameIndex();
> 
>@@ -124,6 +142,7 @@
> 	 * Returns null otherwise.
> 	 *
> 	 * @return the class name for a CONSTANT_Class type entry
>+	 * @see IConstantPoolConstant#CONSTANT_Class
> 	 */
> 	char[] getClassInfoName();
> 
>@@ -134,6 +153,9 @@
> 	 *
> 	 * @return the class name for a CONSTANT_Fieldref,
> 	 * CONSTANT_Methodref, CONSTANT_InterfaceMethodref type entry
>+	 * @see IConstantPoolConstant#CONSTANT_Fieldref
>+	 * @see IConstantPoolConstant#CONSTANT_Methodref
>+	 * @see IConstantPoolConstant#CONSTANT_InterfaceMethodref
> 	 */
> 	char[] getClassName();
> 
>@@ -142,16 +164,20 @@
> 	 * Returns null otherwise.
> 	 *
> 	 * @return the field name for a CONSTANT_Fieldref type entry
>+	 * @see IConstantPoolConstant#CONSTANT_Fieldref
> 	 */
> 	char[] getFieldName();
> 
> 	/**
>-	 * Returns the field name for a CONSTANT_Methodref or CONSTANT_InterfaceMethodred
>-	 * type entry.
>+	 * Returns the field name for a CONSTANT_Methodref, CONSTANT_InterfaceMethodref
>+	 * or CONSTANT_InvokeDynamic type entry.
> 	 * Returns null otherwise.
> 	 *
>-	 * @return the field name for a CONSTANT_Methodref or CONSTANT_InterfaceMethodred
>-	 * type entry
>+	 * @return the method name for a CONSTANT_Methodref, CONSTANT_InterfaceMethodref
>+	 * or CONSTANT_InvokeDynamic type entry
>+	 * @see IConstantPoolConstant#CONSTANT_Methodref
>+	 * @see IConstantPoolConstant#CONSTANT_InterfaceMethodref
>+	 * @see IConstantPoolConstant#CONSTANT_InvokeDynamic
> 	 */
> 	char[] getMethodName();
> 
>@@ -162,18 +188,27 @@
> 	 *
> 	 * @return the field descriptor value for a CONSTANT_Fieldref type entry. This value
> 	 * is set only when decoding the CONSTANT_Fieldref entry
>+	 * @see IConstantPoolConstant#CONSTANT_Fieldref
> 	 */
> 	char[] getFieldDescriptor();
> 
> 	/**
> 	 * Returns the method descriptor value for a CONSTANT_Methodref or
> 	 * CONSTANT_InterfaceMethodref type entry. This value is set only when decoding the
>-	 * CONSTANT_Methodref or CONSTANT_InterfaceMethodref entry.
>+	 * CONSTANT_Methodref, CONSTANT_InterfaceMethodref, CONSTANT_MethodType
>+	 * or CONSTANT_InvokeDynamic entry.
>+	 * 
> 	 * Returns null otherwise.
> 	 *
>-	 * @return the method descriptor value for a CONSTANT_Methodref or
>+	 * @return the method descriptor value for a CONSTANT_Methodref,
> 	 * CONSTANT_InterfaceMethodref type entry. This value is set only when decoding the
>-	 * CONSTANT_Methodref or CONSTANT_InterfaceMethodref entry
>+	 * CONSTANT_Methodref, CONSTANT_InterfaceMethodref, CONSTANT_MethodType
>+	 * or CONSTANT_InvokeDynamic entry
>+	 *
>+	 * @see IConstantPoolConstant#CONSTANT_Methodref
>+	 * @see IConstantPoolConstant#CONSTANT_InterfaceMethodref
>+	 * @see IConstantPoolConstant#CONSTANT_MethodType
>+	 * @see IConstantPoolConstant#CONSTANT_InvokeDynamic
> 	 */
> 	char[] getMethodDescriptor();
> 
>@@ -184,6 +219,7 @@
> 	 *
> 	 * @return the utf8 value for a CONSTANT_Utf8 type entry. This value is set only when
> 	 * decoding a UTF8 entry
>+	 * @see IConstantPoolConstant#CONSTANT_Utf8
> 	 */
> 	char[] getUtf8Value();
> 
>@@ -194,6 +230,7 @@
> 	 *
> 	 * @return the utf8 length for a CONSTANT_Utf8 type entry. This value is set only when
> 	 * decoding a UTF8 entry
>+	 * @see IConstantPoolConstant#CONSTANT_Utf8
> 	 */
> 	int getUtf8Length();
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolEntry2.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolEntry2.java
>new file mode 100644
>index 0000000..3b4984b
>--- /dev/null
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolEntry2.java
>@@ -0,0 +1,59 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.core.util;
>+
>+/**
>+ * Description of the new constant pool entry as described in the JVM specifications
>+ * added for Java 7 support.
>+ * Its contents is initialized according to its kind.
>+ *
>+ * This interface may be implemented by clients.
>+ *
>+ * @since 3.8
>+ */
>+public interface IConstantPoolEntry2 extends IConstantPoolEntry {
>+	/**
>+	 * Returns the descriptor index. This value is set only when decoding a MethodType entry.
>+	 * The value is unspecified otherwise. The corresponding UTF8 value can be retrieved by using
>+	 * {@link #getMethodDescriptor()}.
>+	 *
>+	 * @return the descriptor index. This value is set only when decoding a MethodType entry.
>+	 * @see IConstantPoolConstant#CONSTANT_MethodType
>+	 */
>+	int getDescriptorIndex();
>+
>+	/**
>+	 * Returns the reference kind. This value is set only when decoding a MethodHandle entry.
>+	 * The value is unspecified otherwise.
>+	 *
>+	 * @return the reference kind. This value is set only when decoding a MethodHandle entry.
>+	 * @see IConstantPoolConstant#CONSTANT_MethodHandle
>+	 */
>+	int getReferenceKind();
>+
>+	/**
>+	 * Returns the reference index. This value is set only when decoding a MethodHandle entry.
>+	 * The value is unspecified otherwise.
>+	 *
>+	 * @return the reference kind. This value is set only when decoding a MethodHandle entry.
>+	 * @see IConstantPoolConstant#CONSTANT_MethodHandle
>+	 */
>+	int getReferenceIndex();
>+	
>+	/**
>+	 * Returns the bootstrap method attribute index. This value is set only when decoding a InvokeDynamic entry.
>+	 * The value is unspecified otherwise.
>+	 *
>+	 * @return the reference kind. This value is set only when decoding a MethodHandle entry.
>+	 * @see IConstantPoolConstant#CONSTANT_InvokeDynamic
>+	 */
>+	int getBootstrapMethodAttributeIndex();
>+}
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/DocumentElementParser.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/DocumentElementParser.java
>index cea4763..597b56c 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/DocumentElementParser.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/DocumentElementParser.java
>@@ -623,6 +623,9 @@
> 			arg.annotations = new Annotation[length],
> 			0,
> 			length);
>+		RecoveredType currentRecoveryType = this.currentRecoveryType();
>+		if (currentRecoveryType != null)
>+			currentRecoveryType.annotationsConsumed(arg.annotations);
> 	}
> 	pushOnAstStack(arg);
> 	this.intArrayPtr--;
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/SourceJavadocParser.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/SourceJavadocParser.java
>index 6f96497..00461e7 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/SourceJavadocParser.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/SourceJavadocParser.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -93,10 +93,10 @@
> 		this.index++;
> 		while (this.source[this.index] == 'u')
> 			this.index++;
>-		if (!(((c1 = ScannerHelper.getNumericValue(this.source[this.index++])) > 15 || c1 < 0)
>-				|| ((c2 = ScannerHelper.getNumericValue(this.source[this.index++])) > 15 || c2 < 0)
>-				|| ((c3 = ScannerHelper.getNumericValue(this.source[this.index++])) > 15 || c3 < 0)
>-				|| ((c4 = ScannerHelper.getNumericValue(this.source[this.index++])) > 15 || c4 < 0))) {
>+		if (!(((c1 = ScannerHelper.getHexadecimalValue(this.source[this.index++])) > 15 || c1 < 0)
>+				|| ((c2 = ScannerHelper.getHexadecimalValue(this.source[this.index++])) > 15 || c2 < 0)
>+				|| ((c3 = ScannerHelper.getHexadecimalValue(this.source[this.index++])) > 15 || c3 < 0)
>+				|| ((c4 = ScannerHelper.getHexadecimalValue(this.source[this.index++])) > 15 || c4 < 0))) {
> 			first = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
> 		} else {
> 			this.index = pos;
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter.java
>index a5e4af3..ffae433 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -7,7 +7,9 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>- *     Stephan Herrmann <stephan@cs.tu-berlin.de> - TypeConverters don't set enclosingType - https://bugs.eclipse.org/bugs/show_bug.cgi?id=320841
>+ *     Stephan Herrmann <stephan@cs.tu-berlin.de> - Contributions for
>+ *     								Bug 320841 - TypeConverters don't set enclosingType
>+ *     								Bug 353474 - type converters should include more annotations
>  *******************************************************************************/
> package org.eclipse.jdt.internal.compiler.parser;
> 
>@@ -28,6 +30,7 @@
> import org.eclipse.jdt.core.IAnnotation;
> import org.eclipse.jdt.core.IImportDeclaration;
> import org.eclipse.jdt.core.IJavaElement;
>+import org.eclipse.jdt.core.ILocalVariable;
> import org.eclipse.jdt.core.ISourceRange;
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.Signature;
>@@ -373,6 +376,7 @@
> 		char[][] argumentNames = methodInfo.getArgumentNames();
> 		int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;
> 		if (argumentCount > 0) {
>+			ILocalVariable[] parameters = methodHandle.getParameters();
> 			long position = ((long) start << 32) + end;
> 			method.arguments = new Argument[argumentCount];
> 			for (int i = 0; i < argumentCount; i++) {
>@@ -387,6 +391,11 @@
> 						typeReference,
> 						ClassFileConstants.AccDefault);
> 				// do not care whether was final or not
>+				// convert 1.5 specific constructs only if compliance is 1.5 or above
>+				if (this.has1_5Compliance) {
>+					/* convert annotations */
>+					method.arguments[i].annotations = convertAnnotations(parameters[i]);
>+				}
> 			}
> 		}
> 
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BasicCompilationUnit.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BasicCompilationUnit.java
>index 3b7e3ac..11cdaa3 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BasicCompilationUnit.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BasicCompilationUnit.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -133,6 +133,9 @@
> public char[][] getPackageName() {
> 	return this.packageName;
> }
>+public boolean ignoreOptionalProblems() {
>+	return false;
>+}
> public String toString(){
> 	return "CompilationUnit: "+new String(this.fileName); //$NON-NLS-1$
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMember.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMember.java
>index 94e6db1..3f6d742 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMember.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMember.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -86,12 +86,6 @@
> 	}
> 	if ((tagBits & TagBits.AnnotationSafeVarargs) != 0) {
> 		annotations.add(getAnnotation(TypeConstants.JAVA_LANG_SAFEVARARGS));
>-	}
>-	if ((tagBits & TagBits.AnnotationPostConstruct) != 0) {
>-		annotations.add(getAnnotation(TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT));
>-	}
>-	if ((tagBits & TagBits.AnnotationPreDestroy) != 0) {
>-		annotations.add(getAnnotation(TypeConstants.JAVAX_ANNOTATION_PREDESTROY));
> 	}
> 	// note that JAVA_LANG_SUPPRESSWARNINGS and JAVA_LANG_OVERRIDE cannot appear in binaries
> 	return (IAnnotation[]) annotations.toArray(new IAnnotation[annotations.size()]);
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java
>index bcf7ceb..e1714a0 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -107,12 +107,6 @@
> 	}
> 	if ((tagBits & TagBits.AnnotationSafeVarargs) != 0) {
> 		generateStandardAnnotation(javaElement, TypeConstants.JAVA_LANG_SAFEVARARGS, Annotation.NO_MEMBER_VALUE_PAIRS, newElements);
>-	}
>-	if ((tagBits & TagBits.AnnotationPostConstruct) != 0) {
>-		generateStandardAnnotation(javaElement, TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT, Annotation.NO_MEMBER_VALUE_PAIRS, newElements);
>-	}
>-	if ((tagBits & TagBits.AnnotationPreDestroy) != 0) {
>-		generateStandardAnnotation(javaElement, TypeConstants.JAVAX_ANNOTATION_PREDESTROY, Annotation.NO_MEMBER_VALUE_PAIRS, newElements);
> 	}
> 	// note that JAVA_LANG_SUPPRESSWARNINGS and JAVA_LANG_OVERRIDE cannot appear in binaries
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileWorkingCopy.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileWorkingCopy.java
>index d1027f2..4c085ce 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileWorkingCopy.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileWorkingCopy.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Stephan Herrmann - Contribution for Bug 337935 - Test failures when run as an IDE (org.eclipse.sdk.ide)
>  *******************************************************************************/
> package org.eclipse.jdt.internal.core;
> 
>@@ -81,21 +82,18 @@
> protected IBuffer openBuffer(IProgressMonitor pm, Object info) throws JavaModelException {
> 
> 	// create buffer
>-	IBuffer buffer = this.owner.createBuffer(this);
>-	if (buffer == null) return null;
>+	IBuffer buffer = BufferManager.createBuffer(this);
> 
> 	// set the buffer source
>-	if (buffer.getCharacters() == null) {
>-		IBuffer classFileBuffer = this.classFile.getBuffer();
>-		if (classFileBuffer != null) {
>-			buffer.setContents(classFileBuffer.getCharacters());
>-		} else {
>-			// Disassemble
>-			IClassFileReader reader = ToolFactory.createDefaultClassFileReader(this.classFile, IClassFileReader.ALL);
>-			Disassembler disassembler = new Disassembler();
>-			String contents = disassembler.disassemble(reader, Util.getLineSeparator("", getJavaProject()), ClassFileBytesDisassembler.WORKING_COPY); //$NON-NLS-1$
>-			buffer.setContents(contents);
>-		}
>+	IBuffer classFileBuffer = this.classFile.getBuffer();
>+	if (classFileBuffer != null) {
>+		buffer.setContents(classFileBuffer.getCharacters());
>+	} else {
>+		// Disassemble
>+		IClassFileReader reader = ToolFactory.createDefaultClassFileReader(this.classFile, IClassFileReader.ALL);
>+		Disassembler disassembler = new Disassembler();
>+		String contents = disassembler.disassemble(reader, Util.getLineSeparator("", getJavaProject()), ClassFileBytesDisassembler.WORKING_COPY); //$NON-NLS-1$
>+		buffer.setContents(contents);
> 	}
> 
> 	// add buffer to buffer cache
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathChange.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathChange.java
>index b96cd44..7a461df 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathChange.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathChange.java
>@@ -10,6 +10,7 @@
>  *******************************************************************************/
> package org.eclipse.jdt.internal.core;
> 
>+import java.net.URL;
> import java.util.ArrayList;
> import java.util.HashMap;
> import java.util.HashSet;
>@@ -335,7 +336,7 @@
> 							boolean found = false;
> 							for (int j = 0; j < accumulatedRoots.size(); j++) {
> 								IPackageFragmentRoot root = (IPackageFragmentRoot) accumulatedRoots.elementAt(j);
>-								if (!root.getPath().equals(oldRoot.getPath())) {
>+								if (root.getPath().equals(oldRoot.getPath())) {
> 									found = true;
> 									break;
> 								}
>@@ -511,7 +512,7 @@
> 
> 		for (int i = 0; i < newLength; i++) {
> 			int index = classpathContains(this.oldResolvedClasspath, newResolvedClasspath[i]);
>-			if (index == -1) {
>+			if (index == -1 || newResolvedClasspath[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
> 				// remote projects are not indexed in this project
> 				if (newResolvedClasspath[i].getEntryKind() == IClasspathEntry.CPE_PROJECT){
> 					continue;
>@@ -519,6 +520,7 @@
> 
> 				// Request indexing
> 				int entryKind = newResolvedClasspath[i].getEntryKind();
>+				URL newurl = ((ClasspathEntry)newResolvedClasspath[i]).getLibraryIndexLocation();
> 				switch (entryKind) {
> 					case IClasspathEntry.CPE_LIBRARY:
> 						boolean pathHasChanged = true;
>@@ -526,12 +528,19 @@
> 						for (int j = 0; j < oldLength; j++) {
> 							IClasspathEntry oldEntry = this.oldResolvedClasspath[j];
> 							if (oldEntry.getPath().equals(newPath)) {
>-								pathHasChanged = false;
>+								URL oldurl = ((ClasspathEntry)oldEntry).getLibraryIndexLocation();
>+								if (oldurl == null && newurl == null) {
>+									pathHasChanged = false;
>+								} else if (oldurl != null && newurl != null) {
>+									pathHasChanged = !(newurl.equals(oldurl));
>+								} else if (oldurl != null) {
>+									indexManager.removeIndex(newPath);
>+								}
> 								break;
> 							}
> 						}
> 						if (pathHasChanged) {
>-							indexManager.indexLibrary(newPath, this.project.getProject());
>+							indexManager.indexLibrary(newPath, this.project.getProject(), newurl);
> 						}
> 						break;
> 					case IClasspathEntry.CPE_SOURCE:
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java
>index d8086ff..8baef63 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Terry Parker <tparker@google.com> - DeltaProcessor misses state changes in archive files, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=357425
>  *******************************************************************************/
> package org.eclipse.jdt.internal.core;
> 
>@@ -16,6 +17,8 @@
> import java.io.InputStream;
> import java.io.OutputStreamWriter;
> import java.io.UnsupportedEncodingException;
>+import java.net.MalformedURLException;
>+import java.net.URL;
> import java.util.ArrayList;
> import java.util.HashMap;
> import java.util.HashSet;
>@@ -1268,6 +1271,15 @@
> 		return false;
> 	}
> 
>+	public String getSourceAttachmentEncoding() {
>+		for (int i = 0, length = this.extraAttributes.length; i < length; i++) {
>+			IClasspathAttribute attribute = this.extraAttributes[i];
>+			if (IClasspathAttribute.SOURCE_ATTACHMENT_ENCODING.equals(attribute.getName()))
>+				return attribute.getValue();
>+		}
>+		return null;
>+	}
>+	
> 	/**
> 	 * Returns the kind of a <code>PackageFragmentRoot</code> from its <code>String</code> form.
> 	 */
>@@ -1523,6 +1535,45 @@
> 
> 		return JavaCore.getResolvedClasspathEntry(this);
> 	}
>+	
>+	/**
>+	 * This function computes the URL of the index location for this classpath entry. It returns null if the URL is
>+	 * invalid.
>+	 */
>+	public URL getLibraryIndexLocation() {
>+		switch(getEntryKind()) {
>+			case IClasspathEntry.CPE_LIBRARY :
>+			case IClasspathEntry.CPE_VARIABLE :
>+				break;
>+			default :
>+				return null;
>+		}
>+		if (this.extraAttributes == null) return null;
>+		for (int i= 0; i < this.extraAttributes.length; i++) {
>+			IClasspathAttribute attrib= this.extraAttributes[i];
>+			if (IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME.equals(attrib.getName())) {
>+				String value = attrib.getValue();
>+				try {
>+					return new URL(value);
>+				} catch (MalformedURLException e) {
>+					return null;
>+				}
>+			}
>+		}
>+		return null;
>+	}
>+
>+	public boolean ignoreOptionalProblems() {
>+		if (this.entryKind == IClasspathEntry.CPE_SOURCE) {
>+			for (int i = 0; i < this.extraAttributes.length; i++) {
>+				IClasspathAttribute attrib = this.extraAttributes[i];
>+				if (IClasspathAttribute.IGNORE_OPTIONAL_PROBLEMS.equals(attrib.getName())) {
>+					return "true".equals(attrib.getValue()); //$NON-NLS-1$
>+				}
>+			}
>+		}
>+		return false;
>+	}
> 
> 	/**
> 	 * Validate a given classpath and output location for a project, using the following rules:
>@@ -1776,6 +1827,7 @@
> 		// perform one separate iteration so as to not take precedence over previously checked scenarii (in particular should
> 		// diagnose nesting source folder issue before this one, for example, [src]"Project/", [src]"Project/source/" and output="Project/" should
> 		// first complain about missing exclusion pattern
>+		IJavaModelStatus cachedStatus = null;
> 		for (int i = 0 ; i < length; i++) {
> 			IClasspathEntry entry = classpath[i];
> 			if (entry == null) continue;
>@@ -1788,30 +1840,53 @@
> 
> 			if (kind == IClasspathEntry.CPE_SOURCE) {
> 				IPath output = entry.getOutputLocation();
>-				if (output == null) continue; // 36465 - for 2.0 backward compatibility, only check specific output locations (the default can still coincidate)
>-				// if (output == null) output = projectOutputLocation; // if no specific output, still need to check using default output (this line would check default output)
>+				if (output == null) output = projectOutputLocation; // if no specific output, still need to check using default output (this line would check default output)
> 				for (int j = 0; j < length; j++) {
> 					IClasspathEntry otherEntry = classpath[j];
> 					if (otherEntry == entry) continue;
> 
>-					// Build some common strings for status message
>-					boolean opStartsWithProject = projectName.equals(otherEntry.getPath().segment(0));
>-					String otherPathMsg = opStartsWithProject ? otherEntry.getPath().removeFirstSegments(1).toString() : otherEntry.getPath().makeRelative().toString();
>-
> 					switch (otherEntry.getEntryKind()) {
> 						case IClasspathEntry.CPE_SOURCE :
>-							if (otherEntry.getPath().equals(output)) {
>-								return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Messages.bind(Messages.classpath_cannotUseDistinctSourceFolderAsOutput, new String[] {entryPathMsg, otherPathMsg, projectName}));
>+							// Bug 287164 : Report errors of overlapping output locations only if the user sets the corresponding preference.
>+							// The check is required for backward compatibility with bug-fix 36465.
>+							String option = javaProject.getOption(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, true);
>+							if (otherEntry.getPath().equals(output) 
>+									&& !JavaCore.IGNORE.equals(option)) {
>+								boolean opStartsWithProject = projectName.equals(otherEntry.getPath().segment(0));
>+								String otherPathMsg = opStartsWithProject ? otherEntry.getPath().removeFirstSegments(1).toString() : otherEntry.getPath().makeRelative().toString();
>+								if (JavaCore.ERROR.equals(option)) {
>+									return new JavaModelStatus(IStatus.ERROR, IJavaModelStatusConstants.OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, 
>+											Messages.bind(Messages.classpath_cannotUseDistinctSourceFolderAsOutput, new String[] {
>+											entryPathMsg, otherPathMsg, projectName }));
>+								}
>+								if (cachedStatus == null) {
>+									// Note that the isOK() is being overridden to return true. This is an exceptional scenario
>+									cachedStatus = new JavaModelStatus(IStatus.OK, IJavaModelStatusConstants.OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, 
>+										Messages.bind(Messages.classpath_cannotUseDistinctSourceFolderAsOutput, new String[] {
>+										entryPathMsg, otherPathMsg, projectName })){
>+										public boolean isOK() {
>+											return true;
>+										}
>+									};
>+								}
> 							}
> 							break;
> 						case IClasspathEntry.CPE_LIBRARY :
>-							if (otherEntry.getPath().equals(output)) {
>+							if (output != projectOutputLocation && otherEntry.getPath().equals(output)) {
>+								boolean opStartsWithProject = projectName.equals(otherEntry.getPath().segment(0));
>+								String otherPathMsg = opStartsWithProject ? otherEntry.getPath().removeFirstSegments(1).toString() : otherEntry.getPath().makeRelative().toString();
> 								return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Messages.bind(Messages.classpath_cannotUseLibraryAsOutput, new String[] {entryPathMsg, otherPathMsg, projectName}));
> 							}
> 					}
> 				}
> 			}
> 		}
>+
>+		// NOTE: The above code that checks for IJavaModelStatusConstants.OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, can be configured to return
>+		// a WARNING status and hence should be at the end of this validation method. Any other code that might return a more severe ERROR should be 
>+		// inserted before the mentioned code.
>+		if (cachedStatus != null) return cachedStatus;
>+
> 		return JavaModelStatus.VERIFIED_OK;
> 	}
> 
>@@ -1827,6 +1902,9 @@
> 	 * @return a java model status describing the problem related to this classpath entry if any, a status object with code <code>IStatus.OK</code> if the entry is fine
> 	 */
> 	public static IJavaModelStatus validateClasspathEntry(IJavaProject project, IClasspathEntry entry, boolean checkSourceAttachment, boolean referredByContainer){
>+		if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
>+			JavaModelManager.getJavaModelManager().removeFromInvalidArchiveCache(entry.getPath());
>+		}
> 		IJavaModelStatus status = validateClasspathEntry(project, entry, null, checkSourceAttachment, referredByContainer);
> 		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=171136 and https://bugs.eclipse.org/bugs/show_bug.cgi?id=300136
> 		// Ignore class path errors from optional entries.
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathValidation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathValidation.java
>index ea310a3..345535a 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathValidation.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathValidation.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -12,6 +12,7 @@
> 
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.IStatus;
> import org.eclipse.jdt.core.IClasspathEntry;
> import org.eclipse.jdt.core.IJavaModelStatus;
> import org.eclipse.jdt.core.JavaModelException;
>@@ -37,7 +38,7 @@
> 			// project doesn't exist
> 			IProject resource = this.project.getProject();
> 			if (resource.isAccessible()) {
>-				this.project.flushClasspathProblemMarkers(true/*flush cycle markers*/, true/*flush classpath format markers*/);
>+				this.project.flushClasspathProblemMarkers(true/*flush cycle markers*/, true/*flush classpath format markers*/, true /*flush overlapping output markers*/);
> 
> 				// remove problems and tasks created  by the builder
> 				JavaBuilder.removeProblemsAndTasksFor(resource);
>@@ -56,12 +57,15 @@
> 		}
> 
> 		// update classpath format problems
>-		this.project.flushClasspathProblemMarkers(false/*cycle*/, true/*format*/);
>+		this.project.flushClasspathProblemMarkers(false/*cycle*/, true/*format*/, false/*overlapping*/);
> 		if (!status.isOK())
> 			this.project.createClasspathProblemMarker(status);
> 
>+		// update overlapping output problem markers 
>+		this.project.flushClasspathProblemMarkers(false/*cycle*/, false/*format*/, true/*overlapping*/);
>+		
> 		// update resolved classpath problems
>-		this.project.flushClasspathProblemMarkers(false/*cycle*/, false/*format*/);
>+		this.project.flushClasspathProblemMarkers(false/*cycle*/, false/*format*/, false/*overlapping*/);
> 
> 		if (rawClasspath != JavaProject.INVALID_CLASSPATH && outputLocation != null) {
> 		 	for (int i = 0; i < rawClasspath.length; i++) {
>@@ -71,7 +75,7 @@
> 				}
> 			 }
> 			status = ClasspathEntry.validateClasspath(this.project, rawClasspath, outputLocation);
>-			if (!status.isOK())
>+			if (status.getCode() != IStatus.OK)
> 				this.project.createClasspathProblemMarker(status);
> 		 }
> 	}
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java
>index ae648ae..332762c 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -1005,6 +1005,9 @@
> 	if (resource == null) return false;
> 	return ((CompilationUnitElementInfo)info).timestamp != resource.getModificationStamp();
> }
>+public boolean ignoreOptionalProblems() {
>+	return getPackageFragmentRoot().ignoreOptionalProblems();
>+}
> /**
>  * @see IWorkingCopy#isBasedOn(IResource)
>  * @deprecated
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java
>index 1374a3f..a4891ca 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -91,8 +91,9 @@
> 	 */
> 	public void accept(ISourceType[] sourceTypes, PackageBinding packageBinding, AccessRestriction accessRestriction) {
> 		// ensure to jump back to toplevel type for first one (could be a member)
>-//		while (sourceTypes[0].getEnclosingType() != null)
>-//			sourceTypes[0] = sourceTypes[0].getEnclosingType();
>+		while (sourceTypes[0].getEnclosingType() != null) {
>+			sourceTypes[0] = sourceTypes[0].getEnclosingType();
>+		}
> 
> 		CompilationResult result =
> 			new CompilationResult(sourceTypes[0].getFileName(), 1, 1, this.options.maxProblemsPerUnit);
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java
>index 50a0c9d..0312971 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java
>@@ -81,6 +81,12 @@
> 	 */
> 	private HashtableOfObjectToInt occurenceCounts;
> 
>+	/*
>+	 * A table to store the occurrence count of anonymous types. The key will be the handle to the
>+	 * enclosing type of the anonymous.
>+	 */
>+	private HashtableOfObjectToInt localOccurrenceCounts;
>+
> 	/**
> 	 * Stack of parent scope info objects. The info on the
> 	 * top of the stack is the parent of the next element found.
>@@ -128,6 +134,7 @@
> 	this.unitInfo = unitInfo;
> 	this.newElements = newElements;
> 	this.occurenceCounts = new HashtableOfObjectToInt();
>+	this.localOccurrenceCounts = new HashtableOfObjectToInt(5);
> }
> /**
>  * @see ISourceElementRequestor
>@@ -707,6 +714,20 @@
> 		this.occurenceCounts.put(handle, ++occurenceCount);
> 		handle.occurrenceCount = occurenceCount;
> 	}
>+
>+	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=342393
>+	// For anonymous source types, the occurrence count should be in the context
>+	// of the enclosing type.
>+	if (handle instanceof SourceType && handle.getElementName().length() == 0) {
>+		Object key = handle.getParent().getAncestor(IJavaElement.TYPE);
>+		occurenceCount = this.localOccurrenceCounts.get(key);
>+		if (occurenceCount == -1)
>+			this.localOccurrenceCounts.put(key, 1);
>+		else {
>+			this.localOccurrenceCounts.put(key, ++occurenceCount);
>+			((SourceType)handle).localOccurrenceCount = occurenceCount;
>+		}
>+	}
> }
> protected IMemberValuePair getMemberValuePair(MemberValuePair memberValuePair) {
> 	String memberName = new String(memberValuePair.name);
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java
>index 291378c..426d41e 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java
>@@ -266,20 +266,29 @@
> 	 * <li>On a copy, the delta should be rooted in the dest project
> 	 * <li>On a move, two deltas are generated<ul>
> 	 * 			<li>one rooted in the source project
>-	 *			<li>one rooted in the destination project</ul></ul>
>+	 *			<li>one rooted in the destination project
>+	 * <li> When a CU is being overwritten, the delta on the destination will be of type F_CONTENT </ul></ul>
> 	 * If the operation is rooted in a single project, the delta is rooted in that project
> 	 *
> 	 */
>-	protected void prepareDeltas(IJavaElement sourceElement, IJavaElement destinationElement, boolean isMove) {
>+	protected void prepareDeltas(IJavaElement sourceElement, IJavaElement destinationElement, boolean isMove, boolean overWriteCU) {
> 		if (Util.isExcluded(sourceElement) || Util.isExcluded(destinationElement)) return;
>+		
> 		IJavaProject destProject = destinationElement.getJavaProject();
> 		if (isMove) {
> 			IJavaProject sourceProject = sourceElement.getJavaProject();
> 			getDeltaFor(sourceProject).movedFrom(sourceElement, destinationElement);
>-			getDeltaFor(destProject).movedTo(destinationElement, sourceElement);
>+			if (!overWriteCU) {
>+				getDeltaFor(destProject).movedTo(destinationElement, sourceElement);
>+				return;
>+			}
> 		} else {
>-			getDeltaFor(destProject).added(destinationElement);
>+			if (!overWriteCU) {
>+				getDeltaFor(destProject).added(destinationElement);
>+				return;
>+			}
> 		}
>+		getDeltaFor(destinationElement.getJavaProject()).changed(destinationElement, IJavaElementDelta.F_CONTENT);
> 	}
> 	/**
> 	 * Copies/moves a compilation unit with the name <code>newCUName</code>
>@@ -357,12 +366,14 @@
> 			}
> 
> 			// register the correct change deltas
>-			prepareDeltas(source, destCU, isMove());
>+			boolean contentChanged = this.force && destFile.exists();
>+			prepareDeltas(source, destCU, isMove(), contentChanged);
>+			
> 			if (newCUName != null) {
> 				//the main type has been renamed
> 				String oldName = Util.getNameWithoutJavaLikeExtension(source.getElementName());
> 				String newName = Util.getNameWithoutJavaLikeExtension(newCUName);
>-				prepareDeltas(source.getType(oldName), destCU.getType(newName), isMove());
>+				prepareDeltas(source.getType(oldName), destCU.getType(newName), isMove(), false);
> 			}
> 		} else {
> 			if (!this.force) {
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java
>index b15d3c8..c36e288 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java
>@@ -7,10 +7,13 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Terry Parker <tparker@google.com> - DeltaProcessor exhibits O(N^2) behavior, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=354332
>+ *     Terry Parker <tparker@google.com> - DeltaProcessor misses state changes in archive files, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=357425
>  *******************************************************************************/
> package org.eclipse.jdt.internal.core;
> 
> import java.io.File;
>+import java.net.URL;
> import java.util.*;
> 
> import org.eclipse.core.resources.IContainer;
>@@ -953,6 +956,7 @@
> 				// project does not exist -> ignore
> 				continue;
> 			}
>+			boolean deltaContainsModifiedJar = false;
> 			for (int j = 0; j < entries.length; j++){
> 				if (entries[j].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
> 					IPath entryPath = entries[j].getPath();
>@@ -994,8 +998,12 @@
> 									// first remove the index so that it is forced to be re-indexed
> 									this.manager.indexManager.removeIndex(entryPath);
> 									// then index the jar
>-									this.manager.indexManager.indexLibrary(entryPath, project.getProject());
>+									this.manager.indexManager.indexLibrary(entryPath, project.getProject(), ((ClasspathEntry)entries[j]).getLibraryIndexLocation());
> 								} else {
>+									URL indexLocation = ((ClasspathEntry)entries[j]).getLibraryIndexLocation();
>+									if (indexLocation != null) { // force reindexing, this could be faster rather than maintaining the list
>+										this.manager.indexManager.indexLibrary(entryPath, project.getProject(), indexLocation);
>+									}
> 									externalArchivesStatus.put(entryPath, EXTERNAL_JAR_UNCHANGED);
> 								}
> 							} else {
>@@ -1006,7 +1014,7 @@
> 									this.state.getExternalLibTimeStamps().put(entryPath, new Long(newTimeStamp));
> 									// index the new jar
> 									this.manager.indexManager.removeIndex(entryPath);
>-									this.manager.indexManager.indexLibrary(entryPath, project.getProject());
>+									this.manager.indexManager.indexLibrary(entryPath, project.getProject(), ((ClasspathEntry)entries[j]).getLibraryIndexLocation());
> 								}
> 							}
> 						} else { // internal JAR
>@@ -1022,7 +1030,7 @@
> 								System.out.println("- External JAR ADDED, affecting root: "+root.getElementName()); //$NON-NLS-1$
> 							}
> 							elementAdded(root, null, null);
>-							javaProject.resetResolvedClasspath(); // in case it contains a chained jar
>+							deltaContainsModifiedJar = true;
> 							this.state.addClasspathValidation(javaProject); // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=185733
> 							hasDelta = true;
> 						} else if (status == EXTERNAL_JAR_CHANGED) {
>@@ -1031,7 +1039,7 @@
> 								System.out.println("- External JAR CHANGED, affecting root: "+root.getElementName()); //$NON-NLS-1$
> 							}
> 							contentChanged(root);
>-							javaProject.resetResolvedClasspath(); // in case it contains a chained jar
>+							deltaContainsModifiedJar = true;
> 							hasDelta = true;
> 						} else if (status == EXTERNAL_JAR_REMOVED) {
> 							PackageFragmentRoot root = (PackageFragmentRoot) javaProject.getPackageFragmentRoot(entryPath.toString());
>@@ -1039,12 +1047,16 @@
> 								System.out.println("- External JAR REMOVED, affecting root: "+root.getElementName()); //$NON-NLS-1$
> 							}
> 							elementRemoved(root, null, null);
>-							javaProject.resetResolvedClasspath(); // in case it contains a chained jar
>+							deltaContainsModifiedJar = true;
> 							this.state.addClasspathValidation(javaProject); // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=185733
> 							hasDelta = true;
> 						}
> 					}
> 				}
>+			}
>+			
>+			if (deltaContainsModifiedJar) {
>+				javaProject.resetResolvedClasspath();
> 			}
> 		}
> 		// ensure the external file cache is reset so that if a .jar file is deleted but no longer on the classpath, it won't appear as changed next time it is added
>@@ -2622,13 +2634,13 @@
> 					switch (delta.getKind()) {
> 						case IResourceDelta.ADDED:
> 							// index the new jar
>-							indexManager.indexLibrary(jarPath, root.getJavaProject().getProject());
>+							indexManager.indexLibrary(jarPath, root.getJavaProject().getProject(), root.getIndexPath());
> 							break;
> 						case IResourceDelta.CHANGED:
> 							// first remove the index so that it is forced to be re-indexed
> 							indexManager.removeIndex(jarPath);
> 							// then index the jar
>-							indexManager.indexLibrary(jarPath, root.getJavaProject().getProject());
>+							indexManager.indexLibrary(jarPath, root.getJavaProject().getProject(), root.getIndexPath());
> 							break;
> 						case IResourceDelta.REMOVED:
> 							// the jar was physically removed: remove the index
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java
>index d615698..928b6d1 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -122,7 +122,7 @@
> 		} while (result.exists());
> 		if (scheduleForCreation) {
> 			if (this.pendingFolders == null)
>-				this.pendingFolders = new HashSet();
>+				this.pendingFolders = Collections.synchronizedSet(new HashSet());
> 			this.pendingFolders.add(externalFolderPath);
> 		}
> 		knownFolders.put(externalFolderPath, result);
>@@ -166,16 +166,22 @@
> 		catch(CoreException e) {
> 			throw new JavaModelException(e);
> 		}
>-		Iterator iterator = this.pendingFolders.iterator();
>-		while (iterator.hasNext()) {
>-			Object folderPath = iterator.next();
>+		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=368152
>+		// To avoid race condition (from addFolder and removeFolder, load the map elements into an array and clear the map immediately.
>+		// The createLinkFolder being in the synchronized block can cause a deadlock and hence keep it out of the synchronized block. 
>+		Object[] arrayOfFolders = null;
>+		synchronized (this.pendingFolders) {
>+			arrayOfFolders = this.pendingFolders.toArray();
>+			this.pendingFolders.clear();
>+		}
>+
>+		for (int i=0; i < arrayOfFolders.length; i++) {
> 			try {
>-				createLinkFolder((IPath) folderPath, false, externalFoldersProject, monitor);
>+				createLinkFolder((IPath) arrayOfFolders[i], false, externalFoldersProject, monitor);
> 			} catch (CoreException e) {
>-				Util.log(e, "Error while creating a link for external folder :" + folderPath); //$NON-NLS-1$
>+				Util.log(e, "Error while creating a link for external folder :" + arrayOfFolders[i]); //$NON-NLS-1$
> 			}
> 		}
>-		this.pendingFolders.clear();
> 	}
> 	
> 	public void cleanUp(IProgressMonitor monitor) throws CoreException {
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java
>index 5b18c19..3cd4d07 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java
>@@ -10,6 +10,7 @@
>  *******************************************************************************/
> package org.eclipse.jdt.internal.core;
> 
>+import java.net.URL;
> import java.util.*;
> import java.util.zip.ZipEntry;
> import java.util.zip.ZipException;
>@@ -292,4 +293,15 @@
> 			return;
> 		super.toStringAncestors(buffer);
> 	}
>+
>+	public URL getIndexPath() {
>+		try {
>+			IClasspathEntry entry = ((JavaProject) getParent()).getClasspathEntryFor(getPath());
>+			if (entry != null) return ((ClasspathEntry)entry).getLibraryIndexLocation();	
>+		} catch (JavaModelException e) {
>+			// ignore exception
>+		}
>+		return null;
>+	}
>+
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java
>index 532ed94..91c6dde 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java
>@@ -58,6 +58,7 @@
> 		defaultOptionsMap.put(JavaCore.CORE_INCOMPATIBLE_JDK_LEVEL, JavaCore.IGNORE);
> 		defaultOptionsMap.put(JavaCore.CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS, JavaCore.ENABLED);
> 		defaultOptionsMap.put(JavaCore.CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS, JavaCore.ENABLED);
>+		defaultOptionsMap.put(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, JavaCore.ERROR);
> 
> 		// encoding setting comes from resource plug-in
> 		optionNames.add(JavaCore.CORE_ENCODING);
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelCache.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelCache.java
>index 6a049a9..eb4297c 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelCache.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelCache.java
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Terry Parker <tparker@google.com> (Google Inc.)  https://bugs.eclipse.org/365499
>  *******************************************************************************/
> package org.eclipse.jdt.internal.core;
> import java.util.HashMap;
>@@ -28,6 +29,7 @@
> 	public static final int DEFAULT_OPENABLE_SIZE = 250; // average 6629 bytes per openable (includes children) -> maximum size : 662900*BASE_VALUE bytes
> 	public static final int DEFAULT_CHILDREN_SIZE = 250*20; // average 20 children per openable
> 	public static final String RATIO_PROPERTY = "org.eclipse.jdt.core.javamodelcache.ratio"; //$NON-NLS-1$
>+	public static final String JAR_TYPE_RATIO_PROPERTY = "org.eclipse.jdt.core.javamodelcache.jartyperatio"; //$NON-NLS-1$
> 	
> 	public static final Object NON_EXISTING_JAR_TYPE_INFO = new Object();
> 
>@@ -72,9 +74,9 @@
> 	protected LRUCache jarTypeCache;
> 
> public JavaModelCache() {
>-	// set the size of the caches in function of the maximum amount of memory available
>+	// set the size of the caches as a function of the maximum amount of memory available
> 	double ratio = getMemoryRatio();
>-	// adjust the size of the openable cache in function of the RATIO_PROPERTY property
>+	// adjust the size of the openable cache using the RATIO_PROPERTY property
> 	double openableRatio = getOpenableRatio();
> 	this.projectCache = new HashMap(DEFAULT_PROJECT_SIZE); // NB: Don't use a LRUCache for projects as they are constantly reopened (e.g. during delta processing)
> 	if (VERBOSE) {
>@@ -91,13 +93,21 @@
> }
> 
> private double getOpenableRatio() {
>-	String property = System.getProperty(RATIO_PROPERTY);
>+	return getRatioForProperty(RATIO_PROPERTY);
>+}
>+
>+private double getJarTypeRatio() {
>+	return getRatioForProperty(JAR_TYPE_RATIO_PROPERTY);
>+}
>+
>+private double getRatioForProperty(String propertyName) {
>+	String property = System.getProperty(propertyName);
> 	if (property != null) {
> 		try {
> 			return Double.parseDouble(property);
> 		} catch (NumberFormatException e) {
> 			// ignore
>-			Util.log(e, "Could not parse value for " + RATIO_PROPERTY + ": " + property); //$NON-NLS-1$ //$NON-NLS-2$
>+			Util.log(e, "Could not parse value for " + propertyName + ": " + property); //$NON-NLS-1$ //$NON-NLS-2$
> 		}
> 	}
> 	return 1.0;
>@@ -249,7 +259,7 @@
> 	}
> }
> protected void resetJarTypeCache() {
>-	this.jarTypeCache = new LRUCache((int) (DEFAULT_OPENABLE_SIZE * getMemoryRatio()));
>+	this.jarTypeCache = new LRUCache((int) (DEFAULT_OPENABLE_SIZE * getMemoryRatio() * getJarTypeRatio()));
> }
> public String toString() {
> 	return toStringFillingRation(""); //$NON-NLS-1$
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
>index cdead40..955e856 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -11,6 +11,7 @@
>  *                                                           before its contents
>  *                                                           (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=102422)
>  *     Stephan Herrmann - Contribution for Bug 346010 - [model] strange initialization dependency in OptionTests
>+ *     Terry Parker <tparker@google.com> - DeltaProcessor misses state changes in archive files, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=357425
>  *******************************************************************************/
> package org.eclipse.jdt.internal.core;
> 
>@@ -1412,9 +1413,7 @@
> 	public static boolean CP_RESOLVE_VERBOSE_ADVANCED = false;
> 	public static boolean CP_RESOLVE_VERBOSE_FAILURE = false;
> 	public static boolean ZIP_ACCESS_VERBOSE = false;
>-	// temporary debug flag to track failures of bug 302850
>-	public static boolean DEBUG_302850 = false;
>-
>+	
> 	/**
> 	 * A cache of opened zip files per thread.
> 	 * (for a given thread, the object value is a HashMap from IPath to java.io.ZipFile)
>@@ -1481,7 +1480,8 @@
> 					propertyName.equals(JavaCore.CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS) ||
> 					propertyName.equals(JavaCore.CORE_INCOMPLETE_CLASSPATH) ||
> 					propertyName.equals(JavaCore.CORE_CIRCULAR_CLASSPATH) ||
>-					propertyName.equals(JavaCore.CORE_INCOMPATIBLE_JDK_LEVEL)) {
>+					propertyName.equals(JavaCore.CORE_INCOMPATIBLE_JDK_LEVEL) ||
>+					propertyName.equals(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE)) {
> 					JavaModelManager manager = JavaModelManager.getJavaModelManager();
> 					IJavaModel model = manager.getJavaModel();
> 					IJavaProject[] projects;
>@@ -2153,13 +2153,10 @@
> 		// return cached options if already computed
> 		Hashtable cachedOptions; // use a local variable to avoid race condition (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=256329 )
> 		if ((cachedOptions = this.optionsCache) != null) {
>-			if (DEBUG_302850) checkTaskTags("Retrieving options from optionsCache", this.optionsCache); //$NON-NLS-1$
> 			return new Hashtable(cachedOptions);
> 		}
>-		if (DEBUG_302850) System.out.println("optionsCache was null"); //$NON-NLS-1$
> 		if (!Platform.isRunning()) {
> 			this.optionsCache = getDefaultOptionsNoInitialization();
>-			if (DEBUG_302850) checkTaskTags("Platform is not running", this.optionsCache); //$NON-NLS-1$
> 			return new Hashtable(this.optionsCache);
> 		}
> 		// init
>@@ -2175,7 +2172,6 @@
> 				options.put(propertyName, propertyValue);
> 			}
> 		}
>-		if (DEBUG_302850) checkTaskTags("Options initialized from preferences", options); //$NON-NLS-1$
> 
> 		// set deprecated options using preferences service lookup
> 		Iterator deprecatedEntries = this.deprecatedOptions.entrySet().iterator();
>@@ -2201,28 +2197,10 @@
> 		addDeprecatedOptions(options);
> 
> 		Util.fixTaskTags(options);
>-		if (DEBUG_302850) checkTaskTags("Retrieved options from preferences", options); //$NON-NLS-1$
> 		// store built map in cache
> 		this.optionsCache = new Hashtable(options);
>-		if (DEBUG_302850) checkTaskTags("Stored optionsCache", this.optionsCache); //$NON-NLS-1$
>-
> 		// return built map
> 		return options;
>-	}
>-
>-	// debugging bug 302850:
>-	private void checkTaskTags(String msg, Hashtable someOptions) {
>-		System.out.println(msg);
>-		Object taskTags = someOptions.get(JavaCore.COMPILER_TASK_TAGS);
>-		System.out.println("	+ Task tags:           " + taskTags); //$NON-NLS-1$
>-		if (taskTags == null || "".equals(taskTags)) { //$NON-NLS-1$
>-			System.out.println("	- option names: "+this.optionNames); //$NON-NLS-1$
>-			System.out.println("	- Call stack:"); //$NON-NLS-1$
>-			StackTraceElement[] elements = new Exception().getStackTrace();
>-			for (int i=0,n=elements.length; i<n; i++) {
>-				System.out.println("		+ "+elements[i]); //$NON-NLS-1$
>-			}
>-		}
> 	}
> 
> 	// Do not modify without modifying getDefaultOptions()
>@@ -2248,7 +2226,8 @@
> 		defaultOptionsMap.put(JavaCore.CORE_JAVA_BUILD_ORDER, JavaCore.IGNORE);
> 		defaultOptionsMap.put(JavaCore.CORE_INCOMPLETE_CLASSPATH, JavaCore.ERROR);
> 		defaultOptionsMap.put(JavaCore.CORE_CIRCULAR_CLASSPATH, JavaCore.ERROR);
>-		defaultOptionsMap.put(JavaCore.CORE_INCOMPATIBLE_JDK_LEVEL, JavaCore.IGNORE);
>+		defaultOptionsMap.put(JavaCore.CORE_INCOMPATIBLE_JDK_LEVEL, JavaCore.IGNORE); 
>+		defaultOptionsMap.put(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, JavaCore.ERROR);
> 		defaultOptionsMap.put(JavaCore.CORE_ENABLE_CLASSPATH_EXCLUSION_PATTERNS, JavaCore.ENABLED);
> 		defaultOptionsMap.put(JavaCore.CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS, JavaCore.ENABLED);
> 
>@@ -3084,6 +3063,12 @@
> 	
> 	public boolean isInvalidArchive(IPath path) {
> 		return this.invalidArchives != null && this.invalidArchives.contains(path);
>+	}
>+
>+	public void removeFromInvalidArchiveCache(IPath path) {
>+		if (this.invalidArchives != null) {
>+			this.invalidArchives.remove(path);
>+		}
> 	}
> 
> 	public void setClasspathBeingResolved(IJavaProject project, boolean classpathIsResolved) {
>@@ -4827,57 +4812,46 @@
> 	}
> 
> 	public void setOptions(Hashtable newOptions) {
>-		
>-		if (DEBUG_302850) {
>-			System.out.println("Entering in JavaModelManager.setOptions():"); //$NON-NLS-1$
>-			System.out.println(new CompilerOptions(newOptions).toString());
>-			System.out.println("	- Call stack:"); //$NON-NLS-1$
>-			StackTraceElement[] elements = new Exception().getStackTrace();
>-			for (int i=0,n=elements.length; i<n; i++) {
>-				System.out.println("		+ "+elements[i]); //$NON-NLS-1$
>+		Hashtable cachedValue = newOptions == null ? null : new Hashtable(newOptions);
>+		IEclipsePreferences defaultPreferences = getDefaultPreferences();
>+		IEclipsePreferences instancePreferences = getInstancePreferences();
>+
>+		if (newOptions == null){
>+			try {
>+				instancePreferences.clear();
>+			} catch(BackingStoreException e) {
>+				// ignore
>+			}
>+		} else {
>+			Enumeration keys = newOptions.keys();
>+			while (keys.hasMoreElements()){
>+				String key = (String)keys.nextElement();
>+				int optionLevel = getOptionLevel(key);
>+				if (optionLevel == UNKNOWN_OPTION) continue; // unrecognized option
>+				if (key.equals(JavaCore.CORE_ENCODING)) {
>+					if (cachedValue != null) {
>+						cachedValue.put(key, JavaCore.getEncoding());
>+					}
>+					continue; // skipped, contributed by resource prefs
>+				}
>+				String value = (String) newOptions.get(key);
>+				String defaultValue = defaultPreferences.get(key, null);
>+				// Store value in preferences
>+				if (defaultValue != null && defaultValue.equals(value)) {
>+					value = null;
>+				}
>+				storePreference(key, value, instancePreferences, newOptions);
>+			}
>+			try {
>+				// persist options
>+				instancePreferences.flush();
>+			} catch(BackingStoreException e) {
>+				// ignore
> 			}
> 		}
>-
>-			Hashtable cachedValue = newOptions == null ? null : new Hashtable(newOptions);
>-			IEclipsePreferences defaultPreferences = getDefaultPreferences();
>-			IEclipsePreferences instancePreferences = getInstancePreferences();
>-
>-			if (newOptions == null){
>-				try {
>-					instancePreferences.clear();
>-				} catch(BackingStoreException e) {
>-					// ignore
>-				}
>-			} else {
>-				Enumeration keys = newOptions.keys();
>-				while (keys.hasMoreElements()){
>-					String key = (String)keys.nextElement();
>-					int optionLevel = getOptionLevel(key);
>-					if (optionLevel == UNKNOWN_OPTION) continue; // unrecognized option
>-					if (key.equals(JavaCore.CORE_ENCODING)) {
>-						if (cachedValue != null) {
>-							cachedValue.put(key, JavaCore.getEncoding());
>-						}
>-						continue; // skipped, contributed by resource prefs
>-					}
>-					String value = (String) newOptions.get(key);
>-					String defaultValue = defaultPreferences.get(key, null);
>-					// Store value in preferences
>-					if (defaultValue != null && defaultValue.equals(value)) {
>-						value = null;
>-					}
>-					storePreference(key, value, instancePreferences, newOptions);
>-				}
>-				try {
>-					// persist options
>-					instancePreferences.flush();
>-				} catch(BackingStoreException e) {
>-					// ignore
>-				}
>-			}
>-			// update cache
>-			Util.fixTaskTags(cachedValue);
>-			this.optionsCache = cachedValue;
>+		// update cache
>+		Util.fixTaskTags(cachedValue);
>+		this.optionsCache = cachedValue;
> 	}
> 
> 	public void startup() throws CoreException {
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java
>index 42b1890..c78c697 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -433,7 +433,7 @@
> 							new JavaModelStatus(IJavaModelStatusConstants.CLASSPATH_CYCLE, project, cycleString));
> 					}
> 				} else {
>-					project.flushClasspathProblemMarkers(true, false);
>+					project.flushClasspathProblemMarkers(true, false, false);
> 				}
> 			}
> 		}
>@@ -803,7 +803,7 @@
> 		IMarker marker = null;
> 		int severity;
> 		String[] arguments = CharOperation.NO_STRINGS;
>-		boolean isCycleProblem = false, isClasspathFileFormatProblem = false;
>+		boolean isCycleProblem = false, isClasspathFileFormatProblem = false, isOutputOverlapping = false;
> 		switch (status.getCode()) {
> 
> 			case  IJavaModelStatusConstants.CLASSPATH_CYCLE :
>@@ -830,7 +830,17 @@
> 					return; // setting == IGNORE
> 				}
> 				break;
>-
>+			case IJavaModelStatusConstants.OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE :
>+				isOutputOverlapping = true;
>+				setting = getOption(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE, true);
>+				if (JavaCore.ERROR.equals(setting)) {
>+					severity = IMarker.SEVERITY_ERROR;
>+				} else if (JavaCore.WARNING.equals(setting)) {
>+					severity = IMarker.SEVERITY_WARNING;
>+				} else {
>+					return; // setting == IGNORE
>+				}
>+				break;
> 			default:
> 				IPath path = status.getPath();
> 				if (path != null) arguments = new String[] { path.toString() };
>@@ -852,6 +862,7 @@
> 					IMarker.LOCATION,
> 					IJavaModelMarker.CYCLE_DETECTED,
> 					IJavaModelMarker.CLASSPATH_FILE_FORMAT,
>+					IJavaModelMarker.OUTPUT_OVERLAPPING_SOURCE,
> 					IJavaModelMarker.ID,
> 					IJavaModelMarker.ARGUMENTS ,
> 					IJavaModelMarker.CATEGORY_ID,
>@@ -863,6 +874,7 @@
> 					Messages.classpath_buildPath,
> 					isCycleProblem ? "true" : "false",//$NON-NLS-1$ //$NON-NLS-2$
> 					isClasspathFileFormatProblem ? "true" : "false",//$NON-NLS-1$ //$NON-NLS-2$
>+					isOutputOverlapping ? "true" : "false", //$NON-NLS-1$ //$NON-NLS-2$
> 					new Integer(status.getCode()),
> 					Util.getProblemArgumentsForMarker(arguments) ,
> 					new Integer(CategorizedProblem.CAT_BUILDPATH),
>@@ -1356,18 +1368,20 @@
> 	/**
> 	 * Remove all markers denoting classpath problems
> 	 */ //TODO (philippe) should improve to use a bitmask instead of booleans (CYCLE, FORMAT, VALID)
>-	protected void flushClasspathProblemMarkers(boolean flushCycleMarkers, boolean flushClasspathFormatMarkers) {
>+	protected void flushClasspathProblemMarkers(boolean flushCycleMarkers, boolean flushClasspathFormatMarkers, boolean flushOverlappingOutputMarkers) {
> 		try {
> 			if (this.project.isAccessible()) {
> 				IMarker[] markers = this.project.findMarkers(IJavaModelMarker.BUILDPATH_PROBLEM_MARKER, false, IResource.DEPTH_ZERO);
> 				for (int i = 0, length = markers.length; i < length; i++) {
> 					IMarker marker = markers[i];
>-					if (flushCycleMarkers && flushClasspathFormatMarkers) {
>+					if (flushCycleMarkers && flushClasspathFormatMarkers && flushOverlappingOutputMarkers) {
> 						marker.delete();
> 					} else {
> 						String cycleAttr = (String)marker.getAttribute(IJavaModelMarker.CYCLE_DETECTED);
> 						String classpathFileFormatAttr =  (String)marker.getAttribute(IJavaModelMarker.CLASSPATH_FILE_FORMAT);
>+						String overlappingOutputAttr = (String) marker.getAttribute(IJavaModelMarker.OUTPUT_OVERLAPPING_SOURCE);
> 						if ((flushCycleMarkers == (cycleAttr != null && cycleAttr.equals("true"))) //$NON-NLS-1$
>+							&& (flushOverlappingOutputMarkers == (overlappingOutputAttr != null && overlappingOutputAttr.equals("true"))) //$NON-NLS-1$
> 							&& (flushClasspathFormatMarkers == (classpathFileFormatAttr != null && classpathFileFormatAttr.equals("true")))){ //$NON-NLS-1$
> 							marker.delete();
> 						}
>@@ -1513,6 +1527,7 @@
> 						propertyName.equals(JavaCore.CORE_ENABLE_CLASSPATH_MULTIPLE_OUTPUT_LOCATIONS) ||
> 						propertyName.equals(JavaCore.CORE_INCOMPLETE_CLASSPATH) ||
> 						propertyName.equals(JavaCore.CORE_CIRCULAR_CLASSPATH) ||
>+						propertyName.equals(JavaCore.CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE) ||
> 						propertyName.equals(JavaCore.CORE_INCOMPATIBLE_JDK_LEVEL))
> 					{
> 						manager.deltaState.addClasspathValidation(JavaProject.this);
>@@ -3104,8 +3119,8 @@
> 	 * Note that it is orthogonal to IResource persistent properties, and client code has to decide
> 	 * which form of storage to use appropriately. Shared properties produce real resource files which
> 	 * can be shared through a VCM onto a server. Persistent properties are not shareable.
>-	 *
>-	 * shared properties end up in resource files, and thus cannot be modified during
>+	 * <p>
>+	 * Shared properties end up in resource files, and thus cannot be modified during
> 	 * delta notifications (a CoreException would then be thrown).
> 	 *
> 	 * @param key String
>@@ -3129,7 +3144,7 @@
> 		if (rscFile.exists()) {
> 			if (rscFile.isReadOnly()) {
> 				// provide opportunity to checkout read-only .classpath file (23984)
>-				ResourcesPlugin.getWorkspace().validateEdit(new IFile[]{rscFile}, null);
>+				ResourcesPlugin.getWorkspace().validateEdit(new IFile[]{rscFile}, IWorkspace.VALIDATE_PROMPT);
> 			}
> 			rscFile.setContents(inputStream, IResource.FORCE, null);
> 		} else {
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavadocContents.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavadocContents.java
>index e655477..f98325a 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavadocContents.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavadocContents.java
>@@ -378,13 +378,8 @@
> 		}
> 		IType declaringType = this.type;
> 		if (declaringType.isMember()) {
>-			int depth = 0;
> 			// might need to remove a part of the signature corresponding to the synthetic argument (only for constructor)
> 			if (method.isConstructor() && !Flags.isStatic(declaringType.getFlags())) {
>-				depth++;
>-			}
>-			if (depth != 0) {
>-				// depth is 1
> 				int indexOfOpeningParen = anchor.indexOf('(');
> 				if (indexOfOpeningParen == -1) {
> 					// should not happen as this is a method signature
>@@ -395,8 +390,11 @@
> 				int indexOfComma = anchor.indexOf(',', index);
> 				if (indexOfComma != -1) {
> 					index = indexOfComma + 2;
>-					anchor = anchor.substring(0, indexOfOpeningParen) + anchor.substring(index);
>+				} else {
>+					// no argument, but a synthetic argument
>+					index = anchor.indexOf(')', index);
> 				}
>+				anchor = anchor.substring(0, indexOfOpeningParen) + anchor.substring(index);
> 			}
> 		}
> 		return anchor + JavadocConstants.ANCHOR_PREFIX_END;
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NameLookup.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NameLookup.java
>index 59c69ce..d08dff5 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NameLookup.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NameLookup.java
>@@ -987,6 +987,13 @@
> 					break;
> 				case IPackageFragmentRoot.K_SOURCE :
> 					seekTypesInSourcePackage(matchName, pkg, firstDot, partialMatch, topLevelTypeName, acceptFlags, requestor);
>+					if (matchName.indexOf('$') != -1) {
>+						matchName= matchName.replace('$', '.');
>+						firstDot = matchName.indexOf('.');
>+						if (!partialMatch)
>+							topLevelTypeName = firstDot == -1 ? matchName : matchName.substring(0, firstDot);
>+						seekTypesInSourcePackage(matchName, pkg, firstDot, partialMatch, topLevelTypeName, acceptFlags, requestor);
>+					}
> 					break;
> 				default :
> 					return;
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NamedMember.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NamedMember.java
>index 317b9e7..c966d1d 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NamedMember.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NamedMember.java
>@@ -226,14 +226,22 @@
> 		}
> 		StringBuffer buffer = new StringBuffer(declaringType.getTypeQualifiedName(enclosingTypeSeparator, showParameters));
> 		buffer.append(enclosingTypeSeparator);
>-		String simpleName = this.name.length() == 0 ? Integer.toString(this.occurrenceCount) : this.name;
>+		String simpleName = this.name.length() == 0 ? getOccurrenceCountSignature() : this.name;
> 		buffer.append(simpleName);
> 		if (showParameters) {
> 			appendTypeParameters(buffer);
> 		}
> 		return buffer.toString();
> 	}
>-
>+	/*
>+	 * Returns the String representation of the occurrence count for this element.
>+	 * The occurrence count is a unique number representation to identify the particular element.
>+	 *
>+	 * @return the occurrence count for this element in the form of String
>+	 */
>+	protected String getOccurrenceCountSignature() {
>+		return Integer.toString(this.occurrenceCount);
>+	}
> 	protected ITypeParameter[] getTypeParameters() throws JavaModelException {
> 		return null;
> 	}
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java
>index 9fb59c6..817fc9b 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -154,11 +154,15 @@
> 	return computeChildren(info, underlyingResource);
> }
> 
>-SourceMapper createSourceMapper(IPath sourcePath, IPath rootPath) {
>+SourceMapper createSourceMapper(IPath sourcePath, IPath rootPath) throws JavaModelException {
>+	IClasspathEntry entry = ((JavaProject) getParent()).getClasspathEntryFor(getPath());
>+	String encoding = (entry== null) ? null : ((ClasspathEntry) entry).getSourceAttachmentEncoding();
> 	SourceMapper mapper = new SourceMapper(
> 		sourcePath,
> 		rootPath == null ? null : rootPath.toOSString(),
>-		getJavaProject().getOptions(true)); // cannot use workspace options if external jar is 1.5 jar and workspace options are 1.4 options
>+		getJavaProject().getOptions(true),// cannot use workspace options if external jar is 1.5 jar and workspace options are 1.4 options
>+		encoding);
>+
> 	return mapper;
> }
> /*
>@@ -707,6 +711,14 @@
> 	return resource().hashCode();
> }
> 
>+public boolean ignoreOptionalProblems() {
>+	try {
>+		return ((PackageFragmentRootInfo) getElementInfo()).ignoreOptionalProblems(this);
>+	} catch (JavaModelException e) {
>+		return false;
>+	}
>+}
>+
> /**
>  * @see IPackageFragmentRoot
>  */
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRootInfo.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRootInfo.java
>index 22333a8..431b9c7 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRootInfo.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRootInfo.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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,11 +41,15 @@
> 	 * A array with all the non-java resources contained by this PackageFragment
> 	 */
> 	protected Object[] nonJavaResources;
>+
>+	private boolean ignoreOptionalProblems;
>+	private boolean initialized;
> /**
>  * Create and initialize a new instance of the receiver
>  */
> public PackageFragmentRootInfo() {
> 	this.nonJavaResources = null;
>+	this.initialized = false;
> }
> /**
>  * Starting at this folder, create non-java resources for this package fragment root
>@@ -155,6 +159,13 @@
> protected SourceMapper getSourceMapper() {
> 	return this.sourceMapper;
> }
>+boolean ignoreOptionalProblems(PackageFragmentRoot packageFragmentRoot) throws JavaModelException {
>+	if (this.initialized == false) {
>+		this.ignoreOptionalProblems = ((ClasspathEntry) packageFragmentRoot.getRawClasspathEntry()).ignoreOptionalProblems();
>+		this.initialized = true;
>+	}
>+	return this.ignoreOptionalProblems;
>+}
> private static boolean isClasspathEntry(IPath path, IClasspathEntry[] resolvedClasspath) {
> 	for (int i = 0, length = resolvedClasspath.length; i < length; i++) {
> 		IClasspathEntry entry = resolvedClasspath[i];
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ResolvedSourceType.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ResolvedSourceType.java
>index 19aa916..4a02dd4 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ResolvedSourceType.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ResolvedSourceType.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2008 IBM Corporation and others.
>+ * Copyright (c) 2004, 2012 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
>@@ -59,8 +59,9 @@
> 	}
> 
> 	public JavaElement unresolved() {
>-		SourceRefElement handle = new SourceType(this.parent, this.name);
>+		SourceType handle = new SourceType(this.parent, this.name);
> 		handle.occurrenceCount = this.occurrenceCount;
>+		handle.localOccurrenceCount = this.localOccurrenceCount;
> 		return handle;
> 	}
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SelectionRequestor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SelectionRequestor.java
>index 4ccb14f..7accbff 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SelectionRequestor.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SelectionRequestor.java
>@@ -341,7 +341,7 @@
> 	}
> }
> public void acceptLocalMethod(MethodBinding methodBinding) {
>-	IJavaElement res = findLocalElement(methodBinding.sourceStart());
>+	IJavaElement res = findLocalElement(methodBinding.original().sourceStart());
> 	if(res != null) {
> 		if(res.getElementType() == IJavaElement.METHOD) {
> 			IMethod method = (IMethod) res;
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetClasspathOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetClasspathOperation.java
>index 9623813..ec0ccf2 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetClasspathOperation.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetClasspathOperation.java
>@@ -114,6 +114,7 @@
> 		IJavaModelStatus status = super.verify();
> 		if (!status.isOK())
> 			return status;
>+		this.project.flushClasspathProblemMarkers(false, false, true);
> 		return ClasspathEntry.validateClasspath(	this.project, this.newRawClasspath, this.newOutputLocation);
> 	}
> 
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java
>index b2302d6..8c14620 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java
>@@ -246,10 +246,11 @@
> 	int anonymousCounter;
> 	int anonymousClassName;
> 
>+	String encoding;
>+	String defaultEncoding;
> 	/**
> 	 *Options to be used
> 	 */
>-	String encoding;
> 	Map options;
> 
> 	/**
>@@ -261,15 +262,19 @@
> 		this.areRootPathsComputed = false;
> 	}
> 
>+	public SourceMapper(IPath sourcePath, String rootPath, Map options) {
>+		this(sourcePath, rootPath, options, null);
>+	}
> 	/**
> 	 * Creates a <code>SourceMapper</code> that locates source in the zip file
> 	 * at the given location in the specified package fragment root.
> 	 */
>-	public SourceMapper(IPath sourcePath, String rootPath, Map options) {
>+	public SourceMapper(IPath sourcePath, String rootPath, Map options, String encoding) {
> 		this.areRootPathsComputed = false;
> 		this.options = options;
>+		this.encoding = encoding;
> 		try {
>-			this.encoding = ResourcesPlugin.getWorkspace().getRoot().getDefaultCharset();
>+			this.defaultEncoding = ResourcesPlugin.getWorkspace().getRoot().getDefaultCharset();
> 		} catch (CoreException e) {
> 			// use no encoding
> 		}
>@@ -1020,9 +1025,17 @@
> 			IResource res = ((IContainer)target).findMember(fullName);
> 			if (res instanceof IFile) {
> 				try {
>-					source = org.eclipse.jdt.internal.core.util.Util.getResourceContentsAsCharArray((IFile)res);
>+					// Order of preference: charSet supplied, this.encoding or this.defaultEncoding in that order
>+					try {
>+						// Use the implicit encoding only when the source attachment's encoding hasn't been explicitly set.
>+						charSet = ((IFile) res).getCharset(this.encoding == null);
>+					} catch (CoreException e) {
>+						// Ignore
>+					}
>+					source = org.eclipse.jdt.internal.core.util.Util.getResourceContentsAsCharArray((IFile) res,
>+									charSet == null ? (this.encoding == null ? this.defaultEncoding : this.encoding) : charSet);
> 				} catch (JavaModelException e) {
>-					// ignore
>+					// Ignore
> 				}
> 			}
> 		} else {
>@@ -1030,7 +1043,7 @@
> 				// https://bugs.eclipse.org/bugs/show_bug.cgi?id=303511
> 				// For a resource inside the workspace, use the encoding set on the resource
> 				if (target instanceof IFile)
>-					charSet = ((IFile)target).getCharset();
>+					charSet = ((IFile)target).getCharset(this.encoding == null);
> 			} catch (CoreException e) {
> 				// Ignore
> 			}
>@@ -1414,7 +1427,8 @@
> 		try {
> 			byte[] bytes = Util.getZipEntryByteContent(entry, zip);
> 			if (bytes != null) {
>-				return Util.bytesToChar(bytes, charSet == null ? this.encoding : charSet);
>+				// Order of preference: charSet supplied, this.encoding or this.defaultEncoding in that order
>+				return Util.bytesToChar(bytes, charSet == null ? (this.encoding == null ? this.defaultEncoding : this.encoding) : charSet);
> 			}
> 		} catch (IOException e) {
> 			// ignore
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceType.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceType.java
>index 2ce790d..98263ec 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceType.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceType.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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,6 +35,12 @@
>  */
> 
> public class SourceType extends NamedMember implements IType {
>+
>+/*
>+ * A count to uniquely identify this element within the context of the enclosing type.
>+ * Currently this is computed and used only for anonymous types.
>+ */
>+public int localOccurrenceCount = 1;
> 
> protected SourceType(JavaElement parent, String name) {
> 	super(parent, name);
>@@ -274,6 +280,13 @@
>  */
> public String getFullyQualifiedParameterizedName() throws JavaModelException {
> 	return getFullyQualifiedName('.', true/*show parameters*/);
>+}
>+/*
>+ * For source types, the occurrence count is the one computed in the context of the immediately enclosing type.
>+ *
>+ */
>+protected String getOccurrenceCountSignature() {
>+	return Integer.toString(this.localOccurrenceCount);
> }
> /*
>  * @see JavaElement
>@@ -815,8 +828,9 @@
> 	return op.getResult();
> }
> public JavaElement resolved(Binding binding) {
>-	SourceRefElement resolvedHandle = new ResolvedSourceType(this.parent, this.name, new String(binding.computeUniqueKey()));
>+	ResolvedSourceType resolvedHandle = new ResolvedSourceType(this.parent, this.name, new String(binding.computeUniqueKey()));
> 	resolvedHandle.occurrenceCount = this.occurrenceCount;
>+	resolvedHandle.localOccurrenceCount = this.localOccurrenceCount;
> 	return resolvedHandle;
> }
> /**
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathLocation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathLocation.java
>index 89d1d67..aef33e1 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathLocation.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathLocation.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -18,8 +18,8 @@
> 
> public abstract class ClasspathLocation {
> 
>-static ClasspathLocation forSourceFolder(IContainer sourceFolder, IContainer outputFolder, char[][] inclusionPatterns, char[][] exclusionPatterns) {
>-	return new ClasspathMultiDirectory(sourceFolder, outputFolder, inclusionPatterns, exclusionPatterns);
>+static ClasspathLocation forSourceFolder(IContainer sourceFolder, IContainer outputFolder, char[][] inclusionPatterns, char[][] exclusionPatterns, boolean ignoreOptionalProblems) {
>+	return new ClasspathMultiDirectory(sourceFolder, outputFolder, inclusionPatterns, exclusionPatterns, ignoreOptionalProblems);
> }
> 
> public static ClasspathLocation forBinaryFolder(IContainer binaryFolder, boolean isOutputFolder, AccessRuleSet accessRuleSet) {
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathMultiDirectory.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathMultiDirectory.java
>index 1273281..3d41e08 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathMultiDirectory.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathMultiDirectory.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -15,20 +15,22 @@
> import org.eclipse.jdt.core.compiler.CharOperation;
> import org.eclipse.jdt.internal.core.util.Util;
> 
>-class ClasspathMultiDirectory extends ClasspathDirectory {
>+public class ClasspathMultiDirectory extends ClasspathDirectory {
> 
> IContainer sourceFolder;
> char[][] inclusionPatterns; // used by builders when walking source folders
> char[][] exclusionPatterns; // used by builders when walking source folders
> boolean hasIndependentOutputFolder; // if output folder is not equal to any of the source folders
>+public boolean ignoreOptionalProblems;
> 
>-ClasspathMultiDirectory(IContainer sourceFolder, IContainer binaryFolder, char[][] inclusionPatterns, char[][] exclusionPatterns) {
>+ClasspathMultiDirectory(IContainer sourceFolder, IContainer binaryFolder, char[][] inclusionPatterns, char[][] exclusionPatterns, boolean ignoreOptionalProblems) {
> 	super(binaryFolder, true, null);
> 
> 	this.sourceFolder = sourceFolder;
> 	this.inclusionPatterns = inclusionPatterns;
> 	this.exclusionPatterns = exclusionPatterns;
> 	this.hasIndependentOutputFolder = false;
>+	this.ignoreOptionalProblems = ignoreOptionalProblems;
> 
> 	// handle the case when a state rebuilds a source folder
> 	if (this.inclusionPatterns != null && this.inclusionPatterns.length == 0)
>@@ -42,7 +44,8 @@
> 	if (!(o instanceof ClasspathMultiDirectory)) return false;
> 
> 	ClasspathMultiDirectory md = (ClasspathMultiDirectory) o;
>-	return this.sourceFolder.equals(md.sourceFolder) && this.binaryFolder.equals(md.binaryFolder)
>+	return this.ignoreOptionalProblems == md.ignoreOptionalProblems 
>+		&& this.sourceFolder.equals(md.sourceFolder) && this.binaryFolder.equals(md.binaryFolder)
> 		&& CharOperation.equals(this.inclusionPatterns, md.inclusionPatterns)
> 		&& CharOperation.equals(this.exclusionPatterns, md.exclusionPatterns);
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/NameEnvironment.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/NameEnvironment.java
>index 66fde98..65c3c79 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/NameEnvironment.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/NameEnvironment.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -114,7 +114,7 @@
> 						createOutputFolder(outputFolder);
> 				}
> 				sLocations.add(
>-					ClasspathLocation.forSourceFolder((IContainer) target, outputFolder, entry.fullInclusionPatternChars(), entry.fullExclusionPatternChars()));
>+					ClasspathLocation.forSourceFolder((IContainer) target, outputFolder, entry.fullInclusionPatternChars(), entry.fullExclusionPatternChars(), entry.ignoreOptionalProblems()));
> 				continue nextEntry;
> 
> 			case IClasspathEntry.CPE_PROJECT :
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/SourceFile.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/SourceFile.java
>index 4955f5d..4a5b04d 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/SourceFile.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/SourceFile.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -103,6 +103,9 @@
> public int hashCode() {
> 	return this.initialTypeName.hashCode();
> }
>+public boolean ignoreOptionalProblems() {
>+	return this.sourceLocation.ignoreOptionalProblems;
>+}
> String typeLocator() {
> 	return this.resource.getProjectRelativePath().toString();
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java
>index 682073d..6dfb1ec 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -27,7 +27,7 @@
> // NOTE: this state cannot contain types that are not defined in this project
> 
> String javaProjectName;
>-ClasspathMultiDirectory[] sourceLocations;
>+public ClasspathMultiDirectory[] sourceLocations;
> ClasspathLocation[] binaryLocations;
> // keyed by the project relative path of the type (i.e. "src1/p1/p2/A.java"), value is a ReferenceCollection or an AdditionalTypeCollection
> SimpleLookupTable references;
>@@ -44,7 +44,7 @@
> private StringSet structurallyChangedTypes;
> public static int MaxStructurallyChangedTypes = 100; // keep track of ? structurally changed types, otherwise consider all to be changed
> 
>-public static final byte VERSION = 0x0019; // fix for 325755
>+public static final byte VERSION = 0x001B;
> 
> static final byte SOURCE_FOLDER = 1;
> static final byte BINARY_FOLDER = 2;
>@@ -246,7 +246,7 @@
> 		if ((folderName = in.readUTF()).length() > 0) sourceFolder = project.getFolder(folderName);
> 		if ((folderName = in.readUTF()).length() > 0) outputFolder = project.getFolder(folderName);
> 		ClasspathMultiDirectory md =
>-			(ClasspathMultiDirectory) ClasspathLocation.forSourceFolder(sourceFolder, outputFolder, readNames(in), readNames(in));
>+			(ClasspathMultiDirectory) ClasspathLocation.forSourceFolder(sourceFolder, outputFolder, readNames(in), readNames(in), in.readBoolean());
> 		if (in.readBoolean())
> 			md.hasIndependentOutputFolder = true;
> 		newState.sourceLocations[i] = md;
>@@ -425,6 +425,7 @@
> 		out.writeUTF(md.binaryFolder.getProjectRelativePath().toString());
> 		writeNames(md.inclusionPatterns, out);
> 		writeNames(md.exclusionPatterns, out);
>+		out.writeBoolean(md.ignoreOptionalProblems);
> 		out.writeBoolean(md.hasIndependentOutputFolder);
> 	}
> 
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java
>index 0513604..4cc7768 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java
>@@ -846,6 +846,8 @@
> 					char[][] memberTypeNames = CharOperation.splitOn('$', typeName, firstDollar+1, typeName.length);
> 					for (int i = 0; i < memberTypeNames.length; i++) {
> 						this.focusType = this.focusType.getMemberType(memberTypeNames[i]);
>+						if (this.focusType == null)
>+							return null;
> 					}
> 				}
> 			}
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/CompilationUnit.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/CompilationUnit.java
>index fc64497..c00aa48 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/CompilationUnit.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/CompilationUnit.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -51,6 +51,9 @@
> public char[][] getPackageName() {
> 	return null;
> }
>+public boolean ignoreOptionalProblems() {
>+	return false;
>+}
> public String toString() {
> 	return "CompilationUnit[" + new String(this.fFileName) + "]";  //$NON-NLS-2$ //$NON-NLS-1$
> }
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/BootstrapMethodsAttribute.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/BootstrapMethodsAttribute.java
>new file mode 100644
>index 0000000..b196927
>--- /dev/null
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/BootstrapMethodsAttribute.java
>@@ -0,0 +1,63 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.internal.core.util;
>+
>+import org.eclipse.jdt.core.util.ClassFormatException;
>+import org.eclipse.jdt.core.util.IBootstrapMethodsAttribute;
>+import org.eclipse.jdt.core.util.IBootstrapMethodsEntry;
>+import org.eclipse.jdt.core.util.IConstantPool;
>+
>+/**
>+ * Default implementation of IBootstrapMethodsAttribute.
>+ */
>+public class BootstrapMethodsAttribute extends ClassFileAttribute implements IBootstrapMethodsAttribute {
>+	private static final IBootstrapMethodsEntry[] NO_ENTRIES = new IBootstrapMethodsEntry[0];
>+
>+	private IBootstrapMethodsEntry[] entries;
>+	private int numberOfBootstrapMethods;
>+
>+	/**
>+	 * Constructor for BootstrapMethodsAttribute.
>+	 * @param classFileBytes
>+	 * @param constantPool
>+	 * @param offset
>+	 * @throws ClassFormatException
>+	 */
>+	public BootstrapMethodsAttribute(
>+			byte[] classFileBytes,
>+			IConstantPool constantPool,
>+			int offset) throws ClassFormatException {
>+		super(classFileBytes, constantPool, offset);
>+		this.numberOfBootstrapMethods = u2At(classFileBytes, 6, offset);
>+		final int length = this.numberOfBootstrapMethods;
>+		if (length != 0) {
>+			int readOffset = 8;
>+			this.entries = new IBootstrapMethodsEntry[length];
>+			for (int i = 0; i < length; i++) {
>+				this.entries[i] = new BootstrapMethodsEntry(classFileBytes, constantPool, offset + readOffset);
>+				readOffset += 8;
>+			}
>+		} else {
>+			this.entries = NO_ENTRIES;
>+		}
>+	}
>+
>+	/**
>+	 * @see IBootstrapMethodsAttribute#getBootstrapMethods()
>+	 */
>+	public IBootstrapMethodsEntry[] getBootstrapMethods() {
>+		return this.entries;
>+	}
>+	
>+	public int getBootstrapMethodsLength() {
>+		return this.numberOfBootstrapMethods;
>+	}
>+}
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/BootstrapMethodsEntry.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/BootstrapMethodsEntry.java
>new file mode 100644
>index 0000000..e444dbd
>--- /dev/null
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/BootstrapMethodsEntry.java
>@@ -0,0 +1,52 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.internal.core.util;
>+
>+import org.eclipse.jdt.core.util.ClassFormatException;
>+import org.eclipse.jdt.core.util.IBootstrapMethodsEntry;
>+import org.eclipse.jdt.core.util.IConstantPool;
>+
>+/**
>+ * Default implementation of {@link IBootstrapMethodsEntry}
>+ */
>+public class BootstrapMethodsEntry
>+	extends ClassFileStruct
>+	implements IBootstrapMethodsEntry {
>+
>+	private int bootstrapMethodReference;
>+	private int[] bootstrapArguments;
>+
>+	public BootstrapMethodsEntry(byte classFileBytes[], IConstantPool constantPool, int offset) throws ClassFormatException {
>+		this.bootstrapMethodReference = u2At(classFileBytes, 0, offset);
>+		int length = u2At(classFileBytes, 2, offset);
>+		int[] arguments = new int[length];
>+		int position = 4;
>+		for (int i = 0; i < length; i++) {
>+			arguments[i] = u2At(classFileBytes, position, offset);
>+			position += 2;
>+		}
>+		this.bootstrapArguments = arguments;
>+	}
>+
>+	/**
>+	 * @see IBootstrapMethodsEntry#getBootstrapArguments()
>+	 */
>+	public int[] getBootstrapArguments() {
>+		return this.bootstrapArguments;
>+	}
>+
>+	/**
>+	 * @see IBootstrapMethodsEntry#getBootstrapMethodReference()
>+	 */
>+	public int getBootstrapMethodReference() {
>+		return this.bootstrapMethodReference;
>+	}
>+}
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ClassFileReader.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ClassFileReader.java
>index 19b80dc..0426dc4 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ClassFileReader.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ClassFileReader.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -140,6 +140,18 @@
> 						constantPoolOffsets[i] = readOffset;
> 						readOffset += IConstantPoolConstant.CONSTANT_NameAndType_SIZE;
> 						break;
>+					case IConstantPoolConstant.CONSTANT_MethodHandle :
>+						constantPoolOffsets[i] = readOffset;
>+						readOffset += IConstantPoolConstant.CONSTANT_MethodHandle_SIZE;
>+						break;
>+					case IConstantPoolConstant.CONSTANT_MethodType :
>+						constantPoolOffsets[i] = readOffset;
>+						readOffset += IConstantPoolConstant.CONSTANT_MethodType_SIZE;
>+						break;
>+					case IConstantPoolConstant.CONSTANT_InvokeDynamic :
>+						constantPoolOffsets[i] = readOffset;
>+						readOffset += IConstantPoolConstant.CONSTANT_InvokeDynamic_SIZE;
>+						break;
> 					default:
> 						throw new ClassFormatException(ClassFormatException.INVALID_TAG_CONSTANT);
> 				}
>@@ -261,6 +273,8 @@
> 							this.attributes[attributesIndex++] = new RuntimeVisibleAnnotationsAttribute(classFileBytes, this.constantPool, readOffset);
> 						} else if (equals(attributeName, IAttributeNamesConstants.RUNTIME_INVISIBLE_ANNOTATIONS)) {
> 							this.attributes[attributesIndex++] = new RuntimeInvisibleAnnotationsAttribute(classFileBytes, this.constantPool, readOffset);
>+						} else if (equals(attributeName, IAttributeNamesConstants.BOOTSTRAP_METHODS)) {
>+							this.attributes[attributesIndex++] = new BootstrapMethodsAttribute(classFileBytes, this.constantPool, readOffset);
> 						} else {
> 							this.attributes[attributesIndex++] = new ClassFileAttribute(classFileBytes, this.constantPool, readOffset);
> 						}
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/CodeAttribute.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/CodeAttribute.java
>index 82ba955..a281ab0 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/CodeAttribute.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/CodeAttribute.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -1049,14 +1049,13 @@
> 				case IOpcodeMnemonics.INVOKEDYNAMIC :
> 					index = u2At(this.classFileBytes, 1, pc);
> 					constantPoolEntry = this.constantPool.decodeEntry(index);
>-					if (constantPoolEntry.getKind() != IConstantPoolConstant.CONSTANT_NameAndType) {
>+					if (constantPoolEntry.getKind() != IConstantPoolConstant.CONSTANT_InvokeDynamic) {
> 						throw new ClassFormatException(ClassFormatException.INVALID_CONSTANT_POOL_ENTRY);
> 					}
> 					visitor._invokedynamic(
> 							pc - this.codeOffset,
> 							index,
>-							this.constantPool.decodeEntry(constantPoolEntry.getNameAndTypeInfoNameIndex()),
>-							this.constantPool.decodeEntry(constantPoolEntry.getNameAndTypeInfoDescriptorIndex()));
>+							constantPoolEntry);
> 					pc += 5;
> 					break;
> 				case IOpcodeMnemonics.NEW :
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPool.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPool.java
>index aeeee24..a9c4699 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPool.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPool.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -33,19 +33,28 @@
> 	 * @see IConstantPool#decodeEntry(int)
> 	 */
> 	public IConstantPoolEntry decodeEntry(int index) {
>-		ConstantPoolEntry constantPoolEntry = new ConstantPoolEntry();
>-		constantPoolEntry.reset();
>+		ConstantPoolEntry constantPoolEntry = null;
> 		int kind = getEntryKind(index);
>-		constantPoolEntry.setKind(kind);
> 		switch(kind) {
> 			case IConstantPoolConstant.CONSTANT_Class :
>+				constantPoolEntry = new ConstantPoolEntry();
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
> 				constantPoolEntry.setClassInfoNameIndex(u2At(this.classFileBytes,  1, this.constantPoolOffset[index]));
> 				constantPoolEntry.setClassInfoName(getUtf8ValueAt(constantPoolEntry.getClassInfoNameIndex()));
> 				break;
> 			case IConstantPoolConstant.CONSTANT_Double :
>+				constantPoolEntry = new ConstantPoolEntry();
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
> 				constantPoolEntry.setDoubleValue(doubleAt(this.classFileBytes, 1, this.constantPoolOffset[index]));
> 				break;
> 			case IConstantPoolConstant.CONSTANT_Fieldref :
>+				constantPoolEntry = new ConstantPoolEntry();
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
> 				constantPoolEntry.setClassIndex(u2At(this.classFileBytes,  1, this.constantPoolOffset[index]));
> 				int declaringClassIndex = u2At(this.classFileBytes,  1, this.constantPoolOffset[constantPoolEntry.getClassIndex()]);
> 				constantPoolEntry.setClassName(getUtf8ValueAt(declaringClassIndex));
>@@ -57,6 +66,11 @@
> 				break;
> 			case IConstantPoolConstant.CONSTANT_Methodref :
> 			case IConstantPoolConstant.CONSTANT_InterfaceMethodref :
>+				constantPoolEntry = new ConstantPoolEntry();
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
> 				constantPoolEntry.setClassIndex(u2At(this.classFileBytes,  1, this.constantPoolOffset[index]));
> 				declaringClassIndex = u2At(this.classFileBytes,  1, this.constantPoolOffset[constantPoolEntry.getClassIndex()]);
> 				constantPoolEntry.setClassName(getUtf8ValueAt(declaringClassIndex));
>@@ -67,25 +81,76 @@
> 				constantPoolEntry.setMethodDescriptor(getUtf8ValueAt(methodDescriptorIndex));
> 				break;
> 			case IConstantPoolConstant.CONSTANT_Float :
>+				constantPoolEntry = new ConstantPoolEntry();
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
> 				constantPoolEntry.setFloatValue(floatAt(this.classFileBytes, 1, this.constantPoolOffset[index]));
> 				break;
> 			case IConstantPoolConstant.CONSTANT_Integer :
>+				constantPoolEntry = new ConstantPoolEntry();
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
> 				constantPoolEntry.setIntegerValue(i4At(this.classFileBytes, 1, this.constantPoolOffset[index]));
> 				break;
> 			case IConstantPoolConstant.CONSTANT_Long :
>+				constantPoolEntry = new ConstantPoolEntry();
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
> 				constantPoolEntry.setLongValue(i8At(this.classFileBytes, 1, this.constantPoolOffset[index]));
> 				break;
> 			case IConstantPoolConstant.CONSTANT_NameAndType :
>+				constantPoolEntry = new ConstantPoolEntry();
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
> 				constantPoolEntry.setNameAndTypeNameIndex(u2At(this.classFileBytes,  1, this.constantPoolOffset[index]));
> 				constantPoolEntry.setNameAndTypeDescriptorIndex(u2At(this.classFileBytes,  3, this.constantPoolOffset[index]));
> 				break;
> 			case IConstantPoolConstant.CONSTANT_String :
>+				constantPoolEntry = new ConstantPoolEntry();
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
> 				constantPoolEntry.setStringIndex(u2At(this.classFileBytes,  1, this.constantPoolOffset[index]));
> 				constantPoolEntry.setStringValue(getUtf8ValueAt(constantPoolEntry.getStringIndex()));
> 				break;
> 			case IConstantPoolConstant.CONSTANT_Utf8 :
>+				constantPoolEntry = new ConstantPoolEntry();
>+				constantPoolEntry.reset();
>+				constantPoolEntry.setKind(kind);
> 				constantPoolEntry.setUtf8Length(u2At(this.classFileBytes,  1, this.constantPoolOffset[index]));
> 				constantPoolEntry.setUtf8Value(getUtf8ValueAt(index));
>+				break;
>+			case IConstantPoolConstant.CONSTANT_MethodHandle :
>+				ConstantPoolEntry2 constantPoolEntry2 = new ConstantPoolEntry2();
>+				constantPoolEntry2.reset();
>+				constantPoolEntry2.setKind(kind);
>+				constantPoolEntry2.setReferenceKind(u1At(this.classFileBytes,  1, this.constantPoolOffset[index]));
>+				constantPoolEntry2.setReferenceIndex(u2At(this.classFileBytes,  2, this.constantPoolOffset[index]));
>+				constantPoolEntry = constantPoolEntry2;
>+				break;
>+			case IConstantPoolConstant.CONSTANT_MethodType :
>+				constantPoolEntry2 = new ConstantPoolEntry2();
>+				constantPoolEntry2.reset();
>+				constantPoolEntry2.setKind(kind);
>+				methodDescriptorIndex = u2At(this.classFileBytes,  1, this.constantPoolOffset[index]);
>+				constantPoolEntry2.setDescriptorIndex(methodDescriptorIndex);
>+				constantPoolEntry2.setMethodDescriptor(getUtf8ValueAt(methodDescriptorIndex));
>+				constantPoolEntry = constantPoolEntry2;
>+				break;
>+			case IConstantPoolConstant.CONSTANT_InvokeDynamic :
>+				constantPoolEntry2 = new ConstantPoolEntry2();
>+				constantPoolEntry2.reset();
>+				constantPoolEntry2.setKind(kind);
>+				constantPoolEntry2.setBootstrapMethodAttributeIndex(u2At(this.classFileBytes,  1, this.constantPoolOffset[index]));
>+				int nameAndTypeIndex = u2At(this.classFileBytes,  3, this.constantPoolOffset[index]);
>+				constantPoolEntry2.setNameAndTypeIndex(nameAndTypeIndex);
>+				methodNameIndex = u2At(this.classFileBytes,  1, this.constantPoolOffset[nameAndTypeIndex]);
>+				methodDescriptorIndex = u2At(this.classFileBytes,  3, this.constantPoolOffset[nameAndTypeIndex]);
>+				constantPoolEntry2.setMethodName(getUtf8ValueAt(methodNameIndex));
>+				constantPoolEntry2.setMethodDescriptor(getUtf8ValueAt(methodDescriptorIndex));
>+				constantPoolEntry = constantPoolEntry2;
>+				break;
> 		}
> 		return constantPoolEntry;
> 	}
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPoolEntry.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPoolEntry.java
>index 55cc170..9f9cae6 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPoolEntry.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPoolEntry.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -341,6 +341,7 @@
> 
> 	/**
> 	 * Sets the methodDescriptor.
>+	 *
> 	 * @param methodDescriptor The methodDescriptor to set
> 	 */
> 	public void setMethodDescriptor(char[] methodDescriptor) {
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPoolEntry2.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPoolEntry2.java
>new file mode 100644
>index 0000000..c6c9686
>--- /dev/null
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPoolEntry2.java
>@@ -0,0 +1,66 @@
>+/*******************************************************************************
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.internal.core.util;
>+
>+import org.eclipse.jdt.core.util.IConstantPoolEntry2;
>+
>+/**
>+ * Default implementation of IConstantPoolEntry
>+ *
>+ * @since 2.0
>+ */
>+public class ConstantPoolEntry2 extends ConstantPoolEntry implements IConstantPoolEntry2 {
>+	
>+	private int descriptorIndex;
>+	private int referenceKind;
>+	private int referenceIndex;
>+	private int bootstrapMethodAttributeIndex;
>+	
>+	public int getDescriptorIndex() {
>+		return this.descriptorIndex;
>+	}
>+
>+	public int getReferenceKind() {
>+		return this.referenceKind;
>+	}
>+
>+	public int getReferenceIndex() {
>+		return this.referenceIndex;
>+	}
>+
>+	public int getBootstrapMethodAttributeIndex() {
>+		return this.bootstrapMethodAttributeIndex;
>+	}
>+
>+	public void setDescriptorIndex(int descriptorIndex) {
>+		this.descriptorIndex = descriptorIndex;
>+	}
>+
>+	public void setReferenceKind(int referenceKind) {
>+		this.referenceKind = referenceKind;
>+	}
>+
>+	public void setReferenceIndex(int referenceIndex) {
>+		this.referenceIndex = referenceIndex;
>+	}
>+
>+	public void setBootstrapMethodAttributeIndex(int bootstrapMethodAttributeIndex) {
>+		this.bootstrapMethodAttributeIndex = bootstrapMethodAttributeIndex;
>+	}
>+	
>+	public void reset() {
>+		super.reset();
>+		this.descriptorIndex = 0;
>+		this.referenceKind = 0;
>+		this.referenceIndex = 0;
>+		this.bootstrapMethodAttributeIndex = 0;
>+	}
>+}
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DefaultBytecodeVisitor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DefaultBytecodeVisitor.java
>index d94dd4e..b5fe2ab 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DefaultBytecodeVisitor.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DefaultBytecodeVisitor.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -17,6 +17,7 @@
> import org.eclipse.jdt.core.util.ICodeAttribute;
> import org.eclipse.jdt.core.util.IConstantPoolConstant;
> import org.eclipse.jdt.core.util.IConstantPoolEntry;
>+import org.eclipse.jdt.core.util.IConstantPoolEntry2;
> import org.eclipse.jdt.core.util.ILocalVariableAttribute;
> import org.eclipse.jdt.core.util.ILocalVariableTableEntry;
> import org.eclipse.jdt.core.util.OpcodeStringValues;
>@@ -1491,7 +1492,7 @@
> 		writeNewLine();
> 	}
> 	/**
>-	 * @see IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry, IConstantPoolEntry)
>+	 * @see IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry)
> 	 */
> 	public void _invokedynamic(
> 		int pc,
>@@ -1513,6 +1514,30 @@
> 		writeNewLine();
> 	}
> 	/**
>+	 * @see IBytecodeVisitor#_invokedynamic(int, int, IConstantPoolEntry)
>+	 */
>+	public void _invokedynamic(
>+		int pc,
>+		int index,
>+		IConstantPoolEntry invokeDynamicEntry) {
>+
>+		dumpPcNumber(pc);
>+		IConstantPoolEntry2 entry = (IConstantPoolEntry2) invokeDynamicEntry;
>+		this.buffer.append(Messages.bind(Messages.classformat_invokedynamic,
>+			new String[] {
>+				OpcodeStringValues.BYTECODE_NAMES[IOpcodeMnemonics.INVOKEDYNAMIC],
>+				Integer.toString(index),
>+				Integer.toString(entry.getBootstrapMethodAttributeIndex()),
>+				Util.toString(
>+					null,
>+					entry.getMethodName(),
>+					entry.getMethodDescriptor(),
>+					true,
>+					isCompact())
>+			}));
>+		writeNewLine();
>+	}
>+	/**
> 	 * @see IBytecodeVisitor#_invokeinterface(int, int, byte, IConstantPoolEntry)
> 	 */
> 	public void _invokeinterface(
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Disassembler.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Disassembler.java
>index c54fd73..067a219 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Disassembler.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Disassembler.java
>@@ -741,7 +741,7 @@
> 		final int classNameLength = className.length;
> 		final int accessFlags = classFileReader.getAccessFlags();
> 		final boolean isEnum = (accessFlags & IModifierConstants.ACC_ENUM) != 0;
>-
>+	
> 		StringBuffer buffer = new StringBuffer();
> 		ISourceAttribute sourceAttribute = classFileReader.getSourceFileAttribute();
> 		IClassFileAttribute classFileAttribute = Util.getAttribute(classFileReader, IAttributeNamesConstants.SIGNATURE);
>@@ -788,7 +788,7 @@
> 			}
> 		}
> 		final int lastDotIndexInClassName = CharOperation.lastIndexOf('.', className);
>-
>+	
> 		if (checkMode(mode, WORKING_COPY) && lastDotIndexInClassName != -1) {
> 			// we print a package declaration
> 			buffer.append("package ");//$NON-NLS-1$
>@@ -796,11 +796,13 @@
> 			buffer.append(';');
> 			writeNewLine(buffer, lineSeparator, 0);
> 		}
>-
>+	
> 		IInnerClassesAttribute innerClassesAttribute = classFileReader.getInnerClassesAttribute();
> 		IClassFileAttribute runtimeVisibleAnnotationsAttribute = Util.getAttribute(classFileReader, IAttributeNamesConstants.RUNTIME_VISIBLE_ANNOTATIONS);
> 		IClassFileAttribute runtimeInvisibleAnnotationsAttribute = Util.getAttribute(classFileReader, IAttributeNamesConstants.RUNTIME_INVISIBLE_ANNOTATIONS);
>-
>+	
>+		IClassFileAttribute bootstrapMethods = Util.getAttribute(classFileReader, IAttributeNamesConstants.BOOTSTRAP_METHODS);
>+	
> 		if (checkMode(mode, DETAILED)) {
> 			// disassemble compact version of annotations
> 			if (runtimeInvisibleAnnotationsAttribute != null) {
>@@ -838,7 +840,7 @@
> 				}
> 			}
> 		}
>-
>+	
> 		final boolean isAnnotation = (accessFlags & IModifierConstants.ACC_ANNOTATION) != 0;
> 		boolean isInterface = false;
> 		if (isEnum) {
>@@ -852,7 +854,7 @@
> 			buffer.append("interface "); //$NON-NLS-1$
> 			isInterface = true;
> 		}
>-
>+	
> 		if (checkMode(mode, WORKING_COPY)) {
> 			// we print the simple class name
> 			final int start = lastDotIndexInClassName + 1;
>@@ -864,7 +866,7 @@
> 		} else {
> 			buffer.append(className);
> 		}
>-
>+	
> 		char[] superclassName = classFileReader.getSuperclassName();
> 		if (superclassName != null) {
> 			CharOperation.replace(superclassName, '/', '.');
>@@ -917,14 +919,26 @@
> 			if (signatureAttribute != null) {
> 				remainingAttributesLength--;
> 			}
>-			if (innerClassesAttribute != null || enclosingMethodAttribute != null || remainingAttributesLength != 0) {
>-				writeNewLine(buffer, lineSeparator, 0);
>+			if (bootstrapMethods != null) {
>+				remainingAttributesLength--;
>+			}
>+			if (innerClassesAttribute != null
>+					|| enclosingMethodAttribute != null
>+					|| bootstrapMethods != null
>+					|| remainingAttributesLength != 0) {
>+				// this test is to ensure we don't insert more than one line separator
>+				if (buffer.lastIndexOf(lineSeparator) != buffer.length() - lineSeparator.length()) {
>+					writeNewLine(buffer, lineSeparator, 0);
>+				}
> 			}
> 			if (innerClassesAttribute != null) {
> 				disassemble(innerClassesAttribute, buffer, lineSeparator, 1);
> 			}
> 			if (enclosingMethodAttribute != null) {
> 				disassemble(enclosingMethodAttribute, buffer, lineSeparator, 0);
>+			}
>+			if (bootstrapMethods != null) {
>+				disassemble((IBootstrapMethodsAttribute) bootstrapMethods, buffer, lineSeparator, 0);
> 			}
> 			if (checkMode(mode, SYSTEM)) {
> 				if (runtimeVisibleAnnotationsAttribute != null) {
>@@ -937,13 +951,14 @@
> 					for (int i = 0; i < length; i++) {
> 						IClassFileAttribute attribute = attributes[i];
> 						if (attribute != innerClassesAttribute
>-							&& attribute != sourceAttribute
>-							&& attribute != signatureAttribute
>-							&& attribute != enclosingMethodAttribute
>-							&& attribute != runtimeInvisibleAnnotationsAttribute
>-							&& attribute != runtimeVisibleAnnotationsAttribute
>-							&& !CharOperation.equals(attribute.getAttributeName(), IAttributeNamesConstants.DEPRECATED)
>-							&& !CharOperation.equals(attribute.getAttributeName(), IAttributeNamesConstants.SYNTHETIC)) {
>+								&& attribute != sourceAttribute
>+								&& attribute != signatureAttribute
>+								&& attribute != enclosingMethodAttribute
>+								&& attribute != runtimeInvisibleAnnotationsAttribute
>+								&& attribute != runtimeVisibleAnnotationsAttribute
>+								&& !CharOperation.equals(attribute.getAttributeName(), IAttributeNamesConstants.DEPRECATED)
>+								&& !CharOperation.equals(attribute.getAttributeName(), IAttributeNamesConstants.SYNTHETIC)
>+								&& attribute != bootstrapMethods) {
> 							disassemble(attribute, buffer, lineSeparator, 0, mode);
> 						}
> 					}
>@@ -1408,8 +1423,72 @@
> 								Integer.toString(i),
> 								decodeStringValue(new String(constantPoolEntry.getUtf8Value()))}));
> 					break;
>+				case IConstantPoolConstant.CONSTANT_MethodHandle :
>+					IConstantPoolEntry2 entry2 = (IConstantPoolEntry2) constantPoolEntry;
>+					buffer.append(
>+							Messages.bind(Messages.disassembler_constantpool_methodhandle,
>+								new String[] {
>+									Integer.toString(i),
>+									getReferenceKind(entry2.getReferenceKind()),
>+									Integer.toString(entry2.getReferenceIndex()),
>+								}));
>+					break;
>+				case IConstantPoolConstant.CONSTANT_MethodType :
>+					entry2 = (IConstantPoolEntry2) constantPoolEntry;
>+					buffer.append(
>+							Messages.bind(Messages.disassembler_constantpool_methodtype,
>+								new String[] {
>+									Integer.toString(i),
>+									Integer.toString(entry2.getDescriptorIndex()),
>+									String.valueOf(entry2.getMethodDescriptor()),
>+								}));
>+					break;
>+				case IConstantPoolConstant.CONSTANT_InvokeDynamic :
>+					entry2 = (IConstantPoolEntry2) constantPoolEntry;
>+					buffer.append(
>+						Messages.bind(Messages.disassembler_constantpool_invokedynamic,
>+							new String[] {
>+								Integer.toString(i),
>+								Integer.toString(entry2.getBootstrapMethodAttributeIndex()),
>+								Integer.toString(entry2.getNameAndTypeIndex()),
>+								new String(constantPoolEntry.getMethodName()),
>+								new String(constantPoolEntry.getMethodDescriptor())
>+							}));
> 			}
> 		}
>+	}
>+	
>+	private String getReferenceKind(int referenceKind) {
>+		String message = null;
>+		switch(referenceKind) {
>+			case IConstantPoolConstant.METHOD_TYPE_REF_GetField :
>+				message = Messages.disassembler_method_type_ref_getfield;
>+				break;
>+			case IConstantPoolConstant.METHOD_TYPE_REF_GetStatic :
>+				message = Messages.disassembler_method_type_ref_getstatic;
>+				break;
>+			case IConstantPoolConstant.METHOD_TYPE_REF_PutField :
>+				message = Messages.disassembler_method_type_ref_putfield;
>+				break;
>+			case IConstantPoolConstant.METHOD_TYPE_REF_PutStatic :
>+				message = Messages.disassembler_method_type_ref_putstatic;
>+				break;
>+			case IConstantPoolConstant.METHOD_TYPE_REF_InvokeInterface :
>+				message = Messages.disassembler_method_type_ref_invokeinterface;
>+				break;
>+			case IConstantPoolConstant.METHOD_TYPE_REF_InvokeSpecial :
>+				message = Messages.disassembler_method_type_ref_invokespecial;
>+				break;
>+			case IConstantPoolConstant.METHOD_TYPE_REF_InvokeStatic :
>+				message = Messages.disassembler_method_type_ref_invokestatic;
>+				break;
>+			case IConstantPoolConstant.METHOD_TYPE_REF_InvokeVirtual :
>+				message = Messages.disassembler_method_type_ref_invokevirtual;
>+				break;
>+			default :
>+				message = Messages.disassembler_method_type_ref_newinvokespecial;
>+		}
>+		return Messages.bind(message, new String[] { Integer.toString(referenceKind) });
> 	}
> 
> 	private void disassemble(IEnclosingMethodAttribute enclosingMethodAttribute, StringBuffer buffer, String lineSeparator, int tabNumber) {
>@@ -1669,6 +1748,46 @@
> 		}
> 	}
> 
>+	private void disassemble(IBootstrapMethodsAttribute bootstrapMethodsAttribute, StringBuffer buffer, String lineSeparator, int tabNumber) {
>+		writeNewLine(buffer, lineSeparator, tabNumber);
>+		buffer.append(Messages.disassembler_bootstrapmethodattributesheader);
>+		writeNewLine(buffer, lineSeparator, tabNumber + 1);
>+		IBootstrapMethodsEntry[] entries = bootstrapMethodsAttribute.getBootstrapMethods();
>+		int length = entries.length;
>+		for (int i = 0; i < length; i++) {
>+			if (i != 0) {
>+				buffer.append(Messages.disassembler_comma);
>+				writeNewLine(buffer, lineSeparator, tabNumber + 1);
>+			}
>+			IBootstrapMethodsEntry entry = entries[i];
>+			buffer.append(
>+				Messages.bind(
>+					Messages.disassembler_bootstrapmethodentry,
>+					new String[] {
>+						Integer.toString(i),
>+						Integer.toString(entry.getBootstrapMethodReference()),
>+						getArguments(entry.getBootstrapArguments())
>+					}));
>+		}
>+	}
>+
>+	private String getArguments(int[] arguments) {
>+		StringBuffer buffer = new StringBuffer();
>+		buffer.append('{');
>+		for (int i = 0, max = arguments.length; i < max; i++) {
>+			if (i != 0) {
>+				buffer.append(Messages.disassembler_comma);
>+			}
>+			buffer.append(
>+				Messages.bind(
>+					Messages.disassembler_bootstrapmethodentry_argument,
>+					new String[] {
>+						Integer.toString(arguments[i]),
>+					}));
>+		}
>+		buffer.append('}');
>+		return String.valueOf(buffer);
>+	}
> 	private void disassemble(int index, IParameterAnnotation parameterAnnotation, StringBuffer buffer, String lineSeparator, int tabNumber, int mode) {
> 		IAnnotation[] annotations = parameterAnnotation.getAnnotations();
> 		writeNewLine(buffer, lineSeparator, tabNumber + 1);
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Messages.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Messages.java
>index 75ecbab..ff1cf83 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Messages.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Messages.java
>@@ -259,6 +259,9 @@
> 	public static String disassembler_inner_accessflags;
> 	public static String disassembler_genericattributeheader;
> 	public static String disassembler_signatureattributeheader;
>+	public static String disassembler_bootstrapmethodattributesheader;
>+	public static String disassembler_bootstrapmethodentry;
>+	public static String disassembler_bootstrapmethodentry_argument;
> 	public static String disassembler_indentation;
> 	public static String disassembler_constantpoolindex;
> 	public static String disassembler_space;
>@@ -278,6 +281,9 @@
> 	public static String disassembler_constantpool_methodref;
> 	public static String disassembler_constantpool_name_and_type;
> 	public static String disassembler_constantpool_utf8;
>+	public static String disassembler_constantpool_methodhandle;
>+	public static String disassembler_constantpool_methodtype;
>+	public static String disassembler_constantpool_invokedynamic;
> 	public static String disassembler_annotationdefaultheader;
> 	public static String disassembler_annotationdefaultvalue;
> 	public static String disassembler_annotationenumvalue;
>@@ -348,6 +354,16 @@
> 	public static String disassembler_frame_same_frame;
> 	public static String disassembler_frame_same_locals_1_stack_item;
> 	public static String code_assist_internal_error;
>+	
>+	public static String disassembler_method_type_ref_getfield;
>+	public static String disassembler_method_type_ref_putfield;
>+	public static String disassembler_method_type_ref_getstatic;
>+	public static String disassembler_method_type_ref_putstatic;
>+	public static String disassembler_method_type_ref_invokestatic;
>+	public static String disassembler_method_type_ref_invokevirtual;
>+	public static String disassembler_method_type_ref_invokespecial;
>+	public static String disassembler_method_type_ref_invokeinterface;
>+	public static String disassembler_method_type_ref_newinvokespecial;
> 
> 	static {
> 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java
>index db2eade..92cc37e 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java
>@@ -1817,13 +1817,13 @@
> 		this.currentPosition += (this.eofPosition - this.currentPosition);
> 		throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
> 	}
>-	if ((c1 = ScannerHelper.getNumericValue(this.source[this.currentPosition++])) > 15
>+	if ((c1 = ScannerHelper.getHexadecimalValue(this.source[this.currentPosition++])) > 15
>     		|| c1 < 0
>-    		|| (c2 = ScannerHelper.getNumericValue(this.source[this.currentPosition++])) > 15
>+    		|| (c2 = ScannerHelper.getHexadecimalValue(this.source[this.currentPosition++])) > 15
>     		|| c2 < 0
>-    		|| (c3 = ScannerHelper.getNumericValue(this.source[this.currentPosition++])) > 15
>+    		|| (c3 = ScannerHelper.getHexadecimalValue(this.source[this.currentPosition++])) > 15
>     		|| c3 < 0
>-    		|| (c4 = ScannerHelper.getNumericValue(this.source[this.currentPosition++])) > 15
>+    		|| (c4 = ScannerHelper.getHexadecimalValue(this.source[this.currentPosition++])) > 15
>     		|| c4 < 0){
> 		throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
> 	}
>@@ -2723,18 +2723,18 @@
> 			// OctalDigit OctalDigit
> 			// ZeroToThree OctalDigit OctalDigit
> 
>-			int number = ScannerHelper.getNumericValue(this.currentCharacter);
>+			int number = ScannerHelper.getHexadecimalValue(this.currentCharacter);
> 			if (number >= 0 && number <= 7) {
> 				boolean zeroToThreeNot = number > 3;
> 				if (ScannerHelper.isDigit(this.currentCharacter = this.source[this.currentPosition++])) {
>-					int digit = ScannerHelper.getNumericValue(this.currentCharacter);
>+					int digit = ScannerHelper.getHexadecimalValue(this.currentCharacter);
> 					if (digit >= 0 && digit <= 7) {
> 						number = (number * 8) + digit;
> 						if (ScannerHelper.isDigit(this.currentCharacter = this.source[this.currentPosition++])) {
> 							if (zeroToThreeNot) {// has read \NotZeroToThree OctalDigit Digit --> ignore last character
> 								this.currentPosition--;
> 							} else {
>-								digit = ScannerHelper.getNumericValue(this.currentCharacter);
>+								digit = ScannerHelper.getHexadecimalValue(this.currentCharacter);
> 								if (digit >= 0 && digit <= 7){ // has read \ZeroToThree OctalDigit OctalDigit
> 									number = (number * 8) + digit;
> 								} else {// has read \ZeroToThree OctalDigit NonOctalDigit --> ignore last character
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties
>index e75e56b..5af88db 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties
>@@ -285,6 +285,9 @@
> disassembler_stackmaptableattributeheader = Stack map table: number of frames {0}
> disassembler_stackmapattributeheader =  Stack map : number of frames {0}
> disassembler_signatureattributeheader = // Signature: {0}
>+disassembler_bootstrapmethodattributesheader = Bootstrap methods:
>+disassembler_bootstrapmethodentry = {0} : # {1} arguments: {2}
>+disassembler_bootstrapmethodentry_argument = #{0}
> disassembler_indentation = \  
> disassembler_constantpoolindex =\ #
> disassembler_space = \ 
>@@ -304,6 +307,9 @@
> disassembler_constantpool_methodref = constant #{0} method_ref: #{1}.#{2} {3}.{4} {5}
> disassembler_constantpool_name_and_type = constant #{0} name_and_type: #{1}.#{2} {3} {4}
> disassembler_constantpool_utf8 = constant #{0} utf8: "{1}"
>+disassembler_constantpool_methodhandle = constant #{0} method handle: {1} #{2} 
>+disassembler_constantpool_methodtype = constant #{0} method type: #{1} {2}
>+disassembler_constantpool_invokedynamic = constant #{0} invoke dynamic: #{1} #{2} {3} {4}
> disassembler_annotationdefaultheader = Annotation Default:\ 
> disassembler_annotationdefaultvalue= {0} (constant type)
> disassembler_annotationenumvalue = {2}.{3}(enum type #{0}.#{1})
>@@ -323,6 +329,15 @@
> disassembler_frame_chop=[pc: {0}, chop {1} local(s)]
> disassembler_frame_same_frame_extended=[pc: {0}, same_extended]
> disassembler_frame_append=[pc: {0}, append: {1}]
>+disassembler_method_type_ref_getfield = getfield ({0})
>+disassembler_method_type_ref_putfield = putfield ({0})
>+disassembler_method_type_ref_getstatic = getstatic ({0})
>+disassembler_method_type_ref_putstatic = putstatic ({0})
>+disassembler_method_type_ref_invokestatic = invokestatic ({0})
>+disassembler_method_type_ref_invokevirtual = invokevirtual ({0})
>+disassembler_method_type_ref_invokeinterface = invokeinterface ({0})
>+disassembler_method_type_ref_invokespecial = invokespecial ({0})
>+disassembler_method_type_ref_newinvokespecial = newinvokespecial ({0})
> # {0} = offset delta
> # {1} = number of locals
> # {2} = locals
>@@ -358,7 +373,7 @@
> classformat_iinc = {0} {1} {2}{3}
> classformat_invokespecial ={0} {2} [{1}]
> classformat_invokeinterface ={0} {3} [{1}] [nargs: {2}]
>-classformat_invokedynamic={0} {2} [{1}]
>+classformat_invokedynamic={0} {2} {3} [{1}]
> classformat_invokestatic ={0} {2} [{1}]
> classformat_invokevirtual ={0} {2} [{1}]
> classformat_getfield ={0} {2}.{3} : {4} [{1}]
>diff --git a/org.eclipse.jdt.core/plugin.xml b/org.eclipse.jdt.core/plugin.xml
>index 3784256..5d69788 100644
>--- a/org.eclipse.jdt.core/plugin.xml
>+++ b/org.eclipse.jdt.core/plugin.xml
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <?eclipse version="3.0"?>
> 
>@@ -196,6 +201,17 @@
> </extension>
> 
> 
>+
>+
>+<extension
>+      id="JavaIndexer"
>+      point="org.eclipse.core.runtime.applications">
>+   		<application>
>+      		<run class="org.eclipse.jdt.core.index.JavaIndexerApplication" />
>+   		</application>
>+</extension>
>+
>+
> 
> 
> <extension point="org.eclipse.core.contenttype.contentTypes">
>diff --git a/org.eclipse.jdt.core/scripts/exportplugin.xml b/org.eclipse.jdt.core/scripts/exportplugin.xml
>index f85d898..0caf4af 100644
>--- a/org.eclipse.jdt.core/scripts/exportplugin.xml
>+++ b/org.eclipse.jdt.core/scripts/exportplugin.xml
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> 
> 
> 
> 
>-<project name="${plugin}" default="export plug-in [_3.8.0]" basedir="..">
>-<target name="export plug-in [_3.8.0]">
>+<project name="${plugin}" default="export plug-in [_3.8.1]" basedir="..">
>+<target name="export plug-in [_3.8.1]">
>     <tstamp/>
> 	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
> 	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.8.0"/>
>+		<param name="jdt_core_version" value="3.8.1"/>
> 	</antcall>
> </target>
>-<target name="export plug-in [_3.8.0.qualifier] (binary only)">
>+<target name="export plug-in [_3.8.1.qualifier] (binary only)">
>     <tstamp/>
> 	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
> 	<antcall target="zz_internal_export_binary_only">
>-		<param name="jdt_core_version" value="3.8.0.${qualifier}"/>
>+		<param name="jdt_core_version" value="3.8.1.${qualifier}"/>
> 	</antcall>
> </target>
>-<target name="export plug-in [_3.8.0.qualifier] (with sources)">
>+<target name="export plug-in [_3.8.1.qualifier] (with sources)">
>     <tstamp/>
> 	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
> 	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.8.0.${qualifier}"/>
>+		<param name="jdt_core_version" value="3.8.1.${qualifier}"/>
> 	</antcall>
> </target>
> 
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/JavaIndexer.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/JavaIndexer.java
>new file mode 100644
>index 0000000..4fa991a
>--- /dev/null
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/JavaIndexer.java
>@@ -0,0 +1,42 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.core.index;
>+
>+import java.io.IOException;
>+
>+import org.eclipse.jdt.core.search.SearchEngine;
>+import org.eclipse.jdt.internal.core.search.indexing.DefaultJavaIndexer;
>+
>+/**
>+ * {@link JavaIndexer} provides functionality to generate index files which can be used by the JDT {@link SearchEngine}.
>+ * The generated index files can be used as a classpath attribute for the particular classpath entry.
>+ * 
>+ * <p> The search engine indexes all the elements referred in the classpath entries of the project into
>+ * index files. These index files are used to search the elements faster. Indexing for bigger jars could
>+ * take some time. To avoid this time, one can generate the index file and specify it when the jar is added
>+ * to the classpath of the project. </p>
>+ *
>+ * @since 3.8
>+ */
>+public final class JavaIndexer {
>+
>+	/**
>+	 * Generates the index file for the specified jar.
>+	 * @param pathToJar The full path to the jar that needs to be indexed
>+	 * @param pathToIndexFile The full path to the index file that needs to be generated
>+	 * @throws IOException if the jar is not found or could not write into the index file
>+	 * @since 3.8
>+	 */
>+	public static void generateIndexForJar(String pathToJar, String pathToIndexFile) throws IOException {
>+		new DefaultJavaIndexer().generateIndexForJar(pathToJar, pathToIndexFile);
>+	}
>+
>+}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/JavaIndexerApplication.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/JavaIndexerApplication.java
>new file mode 100644
>index 0000000..7aae18a
>--- /dev/null
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/JavaIndexerApplication.java
>@@ -0,0 +1,158 @@
>+/*******************************************************************************
>+ *  Copyright (c) 2011 IBM Corporation and others.
>+ *  All rights reserved. This program and the accompanying materials
>+ *  are made available under the terms of the Eclipse Public License v1.0
>+ *  which accompanies this distribution, and is available at
>+ *  http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ *  Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.core.index;
>+
>+import java.io.File;
>+import java.io.IOException;
>+import java.text.MessageFormat;
>+import java.util.ArrayList;
>+
>+import org.eclipse.equinox.app.IApplication;
>+import org.eclipse.equinox.app.IApplicationContext;
>+import org.eclipse.osgi.util.NLS;
>+
>+/**
>+ * Implements an Eclipse Application for {@link org.eclipse.jdt.core.index.JavaIndexer}.
>+ * 
>+ * <p>
>+ * On MacOS, when invoked using the Eclipse executable, the "user.dir" property is set to the folder in which the
>+ * eclipse.ini file is located. This makes it harder to use relative paths to point to the files to be jar'd or to
>+ * the index file that is generated.
>+ * </p>
>+ * 
>+ * 
>+ * @since 3.8
>+ * @noinstantiate This class is not intended to be instantiated by clients.
>+ * @noextend This class is not intended to be subclassed by clients.
>+ */
>+public class JavaIndexerApplication implements IApplication {
>+
>+	private final static class Messages extends NLS {
>+		private static final String MESSAGES_NAME = "org.eclipse.jdt.core.index.messages";//$NON-NLS-1$
>+
>+		public static String CommandLineProcessing;
>+		public static String CommandLineUsage;
>+		public static String CommandLineOnlyOneOutputError;
>+		public static String CommandLineOutputTakesArgs;
>+		public static String CommandLineOnlyOneJarError;
>+		public static String CommandLineJarNotSpecified;
>+		public static String CommandLineIndexFileNotSpecified;
>+		public static String CaughtException;
>+		public static String CommandLineJarFileNotExist;
>+
>+		static {
>+			NLS.initializeMessages(MESSAGES_NAME, Messages.class);
>+		}
>+
>+		public static String bind(String message) {
>+			return bind(message, null);
>+		}
>+
>+		public static String bind(String message, Object binding) {
>+			return bind(message, new Object[] { binding });
>+		}
>+
>+		public static String bind(String message, Object binding1, Object binding2) {
>+			return bind(message, new Object[] { binding1, binding2 });
>+		}
>+
>+		public static String bind(String message, Object[] bindings) {
>+			return MessageFormat.format(message, bindings);
>+		}
>+	}
>+
>+	private String jarToIndex;
>+	private String indexFile;
>+	private boolean verbose = false;
>+	private static final String PDE_LAUNCH = "-pdelaunch"; //$NON-NLS-1$
>+	private static final String ARG_HELP = "-help"; //$NON-NLS-1$
>+	private static final String ARG_VERBOSE = "-verbose"; //$NON-NLS-1$
>+	private static final String ARG_OUTPUT = "-output"; //$NON-NLS-1$
>+
>+	private void displayHelp() {
>+		System.out.println(Messages.bind(Messages.CommandLineUsage));
>+	}
>+
>+	private void displayError(String message) {
>+		System.out.println(message);
>+		System.out.println();
>+		displayHelp();
>+	}
>+
>+	private boolean processCommandLine(String[] argsArray) {
>+		ArrayList args = new ArrayList();
>+		for (int i = 0, max = argsArray.length; i < max; i++) {
>+			args.add(argsArray[i]);
>+		}
>+		int index = 0;
>+		final int argCount = argsArray.length;
>+
>+		loop: while (index < argCount) {
>+			String currentArg = argsArray[index++];
>+			if (PDE_LAUNCH.equals(currentArg)) {
>+				continue loop;
>+			} else if (ARG_HELP.equals(currentArg)) {
>+				displayHelp();
>+				return false;
>+			} else if (ARG_VERBOSE.equals(currentArg)) {
>+				this.verbose = true;
>+				continue loop;
>+			} else if (ARG_OUTPUT.equals(currentArg)) {
>+				if (this.indexFile != null) {
>+					displayError(Messages.bind(Messages.CommandLineOnlyOneOutputError));
>+					return false;
>+				} else if (index == argCount) {
>+					displayError(Messages.bind(Messages.CommandLineOutputTakesArgs));
>+					return false;
>+				}
>+				this.indexFile = argsArray[index++];
>+			} else {
>+				if (this.jarToIndex != null) {
>+					displayError(Messages.bind(Messages.CommandLineOnlyOneJarError));
>+					return false;
>+				}
>+				this.jarToIndex = currentArg;
>+			}
>+		}
>+		return true;
>+	}
>+
>+	public Object start(IApplicationContext context) throws Exception {
>+		boolean execute = processCommandLine((String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS));
>+		if (execute) {
>+			if (this.jarToIndex != null && this.indexFile != null) {
>+				File f = new File(this.jarToIndex);
>+				if (f.exists()) {
>+					if (this.verbose) {
>+						System.out.println(Messages.bind(Messages.CommandLineProcessing, this.indexFile, this.jarToIndex));
>+					}
>+					try {
>+						JavaIndexer.generateIndexForJar(this.jarToIndex, this.indexFile);
>+					} catch (IOException e) {
>+						System.out.println(Messages.bind(Messages.CaughtException, "IOException", e.getLocalizedMessage())); //$NON-NLS-1$
>+					}
>+				} else {
>+						System.out.println(Messages.bind(Messages.CommandLineJarFileNotExist, this.jarToIndex));
>+				}
>+			} else if (this.jarToIndex == null) {
>+				System.out.println(Messages.bind(Messages.CommandLineJarNotSpecified));
>+			} else if (this.indexFile == null) {
>+				System.out.println(Messages.bind(Messages.CommandLineIndexFileNotSpecified));
>+			}
>+		}
>+		return IApplication.EXIT_OK;
>+	}
>+
>+	public void stop() {
>+		// do nothing
>+	}
>+
>+}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/messages.properties b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/messages.properties
>new file mode 100644
>index 0000000..139ce10
>--- /dev/null
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/messages.properties
>@@ -0,0 +1,29 @@
>+###############################################################################
>+# Copyright (c) 2000, 2006 IBM Corporation and others.
>+# All rights reserved. This program and the accompanying materials
>+# are made available under the terms of the Eclipse Public License v1.0
>+# which accompanies this distribution, and is available at
>+# http://www.eclipse.org/legal/epl-v10.html
>+#
>+# Contributors:
>+#     IBM Corporation - initial API and implementation
>+###############################################################################
>+CommandLineUsage=Usage: eclipse -application org.eclipse.jdt.core.JavaIndexer [ OPTIONS ] -output <indexFile> <jarfile>\n\
>+\n\
>+\   -output <indexFile> Path to the index file to be generated.\n\
>+\
>+\   <jarfile>   Path to the jar for which index needs to be generated.\n\
>+\
>+\n\
>+\ OPTIONS:\n\
>+\n\
>+\   -help                Display this message.\n\
>+\   -verbose             Be verbose about the job.
>+CommandLineProcessing=Generating index {0} for the jar {1}.
>+CommandLineOnlyOneOutputError=Only one output needs to be specified.
>+CommandLineOutputTakesArgs=-output should be followed by the path to the index file.
>+CommandLineOnlyOneJarError=Only one jar file needs to be specified.
>+CommandLineJarNotSpecified=No jar file is specified.
>+CommandLineIndexFileNotSpecified=No index file is specified.
>+CaughtException=Exception {0} - {1}.
>+CommandLineJarFileNotExist={0} does not exist.
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/package.html b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/package.html
>new file mode 100644
>index 0000000..ea16568
>--- /dev/null
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/index/package.html
>@@ -0,0 +1,19 @@
>+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
>+<html>
>+<head>
>+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+   <meta name="Author" content="IBM">
>+   <meta name="GENERATOR" content="Mozilla/4.73 [en] (Windows NT 5.0; U) [Netscape]">
>+   <title>Package-level Javadoc</title>
>+</head>
>+<body>
>+Provides support for generating indexes that can be used by the JDT search engine.
>+<h2>
>+Package Specification</h2>
>+This package provides support for generating indexes that can be used by the search engine. The search engine 
>+indexes all the elements referred in the classpath entries of the project into
>+index files. These index files are used to search the elements faster. Indexing for bigger jars could
>+take some time. To avoid this time, one can generate the index file and specify it when the jar is added
>+to the classpath of the project.
>+</body>
>+</html>
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchParticipant.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchParticipant.java
>index 4e3f6c4..2a87b52 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchParticipant.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchParticipant.java
>@@ -14,6 +14,8 @@
> import org.eclipse.core.runtime.*;
> import org.eclipse.jdt.internal.core.JavaModel;
> import org.eclipse.jdt.internal.core.JavaModelManager;
>+import org.eclipse.jdt.internal.core.index.FileIndexLocation;
>+import org.eclipse.jdt.internal.core.index.IndexLocation;
> import org.eclipse.jdt.internal.core.search.indexing.IndexManager;
> 
> /**
>@@ -192,9 +194,9 @@
> 	 * </p>
> 	 *
> 	 * @param document the document to index
>-	 * @param indexLocation the location on the file system of the index
>+	 * @param indexPath the location on the file system of the index
> 	 */
>-	public final void scheduleDocumentIndexing(SearchDocument document, IPath indexLocation) {
>+	public final void scheduleDocumentIndexing(SearchDocument document, IPath indexPath) {
> 		IPath documentPath = new Path(document.getPath());
> 		Object file = JavaModel.getTarget(documentPath, true);
> 		IPath containerPath = documentPath;
>@@ -205,11 +207,13 @@
> 		}
> 		IndexManager manager = JavaModelManager.getIndexManager();
> 		// TODO (frederic) should not have to create index manually, should expose API that recreates index instead
>+		IndexLocation indexLocation;
>+		indexLocation = new FileIndexLocation(indexPath.toFile(), true);
> 		manager.ensureIndexExists(indexLocation, containerPath);
> 		manager.scheduleDocumentIndexing(document, containerPath, indexLocation, this);
>-		if (!indexLocation.equals(this.lastIndexLocation)) {
>-			manager.updateParticipant(indexLocation, containerPath);
>-			this.lastIndexLocation = indexLocation;
>+		if (!indexPath.equals(this.lastIndexLocation)) {
>+			manager.updateParticipant(indexPath, containerPath);
>+			this.lastIndexLocation = indexPath;
> 		}
> 	}
> 
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/DiskIndex.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/DiskIndex.java
>index 7644036..8e09289 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/DiskIndex.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/DiskIndex.java
>@@ -23,7 +23,7 @@
> 
> public class DiskIndex {
> 
>-File indexFile;
>+IndexLocation indexLocation;
> 
> private int headerInfoOffset;
> private int numberOfChunks;
>@@ -82,12 +82,7 @@
> }
> 
> 
>-DiskIndex(String fileName) {
>-	if (fileName == null)
>-		throw new java.lang.IllegalArgumentException();
>-	this.indexFile = new File(fileName);
>-
>-	// clear cached items
>+DiskIndex() {
> 	this.headerInfoOffset = -1;
> 	this.numberOfChunks = -1;
> 	this.sizeOfLastChunk = -1;
>@@ -99,6 +94,13 @@
> 	this.cachedCategoryName = null;
> 	this.categoryOffsets = null;
> 	this.categoryEnds = null;
>+}
>+DiskIndex(IndexLocation location) throws IOException {
>+	this();
>+	if (location == null) {
>+		throw new IllegalArgumentException();
>+	}
>+	this.indexLocation = location;
> }
> SimpleSet addDocumentNames(String substring, MemoryIndex memoryIndex) throws IOException {
> 	// must skip over documents which have been added/changed/deleted in the memory index
>@@ -230,7 +232,7 @@
> private void cacheDocumentNames() throws IOException {
> 	// will need all document names so get them now
> 	this.cachedChunks = new String[this.numberOfChunks][];
>-	FileInputStream stream = new FileInputStream(this.indexFile);
>+	InputStream stream = this.indexLocation.getInputStream();
> 	try {
> 		if (this.numberOfChunks > 5) BUFFER_READ_SIZE <<= 1;
> 		int offset = this.chunkOffsets[0];
>@@ -370,9 +372,12 @@
> 	}
> }
> void initialize(boolean reuseExistingFile) throws IOException {
>-	if (this.indexFile.exists()) {
>+	if (this.indexLocation.exists()) {
> 		if (reuseExistingFile) {
>-			FileInputStream stream = new FileInputStream(this.indexFile);
>+			InputStream stream = this.indexLocation.getInputStream();
>+			if (stream == null) {
>+				throw new IOException("Failed to use the index file"); //$NON-NLS-1$
>+			}
> 			this.streamBuffer = new byte[BUFFER_READ_SIZE];
> 			this.bufferIndex = 0;
> 			this.bufferEnd = stream.read(this.streamBuffer, 0, 128);
>@@ -393,14 +398,14 @@
> 			}
> 			return;
> 		}
>-		if (!this.indexFile.delete()) {
>+		if (!this.indexLocation.delete()) {
> 			if (DEBUG)
>-				System.out.println("initialize - Failed to delete index " + this.indexFile); //$NON-NLS-1$
>-			throw new IOException("Failed to delete index " + this.indexFile); //$NON-NLS-1$
>+				System.out.println("initialize - Failed to delete index " + this.indexLocation); //$NON-NLS-1$
>+			throw new IOException("Failed to delete index " + this.indexLocation); //$NON-NLS-1$
> 		}
> 	}
>-	if (this.indexFile.createNewFile()) {
>-		FileOutputStream stream = new FileOutputStream(this.indexFile, false);
>+	if (this.indexLocation.createNewFile()) {
>+		FileOutputStream stream = new FileOutputStream(this.indexLocation.getIndexFile(), false);
> 		try {
> 			this.streamBuffer = new byte[BUFFER_READ_SIZE];
> 			this.bufferIndex = 0;
>@@ -416,18 +421,18 @@
> 		}
> 	} else {
> 		if (DEBUG)
>-			System.out.println("initialize - Failed to create new index " + this.indexFile); //$NON-NLS-1$
>-		throw new IOException("Failed to create new index " + this.indexFile); //$NON-NLS-1$
>+			System.out.println("initialize - Failed to create new index " + this.indexLocation); //$NON-NLS-1$
>+		throw new IOException("Failed to create new index " + this.indexLocation); //$NON-NLS-1$
> 	}
> }
> private void initializeFrom(DiskIndex diskIndex, File newIndexFile) throws IOException {
> 	if (newIndexFile.exists() && !newIndexFile.delete()) { // delete the temporary index file
> 		if (DEBUG)
>-			System.out.println("initializeFrom - Failed to delete temp index " + this.indexFile); //$NON-NLS-1$
>+			System.out.println("initializeFrom - Failed to delete temp index " + this.indexLocation); //$NON-NLS-1$
> 	} else if (!newIndexFile.createNewFile()) {
> 		if (DEBUG)
>-			System.out.println("initializeFrom - Failed to create temp index " + this.indexFile); //$NON-NLS-1$
>-		throw new IOException("Failed to create temp index " + this.indexFile); //$NON-NLS-1$
>+			System.out.println("initializeFrom - Failed to create temp index " + this.indexLocation); //$NON-NLS-1$
>+		throw new IOException("Failed to create temp index " + this.indexLocation); //$NON-NLS-1$
> 	}
> 
> 	int size = diskIndex.categoryOffsets == null ? 8 : diskIndex.categoryOffsets.elementSize;
>@@ -500,6 +505,9 @@
> DiskIndex mergeWith(MemoryIndex memoryIndex) throws IOException {
>  	// assume write lock is held
> 	// compute & write out new docNames
>+	if (this.indexLocation == null) {
>+		throw new IOException("Pre-built index file not writeable");  //$NON-NLS-1$
>+	}
> 	String[] docNames = readAllDocumentNames();
> 	int previousLength = docNames.length;
> 	int[] positions = new int[previousLength]; // keeps track of the position of each document in the new sorted docNames
>@@ -509,15 +517,16 @@
> 		if (previousLength == 0) return this; // nothing to do... memory index contained deleted documents that had never been saved
> 
> 		// index is now empty since all the saved documents were removed
>-		DiskIndex newDiskIndex = new DiskIndex(this.indexFile.getPath());
>+		DiskIndex newDiskIndex = new DiskIndex(this.indexLocation);
> 		newDiskIndex.initialize(false);
> 		return newDiskIndex;
> 	}
>-
>-	DiskIndex newDiskIndex = new DiskIndex(this.indexFile.getPath() + ".tmp"); //$NON-NLS-1$
>+	File oldIndexFile = this.indexLocation.getIndexFile();
>+	DiskIndex newDiskIndex = new DiskIndex(new FileIndexLocation(new File(oldIndexFile.getPath() + ".tmp"))); //$NON-NLS-1$
>+	File newIndexFile = newDiskIndex.indexLocation.getIndexFile();
> 	try {
>-		newDiskIndex.initializeFrom(this, newDiskIndex.indexFile);
>-		FileOutputStream stream = new FileOutputStream(newDiskIndex.indexFile, false);
>+		newDiskIndex.initializeFrom(this, newIndexFile);
>+		FileOutputStream stream = new FileOutputStream(newIndexFile, false);
> 		int offsetToHeader = -1;
> 		try {
> 			newDiskIndex.writeAllDocumentNames(docNames, stream);
>@@ -549,31 +558,31 @@
> 		newDiskIndex.writeOffsetToHeader(offsetToHeader);
> 
> 		// rename file by deleting previous index file & renaming temp one
>-		if (this.indexFile.exists() && !this.indexFile.delete()) {
>+		if (oldIndexFile.exists() && !oldIndexFile.delete()) {
> 			if (DEBUG)
>-				System.out.println("mergeWith - Failed to delete " + this.indexFile); //$NON-NLS-1$
>-			throw new IOException("Failed to delete index file " + this.indexFile); //$NON-NLS-1$
>+				System.out.println("mergeWith - Failed to delete " + this.indexLocation); //$NON-NLS-1$
>+			throw new IOException("Failed to delete index file " + this.indexLocation); //$NON-NLS-1$
> 		}
>-		if (!newDiskIndex.indexFile.renameTo(this.indexFile)) {
>+		if (!newIndexFile.renameTo(oldIndexFile)) {
> 			if (DEBUG)
>-				System.out.println("mergeWith - Failed to rename " + this.indexFile); //$NON-NLS-1$
>-			throw new IOException("Failed to rename index file " + this.indexFile); //$NON-NLS-1$
>+				System.out.println("mergeWith - Failed to rename " + this.indexLocation); //$NON-NLS-1$
>+			throw new IOException("Failed to rename index file " + this.indexLocation); //$NON-NLS-1$
> 		}
> 	} catch (IOException e) {
>-		if (newDiskIndex.indexFile.exists() && !newDiskIndex.indexFile.delete())
>+		if (newIndexFile.exists() && !newIndexFile.delete())
> 			if (DEBUG)
>-				System.out.println("mergeWith - Failed to delete temp index " + newDiskIndex.indexFile); //$NON-NLS-1$
>+				System.out.println("mergeWith - Failed to delete temp index " + newDiskIndex.indexLocation); //$NON-NLS-1$
> 		throw e;
> 	}
> 
>-	newDiskIndex.indexFile = this.indexFile;
>+	newDiskIndex.indexLocation = this.indexLocation;
> 	return newDiskIndex;
> }
> private synchronized String[] readAllDocumentNames() throws IOException {
> 	if (this.numberOfChunks <= 0)
> 		return CharOperation.NO_STRINGS;
> 
>-	FileInputStream stream = new FileInputStream(this.indexFile);
>+	InputStream stream = this.indexLocation.getInputStream();
> 	try {
> 		int offset = this.chunkOffsets[0];
> 		stream.skip(offset);
>@@ -612,7 +621,7 @@
> 		}
> 	}
> 
>-	FileInputStream stream = new FileInputStream(this.indexFile);
>+	InputStream stream = this.indexLocation.getInputStream();
> 	HashtableOfObject categoryTable = null;
> 	char[][] matchingWords = null;
> 	int count = 0;
>@@ -626,7 +635,7 @@
> 		try {
> 			if (size < 0) { // DEBUG
> 				System.err.println("-------------------- DEBUG --------------------"); //$NON-NLS-1$
>-				System.err.println("file = "+this.indexFile); //$NON-NLS-1$
>+				System.err.println("file = "+this.indexLocation); //$NON-NLS-1$
> 				System.err.println("offset = "+offset); //$NON-NLS-1$
> 				System.err.println("size = "+size); //$NON-NLS-1$
> 				System.err.println("--------------------   END   --------------------"); //$NON-NLS-1$
>@@ -636,7 +645,7 @@
> 			// DEBUG
> 			oom.printStackTrace();
> 			System.err.println("-------------------- DEBUG --------------------"); //$NON-NLS-1$
>-			System.err.println("file = "+this.indexFile); //$NON-NLS-1$
>+			System.err.println("file = "+this.indexLocation); //$NON-NLS-1$
> 			System.err.println("offset = "+offset); //$NON-NLS-1$
> 			System.err.println("size = "+size); //$NON-NLS-1$
> 			System.err.println("--------------------   END   --------------------"); //$NON-NLS-1$
>@@ -678,7 +687,7 @@
> 	}
> 
> 	if (matchingWords != null && count > 0) {
>-		stream = new FileInputStream(this.indexFile);
>+		stream = this.indexLocation.getInputStream();
> 		try {
> 			stream.skip(firstOffset);
> 			this.bufferIndex = 0;
>@@ -696,7 +705,7 @@
> 	this.streamBuffer = null;
> 	return categoryTable;
> }
>-private void readChunk(String[] docNames, FileInputStream stream, int index, int size) throws IOException {
>+private void readChunk(String[] docNames, InputStream stream, int index, int size) throws IOException {
> 	String current = new String(readStreamChars(stream));
> 	docNames[index++] = current;
> 	for (int i = 1; i < size; i++) {
>@@ -734,7 +743,7 @@
> 			throw new IllegalArgumentException();
> 		this.streamBuffer = new byte[numberOfBytes];
> 		this.bufferIndex = 0;
>-		FileInputStream file = new FileInputStream(this.indexFile);
>+		InputStream file = this.indexLocation.getInputStream();
> 		try {
> 			file.skip(start);
> 			if (file.read(this.streamBuffer, 0, numberOfBytes) != numberOfBytes)
>@@ -763,7 +772,7 @@
> 	if (arrayOffset instanceof int[])
> 		return (int[]) arrayOffset;
> 
>-	FileInputStream stream = new FileInputStream(this.indexFile);
>+	InputStream stream = this.indexLocation.getInputStream();
> 	try {
> 		int offset = ((Integer) arrayOffset).intValue();
> 		stream.skip(offset);
>@@ -776,19 +785,19 @@
> 		this.streamBuffer = null;
> 	}
> }
>-private void readHeaderInfo(FileInputStream stream) throws IOException {
>+private void readHeaderInfo(InputStream stream) throws IOException {
> 
> 	// must be same order as writeHeaderInfo()
> 	this.numberOfChunks = readStreamInt(stream);
> 	this.sizeOfLastChunk = this.streamBuffer[this.bufferIndex++] & 0xFF;
> 	this.documentReferenceSize = this.streamBuffer[this.bufferIndex++] & 0xFF;
> 	this.separator = (char) (this.streamBuffer[this.bufferIndex++] & 0xFF);
>-	long fileLength = this.indexFile.length();
>-	if (this.numberOfChunks > fileLength ) {
>+	long length = this.indexLocation.length();
>+	if (length != -1 && this.numberOfChunks > length) {
> 		// not an accurate check, but good enough https://bugs.eclipse.org/bugs/show_bug.cgi?id=350612
> 		if (DEBUG)
>-			System.out.println("Index file is corrupted " + this.indexFile); //$NON-NLS-1$
>-		throw new IOException("Index file is corrupted " + this.indexFile); //$NON-NLS-1$
>+			System.out.println("Index file is corrupted " + this.indexLocation); //$NON-NLS-1$
>+		throw new IOException("Index file is corrupted " + this.indexLocation); //$NON-NLS-1$
> 	}
> 	this.chunkOffsets = new int[this.numberOfChunks];
> 	for (int i = 0; i < this.numberOfChunks; i++)
>@@ -799,11 +808,11 @@
> 	int size = readStreamInt(stream);
> 	this.categoryOffsets = new HashtableOfIntValues(size);
> 	this.categoryEnds = new HashtableOfIntValues(size);
>-	if (size > fileLength) {
>+	if (length != -1 && size > length) {
> 		//  not an accurate check, but good enough  https://bugs.eclipse.org/bugs/show_bug.cgi?id=350612
> 		if (DEBUG)
>-			System.out.println("Index file is corrupted " + this.indexFile); //$NON-NLS-1$
>-		throw new IOException("Index file is corrupted " + this.indexFile); //$NON-NLS-1$
>+			System.out.println("Index file is corrupted " + this.indexLocation); //$NON-NLS-1$
>+		throw new IOException("Index file is corrupted " + this.indexLocation); //$NON-NLS-1$
> 	}
> 	char[] previousCategory = null;
> 	int offset = -1;
>@@ -840,11 +849,13 @@
> 		}
> 	}
> }
>-private void readStreamBuffer(FileInputStream stream) throws IOException {
>+private void readStreamBuffer(InputStream stream) throws IOException {
> 	// if we're about to read a known amount at the end of the existing buffer, but it does not completely fit
> 	// so we need to shift the remaining bytes to be read, and fill the buffer from the stream
>-	if (this.bufferEnd < this.streamBuffer.length)
>-		return; // we're at the end of the stream - nothing left to read
>+	if (this.bufferEnd < this.streamBuffer.length) {
>+		if (stream.available() == 0)
>+			return; // we're at the end of the stream - nothing left to read
>+	}
> 
> 	int bytesInBuffer = this.bufferEnd - this.bufferIndex;
> 	if (bytesInBuffer > 0)
>@@ -872,7 +883,7 @@
>  * @exception  UTFDataFormatException  if the bytes do not represent a
>  *               valid UTF-8 encoding of a Unicode string.
>  */
>-private char[] readStreamChars(FileInputStream stream) throws IOException {
>+private char[] readStreamChars(InputStream stream) throws IOException {
> 	// read chars array length
> 	if (stream != null && this.bufferIndex + 2 >= this.bufferEnd)
> 		readStreamBuffer(stream);
>@@ -886,7 +897,7 @@
> 		// how many characters can be decoded without refilling the buffer?
> 		int charsInBuffer = i + ((this.bufferEnd - this.bufferIndex) / 3);
> 		// all the characters must already be in the buffer if we're at the end of the stream
>-		if (charsInBuffer > length || this.bufferEnd != this.streamBuffer.length || stream == null)
>+		if (charsInBuffer > length || stream == null  || (this.bufferEnd != this.streamBuffer.length && stream.available() == 0))
> 			charsInBuffer = length;
> 		while (i < charsInBuffer) {
> 			byte b = this.streamBuffer[this.bufferIndex++];
>@@ -931,7 +942,7 @@
> 	}
> 	return word;
> }
>-private int[] readStreamDocumentArray(FileInputStream stream, int arraySize) throws IOException {
>+private int[] readStreamDocumentArray(InputStream stream, int arraySize) throws IOException {
> 	int[] indexes = new int[arraySize];
> 	if (arraySize == 0) return indexes;
> 
>@@ -972,7 +983,7 @@
> 	}
> 	return indexes;
> }
>-private int readStreamInt(FileInputStream stream) throws IOException {
>+private int readStreamInt(InputStream stream) throws IOException {
> 	if (this.bufferIndex + 4 >= this.bufferEnd) {
> 		readStreamBuffer(stream);
> 	}
>@@ -1182,7 +1193,7 @@
> }
> private void writeOffsetToHeader(int offsetToHeader) throws IOException {
> 	if (offsetToHeader > 0) {
>-		RandomAccessFile file = new RandomAccessFile(this.indexFile, "rw"); //$NON-NLS-1$
>+		RandomAccessFile file = new RandomAccessFile(this.indexLocation.getIndexFile(), "rw"); //$NON-NLS-1$
> 		try {
> 			file.seek(this.headerInfoOffset); // offset to position in header
> 			file.writeInt(offsetToHeader);
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/FileIndexLocation.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/FileIndexLocation.java
>new file mode 100644
>index 0000000..67fc9ae
>--- /dev/null
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/FileIndexLocation.java
>@@ -0,0 +1,98 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.internal.core.index;
>+
>+import java.io.File;
>+import java.io.FileInputStream;
>+import java.io.IOException;
>+import java.io.InputStream;
>+import java.net.URL;
>+
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.Path;
>+
>+public class FileIndexLocation extends IndexLocation {
>+	File indexFile;
>+
>+	public FileIndexLocation(File file) {
>+		super(file);
>+		this.indexFile = file;
>+	}
>+
>+	public FileIndexLocation(URL url, File file) {
>+		super(url);
>+		this.indexFile = file;
>+	}
>+
>+	public FileIndexLocation(File file, boolean participantIndex) {
>+		this(file);
>+		this.participantIndex = true;
>+	}
>+
>+	public boolean createNewFile() throws IOException {
>+		return this.indexFile.createNewFile();
>+	}
>+
>+	public boolean delete() {
>+		return this.indexFile.delete();
>+	}
>+
>+	public boolean equals(Object other) {
>+		if (!(other instanceof FileIndexLocation)) return false;
>+		return this.indexFile.equals(((FileIndexLocation) other).indexFile);
>+	}
>+
>+	public boolean exists() {
>+		return this.indexFile.exists();
>+	}
>+
>+	public String fileName() {
>+		return this.indexFile.getName();
>+	}
>+	
>+	public File getIndexFile() {
>+		return this.indexFile;
>+	}
>+
>+	InputStream getInputStream() throws IOException {
>+		return new FileInputStream(this.indexFile);
>+	}
>+
>+	public String getCanonicalFilePath() {
>+		try {
>+			return this.indexFile.getCanonicalPath();
>+		} catch (IOException e) {
>+			// ignore
>+		}
>+		return null;
>+	}
>+
>+	public int hashCode() {
>+		return this.indexFile.hashCode();
>+	}
>+
>+	public long lastModified() {
>+		return this.indexFile.lastModified();
>+	}
>+
>+	public long length() {
>+		return this.indexFile.length();
>+	}
>+
>+	public boolean startsWith(IPath path) {
>+		try {
>+			return path.isPrefixOf(new Path(this.indexFile.getCanonicalPath()));
>+		} catch (IOException e) {
>+			return false;
>+		}
>+	}
>+
>+}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/Index.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/Index.java
>index 3d32607..8caa73c 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/Index.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/Index.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -88,12 +88,12 @@
> }
> 
> 
>-public Index(String fileName, String containerPath, boolean reuseExistingFile) throws IOException {
>+public Index(IndexLocation location, String containerPath, boolean reuseExistingFile) throws IOException {
> 	this.containerPath = containerPath;
> 	this.monitor = new ReadWriteMonitor();
> 
> 	this.memoryIndex = new MemoryIndex();
>-	this.diskIndex = new DiskIndex(fileName);
>+	this.diskIndex = new DiskIndex(location);
> 	this.diskIndex.initialize(reuseExistingFile);
> 	if (reuseExistingFile) this.separator = this.diskIndex.separator;
> }
>@@ -110,7 +110,13 @@
> 	return documentPath.substring(index + 1);
> }
> public File getIndexFile() {
>-	return this.diskIndex == null ? null : this.diskIndex.indexFile;
>+	return this.diskIndex == null ? null : this.diskIndex.indexLocation.getIndexFile();
>+}
>+public IndexLocation getIndexLocation() {
>+	return this.diskIndex == null ? null : this.diskIndex.indexLocation;
>+}
>+public long getIndexLastModified() {
>+	return this.diskIndex == null? -1 : this.diskIndex.indexLocation.lastModified();
> }
> public boolean hasChanged() {
> 	return this.memoryIndex.hasChanged();
>@@ -180,7 +186,7 @@
>  */
> public void reset() throws IOException {
> 	this.memoryIndex = new MemoryIndex();
>-	this.diskIndex = new DiskIndex(this.diskIndex.indexFile.getCanonicalPath());
>+	this.diskIndex = new DiskIndex(this.diskIndex.indexLocation);
> 	this.diskIndex.initialize(false/*do not reuse the index file*/);
> }
> public void save() throws IOException {
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/IndexLocation.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/IndexLocation.java
>new file mode 100644
>index 0000000..d410f72
>--- /dev/null
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/IndexLocation.java
>@@ -0,0 +1,124 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.internal.core.index;
>+
>+import java.io.File;
>+import java.io.IOException;
>+import java.io.InputStream;
>+
>+import java.net.MalformedURLException;
>+import java.net.URL;
>+
>+import org.eclipse.core.runtime.FileLocator;
>+import org.eclipse.core.runtime.IPath;
>+
>+/**
>+ * The location of the index files are represented as {@link IndexLocation}
>+ * 
>+ * This is an abstract class to allow different implementation for a jar entry and a file
>+ * on the disk. Some of these functions could mean different for a jar entry or a file
>+ * 
>+ */
>+public abstract class IndexLocation {
>+	
>+	public static IndexLocation createIndexLocation(URL url) {
>+		URL localUrl;
>+		try {
>+			localUrl = FileLocator.resolve(url);
>+		} catch (IOException e) {
>+			return null;
>+		}
>+		if (localUrl.getProtocol().equals("file")) { //$NON-NLS-1$
>+			return new FileIndexLocation(url, new File(localUrl.getPath()));
>+		}
>+		return new JarIndexLocation(url, localUrl);
>+	}
>+	
>+	private final URL url; // url of the given index location
>+
>+	/**
>+	 * Set to true if this index location is of an index file specified
>+	 * by a participant through 
>+	 * {@link org.eclipse.jdt.core.search.SearchParticipant#scheduleDocumentIndexing}
>+	 */
>+	protected boolean participantIndex;
>+	
>+	protected IndexLocation(File file) {
>+		URL tempUrl = null;
>+		try {
>+			tempUrl = file.toURI().toURL();
>+		} catch (MalformedURLException e) {
>+			// should not happen
>+		}
>+		this.url = tempUrl;
>+	}
>+	
>+	public IndexLocation(URL url) {
>+		this.url = url;
>+	}
>+
>+	/**
>+	 * Closes any open streams.
>+	 */
>+	public void close() {
>+		// default nothing to do
>+	}
>+
>+	/**
>+	 * Creates a new file for the given index location
>+	 * @return true if the file is created
>+	 * @throws IOException
>+	 */
>+	public abstract boolean createNewFile() throws IOException;
>+
>+	public abstract boolean delete();
>+
>+	public abstract boolean exists();
>+	
>+	public abstract String fileName();
>+
>+	/**
>+	 * @return the canonical file path if the location is a file or null otherwise
>+	 */
>+	public abstract String getCanonicalFilePath();
>+
>+	public abstract File getIndexFile();
>+
>+	abstract InputStream getInputStream() throws IOException;
>+
>+	public URL getUrl() {
>+		return this.url;
>+	}
>+
>+	public int hashCode() {
>+		return this.url.hashCode();
>+	}
>+
>+	public boolean isParticipantIndex() {
>+		return this.participantIndex;
>+	}
>+
>+	/**
>+	 * @return the last modified time if the location is a file or -1 otherwise
>+	 */
>+	public abstract long lastModified();
>+
>+	/**
>+	 * @return the length of the file if the location is a file or -1 otherwise
>+	 */
>+	public abstract long length();
>+
>+	public abstract boolean startsWith(IPath path);
>+
>+	public String toString() {
>+		return this.url.toString();
>+	}
>+}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/JarIndexLocation.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/JarIndexLocation.java
>new file mode 100644
>index 0000000..a93a264
>--- /dev/null
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/JarIndexLocation.java
>@@ -0,0 +1,108 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.internal.core.index;
>+
>+import java.io.File;
>+import java.io.IOException;
>+import java.io.InputStream;
>+import java.net.JarURLConnection;
>+import java.net.URL;
>+import java.util.jar.JarEntry;
>+import java.util.jar.JarFile;
>+
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.Path;
>+
>+public class JarIndexLocation extends IndexLocation {
>+	private JarFile jarFile = null;
>+	private JarEntry jarEntry = null;
>+	private URL localUrl;
>+
>+	public JarIndexLocation(URL url, URL localUrl2) {
>+		super(url);
>+		this.localUrl = localUrl2;
>+	}
>+
>+	public boolean createNewFile() throws IOException {
>+		return false;
>+	}
>+
>+	public void close() {
>+		if (this.jarFile != null) {
>+			try {
>+				this.jarFile.close();
>+			} catch (IOException e) {
>+				// ignore
>+			}
>+			this.jarFile = null;
>+		}
>+	}
>+
>+	public boolean delete() {
>+		return false;
>+	}
>+
>+	public boolean equals(Object other) {
>+		if (!(other instanceof JarIndexLocation)) return false;
>+		return this.localUrl.equals(((JarIndexLocation) other).localUrl);
>+	}
>+
>+	public boolean exists() {
>+		try {
>+			if (this.jarFile == null) {
>+				JarURLConnection connection = (JarURLConnection) this.localUrl.openConnection();
>+				JarFile file = connection.getJarFile();
>+				if (file == null)
>+					return false;
>+				file.close();
>+			}
>+		} catch (IOException e) {
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+	public String fileName() {
>+		return null;
>+	}
>+
>+	public File getIndexFile() {
>+		return null;
>+	}
>+
>+	InputStream getInputStream() throws IOException {
>+		if (this.jarFile == null) {
>+			JarURLConnection connection = (JarURLConnection) this.localUrl.openConnection();
>+			this.jarFile = connection.getJarFile();
>+			this.jarEntry = connection.getJarEntry();
>+		}
>+		if (this.jarFile == null || this.jarEntry == null)
>+			return null;
>+		return this.jarFile.getInputStream(this.jarEntry);
>+	}
>+
>+	public String getCanonicalFilePath() {
>+		return null;
>+	}
>+
>+	public long lastModified() {
>+		return -1;
>+	}
>+
>+	public long length() {
>+		return -1;
>+	}
>+
>+	public boolean startsWith(IPath path) {
>+		return (path.isPrefixOf(new Path(this.localUrl.getPath())));
>+	}
>+
>+}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/IndexSelector.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/IndexSelector.java
>index 4e584f2..20990c9 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/IndexSelector.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/IndexSelector.java
>@@ -27,6 +27,7 @@
> import org.eclipse.jdt.internal.core.JavaProject;
> import org.eclipse.jdt.internal.core.builder.ReferenceCollection;
> import org.eclipse.jdt.internal.core.builder.State;
>+import org.eclipse.jdt.internal.core.index.IndexLocation;
> import org.eclipse.jdt.internal.core.search.indexing.IndexManager;
> import org.eclipse.jdt.internal.core.search.matching.MatchLocator;
> import org.eclipse.jdt.internal.core.search.matching.MethodPattern;
>@@ -38,7 +39,7 @@
> public class IndexSelector {
> 	IJavaSearchScope searchScope;
> 	SearchPattern pattern;
>-	IPath[] indexLocations; // cache of the keys for looking index up
>+	IndexLocation[] indexLocations; // cache of the keys for looking index up
> 
> public IndexSelector(
> 		IJavaSearchScope searchScope,
>@@ -267,10 +268,10 @@
> 	}
> 
> 	locations.remove(null); // Ensure no nulls
>-	this.indexLocations = (IPath[]) locations.toArray(new IPath[locations.size()]);
>+	this.indexLocations = (IndexLocation[]) locations.toArray(new IndexLocation[locations.size()]);
> }
> 
>-public IPath[] getIndexLocations() {
>+public IndexLocation[] getIndexLocations() {
> 	if (this.indexLocations == null) {
> 		initializeIndexLocations();
> 	}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/JavaSearchParticipant.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/JavaSearchParticipant.java
>index 13d6820..cf970b3 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/JavaSearchParticipant.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/JavaSearchParticipant.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -12,6 +12,7 @@
> 
> import org.eclipse.core.runtime.*;
> import org.eclipse.jdt.core.search.*;
>+import org.eclipse.jdt.internal.core.index.IndexLocation;
> import org.eclipse.jdt.internal.core.search.indexing.BinaryIndexer;
> import org.eclipse.jdt.internal.core.search.indexing.SourceIndexer;
> import org.eclipse.jdt.internal.core.search.matching.MatchLocator;
>@@ -98,7 +99,20 @@
> 	 * @see org.eclipse.jdt.core.search.SearchParticipant#selectIndexes(org.eclipse.jdt.core.search.SearchQuery, org.eclipse.jdt.core.search.SearchContext)
> 	 */
> 	public IPath[] selectIndexes(SearchPattern pattern, IJavaSearchScope scope) {
>+		IndexSelector selector = (IndexSelector) this.indexSelector.get();
>+		if (selector == null) {
>+			selector = new IndexSelector(scope, pattern);
>+			this.indexSelector.set(selector);
>+		}
>+		IndexLocation[] urls = selector.getIndexLocations();
>+		IPath[] paths = new IPath[urls.length];
>+		for (int i = 0; i < urls.length; i++) {
>+			paths[i] = new Path(urls[i].getIndexFile().getPath());
>+		}
>+		return paths;
>+	}
> 
>+	public IndexLocation[] selectIndexURLs(SearchPattern pattern, IJavaSearchScope scope) {
> 		IndexSelector selector = (IndexSelector) this.indexSelector.get();
> 		if (selector == null) {
> 			selector = new IndexSelector(scope, pattern);
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PatternSearchJob.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PatternSearchJob.java
>index 459730c..c83c2f1 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PatternSearchJob.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PatternSearchJob.java
>@@ -17,7 +17,9 @@
> import org.eclipse.core.runtime.OperationCanceledException;
> import org.eclipse.jdt.core.search.*;
> import org.eclipse.jdt.internal.core.JavaModelManager;
>+import org.eclipse.jdt.internal.core.index.FileIndexLocation;
> import org.eclipse.jdt.internal.core.index.Index;
>+import org.eclipse.jdt.internal.core.index.IndexLocation;
> import org.eclipse.jdt.internal.core.search.indexing.ReadWriteMonitor;
> import org.eclipse.jdt.internal.core.search.matching.MatchLocator;
> import org.eclipse.jdt.internal.core.search.processing.IJob;
>@@ -76,8 +78,19 @@
> }
> public Index[] getIndexes(IProgressMonitor progressMonitor) {
> 	// acquire the in-memory indexes on the fly
>-	IPath[] indexLocations = this.participant.selectIndexes(this.pattern, this.scope);
>-	int length = indexLocations.length;
>+	IndexLocation[] indexLocations;
>+	int length;
>+	if (this.participant instanceof JavaSearchParticipant) {
>+		indexLocations = ((JavaSearchParticipant)this.participant).selectIndexURLs(this.pattern, this.scope);
>+		length = indexLocations.length;
>+	} else {
>+		IPath[] paths = this.participant.selectIndexes(this.pattern, this.scope);
>+		length = paths.length;
>+		indexLocations = new IndexLocation[paths.length];
>+		for (int i = 0, len = paths.length; i < len; i++) {
>+			indexLocations[i] = new FileIndexLocation(paths[i].toFile(), true);
>+		}
>+	}
> 	Index[] indexes = JavaModelManager.getIndexManager().getIndexes(indexLocations, progressMonitor);
> 	this.areIndexesReady = indexes.length == length;
> 	return indexes;
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddJarFileToIndex.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddJarFileToIndex.java
>index 168904f..812c462 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddJarFileToIndex.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddJarFileToIndex.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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,6 +34,7 @@
> import org.eclipse.jdt.internal.compiler.util.Util;
> import org.eclipse.jdt.internal.core.JavaModelManager;
> import org.eclipse.jdt.internal.core.index.Index;
>+import org.eclipse.jdt.internal.core.index.IndexLocation;
> import org.eclipse.jdt.internal.core.search.JavaSearchDocument;
> import org.eclipse.jdt.internal.core.search.processing.JobManager;
> 
>@@ -42,14 +43,17 @@
> 	private static final char JAR_SEPARATOR = IJavaSearchScope.JAR_FILE_ENTRY_SEPARATOR.charAt(0);
> 	IFile resource;
> 	Scanner scanner;
>+	private IndexLocation indexFileURL;
> 
>-	public AddJarFileToIndex(IFile resource, IndexManager manager) {
>+	public AddJarFileToIndex(IFile resource, IndexLocation indexFile, IndexManager manager) {
> 		super(resource.getFullPath(), manager);
> 		this.resource = resource;
>+		this.indexFileURL = indexFile;
> 	}
>-	public AddJarFileToIndex(IPath jarPath, IndexManager manager) {
>+	public AddJarFileToIndex(IPath jarPath, IndexLocation indexFile, IndexManager manager) {
> 		// external JAR scenario - no resource
> 		super(jarPath, manager);
>+		this.indexFileURL = indexFile;
> 	}
> 	public boolean equals(Object o) {
> 		if (o instanceof AddJarFileToIndex) {
>@@ -70,6 +74,12 @@
> 	public boolean execute(IProgressMonitor progressMonitor) {
> 
> 		if (this.isCancelled || progressMonitor != null && progressMonitor.isCanceled()) return true;
>+
>+		if (this.indexFileURL != null) {
>+			boolean added = this.manager.addIndex(this.containerPath, this.indexFileURL);
>+			if (added) return true;	
>+			this.indexFileURL = null;
>+		}
> 
> 		try {
> 			// if index is already cached, then do not perform any check
>@@ -192,7 +202,11 @@
> 					return false;
> 				}
> 				index.separator = JAR_SEPARATOR;
>-
>+				IPath indexPath = null;
>+				IndexLocation indexLocation;
>+				if ((indexLocation = index.getIndexLocation()) != null) {
>+					indexPath = new Path(indexLocation.getCanonicalFilePath());
>+				}
> 				for (Enumeration e = zip.entries(); e.hasMoreElements();) {
> 					if (this.isCancelled) {
> 						if (JobManager.VERBOSE)
>@@ -208,7 +222,7 @@
> 						// index only classes coming from valid packages - https://bugs.eclipse.org/bugs/show_bug.cgi?id=293861
> 						final byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(ze, zip);
> 						JavaSearchDocument entryDocument = new JavaSearchDocument(ze, zipFilePath, classFileBytes, participant);
>-						this.manager.indexDocument(entryDocument, participant, index, this.containerPath);
>+						this.manager.indexDocument(entryDocument, participant, index, indexPath);
> 					}
> 				}
> 				this.manager.saveIndex(index);
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java
>index c242fb5..f752c34 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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,6 +46,9 @@
> 		super(document);
> 	}
> 	private void addBinaryStandardAnnotations(long annotationTagBits) {
>+		if ((annotationTagBits & TagBits.AllStandardAnnotationsMask) == 0) {
>+			return;
>+		}
> 		if ((annotationTagBits & TagBits.AnnotationTargetMASK) != 0) {
> 			char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_TARGET;
> 			addAnnotationTypeReference(compoundName[compoundName.length-1]);
>@@ -83,14 +86,6 @@
> 		if ((annotationTagBits & TagBits.AnnotationPolymorphicSignature) != 0) {
> 			char[][] compoundName =
> 					TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_$_POLYMORPHICSIGNATURE;
>-			addAnnotationTypeReference(compoundName[compoundName.length-1]);
>-		}
>-		if ((annotationTagBits & TagBits.AnnotationPostConstruct) != 0) {
>-			char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT;
>-			addAnnotationTypeReference(compoundName[compoundName.length-1]);
>-		}
>-		if ((annotationTagBits & TagBits.AnnotationPreDestroy) != 0) {
>-			char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_PREDESTROY;
> 			addAnnotationTypeReference(compoundName[compoundName.length-1]);
> 		}
> 	}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/DefaultJavaIndexer.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/DefaultJavaIndexer.java
>new file mode 100644
>index 0000000..a548c45
>--- /dev/null
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/DefaultJavaIndexer.java
>@@ -0,0 +1,61 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.internal.core.search.indexing;
>+
>+import java.io.File;
>+import java.io.FileNotFoundException;
>+import java.io.IOException;
>+import java.util.Enumeration;
>+import java.util.zip.ZipEntry;
>+import java.util.zip.ZipFile;
>+
>+import org.eclipse.core.runtime.Path;
>+import org.eclipse.jdt.core.search.IJavaSearchScope;
>+import org.eclipse.jdt.core.search.SearchEngine;
>+import org.eclipse.jdt.core.search.SearchParticipant;
>+import org.eclipse.jdt.internal.compiler.util.Util;
>+import org.eclipse.jdt.internal.core.index.FileIndexLocation;
>+import org.eclipse.jdt.internal.core.index.Index;
>+import org.eclipse.jdt.internal.core.index.IndexLocation;
>+import org.eclipse.jdt.internal.core.search.JavaSearchDocument;
>+
>+public class DefaultJavaIndexer {
>+	private static final char JAR_SEPARATOR = IJavaSearchScope.JAR_FILE_ENTRY_SEPARATOR.charAt(0);
>+	
>+	public void generateIndexForJar(String pathToJar, String pathToIndexFile) throws IOException {
>+		File f = new File(pathToJar);
>+		if (!f.exists()) {
>+			throw new FileNotFoundException(pathToJar + " not found"); //$NON-NLS-1$
>+		}
>+		IndexLocation indexLocation = new FileIndexLocation(new File(pathToIndexFile));
>+		Index index = new Index(indexLocation, pathToJar, false /*reuse index file*/);
>+		SearchParticipant participant = SearchEngine.getDefaultSearchParticipant();
>+		index.separator = JAR_SEPARATOR;
>+		ZipFile zip = new ZipFile(pathToJar);
>+		try {
>+			for (Enumeration e = zip.entries(); e.hasMoreElements();) {
>+				// iterate each entry to index it
>+				ZipEntry ze = (ZipEntry) e.nextElement();
>+				String zipEntryName = ze.getName();
>+				if (Util.isClassFileName(zipEntryName)) {
>+					final byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getZipEntryByteContent(ze, zip);
>+					JavaSearchDocument entryDocument = new JavaSearchDocument(ze, new Path(pathToJar), classFileBytes, participant);
>+					entryDocument.setIndex(index);
>+					new BinaryIndexer(entryDocument).indexDocument();
>+				}
>+			}
>+			index.save();
>+		} finally {
>+			zip.close();
>+		}
>+		return;
>+	}
>+}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexAllProject.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexAllProject.java
>index 4313621..96aa904 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexAllProject.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexAllProject.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -77,7 +77,7 @@
> 					if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY && entry.getPath().equals(projectPath)) {
> 						// the project is also a library folder (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=89815)
> 						// ensure a job exists to index it as a binary folder
>-						this.manager.indexLibrary(projectPath, this.project);
>+						this.manager.indexLibrary(projectPath, this.project, ((ClasspathEntry)entry).getLibraryIndexLocation());
> 						return true;
> 					}
> 				}
>@@ -107,7 +107,7 @@
> 				for (int i = 0; i < max; i++)
> 					indexedFileNames.put(paths[i], DELETED);
> 			}
>-			final long indexLastModified = max == 0 ? 0L : index.getIndexFile().lastModified();
>+			final long indexLastModified = max == 0 ? 0L : index.getIndexLastModified();
> 
> 			IWorkspaceRoot root = this.project.getWorkspace().getRoot();
> 			for (int i = 0; i < sourceEntriesNumber; i++) {
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexBinaryFolder.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexBinaryFolder.java
>index 7bb90f9..b06e0df 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexBinaryFolder.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexBinaryFolder.java
>@@ -80,7 +80,7 @@
> 				for (int i = 0; i < max; i++) {
> 					indexedFileNames.put(paths[i], DELETED);
> 				}
>-				final long indexLastModified = index.getIndexFile().lastModified();
>+				final long indexLastModified = index.getIndexLastModified();
> 				this.folder.accept(
> 					new IResourceProxyVisitor() {
> 						public boolean visit(IResourceProxy proxy) throws CoreException {
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexManager.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexManager.java
>index f08c249..d130e0f 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexManager.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexManager.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -11,6 +11,7 @@
> package org.eclipse.jdt.internal.core.search.indexing;
> 
> import java.io.*;
>+import java.net.URL;
> import java.util.*;
> import java.util.zip.CRC32;
> 
>@@ -52,6 +53,7 @@
> 	/* can only replace a current state if its less than the new one */
> 	// key = indexLocation path, value = index state integer
> 	private SimpleLookupTable indexStates = null;
>+	private File indexNamesMapFile = new File(getSavedIndexesDirectory(), "indexNamesMap.txt"); //$NON-NLS-1$
> 	private File savedIndexNamesFile = new File(getSavedIndexesDirectory(), "savedIndexNames.txt"); //$NON-NLS-1$
> 	private File participantIndexNamesFile = new File(getSavedIndexesDirectory(), "participantsIndexNames.txt"); //$NON-NLS-1$
> 	private boolean javaLikeNamesChanged = true;
>@@ -59,6 +61,7 @@
> 	public static final Integer UPDATING_STATE = new Integer(1);
> 	public static final Integer UNKNOWN_STATE = new Integer(2);
> 	public static final Integer REBUILDING_STATE = new Integer(3);
>+	public static final Integer REUSE_STATE = new Integer(4);
> 	
> 	// search participants who register indexes with the index manager
> 	private SimpleLookupTable participantsContainers = null;
>@@ -70,10 +73,10 @@
> 	public synchronized void aboutToUpdateIndex(IPath containerPath, Integer newIndexState) {
> 	// newIndexState is either UPDATING_STATE or REBUILDING_STATE
> 	// must tag the index as inconsistent, in case we exit before the update job is started
>-	IPath indexLocation = computeIndexLocation(containerPath);
>+	IndexLocation indexLocation = computeIndexLocation(containerPath);
> 	Object state = getIndexStates().get(indexLocation);
> 	Integer currentIndexState = state == null ? UNKNOWN_STATE : (Integer) state;
>-	if (currentIndexState.equals(REBUILDING_STATE)) return; // already rebuilding the index
>+	if (currentIndexState.compareTo(REBUILDING_STATE) >= 0) return; // already rebuilding the index
> 
> 	int compare = newIndexState.compareTo(currentIndexState);
> 	if (compare > 0) {
>@@ -92,7 +95,7 @@
> 	if (JavaCore.getPlugin() == null) return;
> 	SearchParticipant participant = SearchEngine.getDefaultSearchParticipant();
> 	SearchDocument document = participant.getDocument(resource.getFullPath().toString());
>-	IPath indexLocation = computeIndexLocation(containerPath);
>+	IndexLocation indexLocation = computeIndexLocation(containerPath);
> 	scheduleDocumentIndexing(document, containerPath, indexLocation, participant);
> }
> /**
>@@ -104,7 +107,7 @@
> 	SearchParticipant participant = SearchEngine.getDefaultSearchParticipant();
> 	SearchDocument document = participant.getDocument(resource.getFullPath().toString());
> 	document.setParser(parser);
>-	IPath indexLocation = computeIndexLocation(containerPath);
>+	IndexLocation indexLocation = computeIndexLocation(containerPath);
> 	scheduleDocumentIndexing(document, containerPath, indexLocation, participant);
> }
> /*
>@@ -116,17 +119,17 @@
> 	PatternSearchJob job = new PatternSearchJob(null, SearchEngine.getDefaultSearchParticipant(), scope, null);
> 	Index[] selectedIndexes = job.getIndexes(null);
> 	for (int i = 0, l = selectedIndexes.length; i < l; i++) {
>-		String path = selectedIndexes[i].getIndexFile().getAbsolutePath();
>-		knownPaths.add(path);
>+		IndexLocation IndexLocation = selectedIndexes[i].getIndexLocation();
>+		knownPaths.add(IndexLocation);
> 	}
> 
> 	if (this.indexStates != null) {
> 		Object[] keys = this.indexStates.keyTable;
>-		IPath[] locations = new IPath[this.indexStates.elementSize];
>+		IndexLocation[] locations = new IndexLocation[this.indexStates.elementSize];
> 		int count = 0;
> 		for (int i = 0, l = keys.length; i < l; i++) {
>-			IPath key = (IPath) keys[i];
>-			if (key != null && !knownPaths.includes(key.toOSString()))
>+			IndexLocation key = (IndexLocation) keys[i];
>+			if (key != null && !knownPaths.includes(key))
> 				locations[count++] = key;
> 		}
> 		if (count > 0)
>@@ -134,8 +137,8 @@
> 	}
> 	deleteIndexFiles(knownPaths);
> }
>-public synchronized IPath computeIndexLocation(IPath containerPath) {
>-	IPath indexLocation = (IPath) this.indexLocations.get(containerPath);
>+public synchronized IndexLocation computeIndexLocation(IPath containerPath) {
>+	IndexLocation indexLocation = (IndexLocation) this.indexLocations.get(containerPath);
> 	if (indexLocation == null) {
> 		String pathString = containerPath.toOSString();
> 		CRC32 checksumCalculator = new CRC32();
>@@ -144,7 +147,7 @@
> 		if (VERBOSE)
> 			Util.verbose("-> index name for " + pathString + " is " + fileName); //$NON-NLS-1$ //$NON-NLS-2$
> 		// to share the indexLocation between the indexLocations and indexStates tables, get the key from the indexStates table
>-		indexLocation = (IPath) getIndexStates().getKey(getJavaPluginWorkingLocation().append(fileName));
>+		indexLocation = (IndexLocation) getIndexStates().getKey(new FileIndexLocation(new File(getSavedIndexesDirectory(), fileName)));
> 		this.indexLocations.put(containerPath, indexLocation);
> 	}
> 	return indexLocation;
>@@ -161,7 +164,7 @@
> 
> 	for (int i = 0, l = indexesFiles.length; i < l; i++) {
> 		String fileName = indexesFiles[i].getAbsolutePath();
>-		if (pathsToKeep != null && pathsToKeep.includes(fileName)) continue;
>+		if (pathsToKeep != null && pathsToKeep.includes(new FileIndexLocation(indexesFiles[i]))) continue;
> 		String suffix = ".index"; //$NON-NLS-1$
> 		if (fileName.regionMatches(true, fileName.length() - suffix.length(), suffix, 0, suffix.length())) {
> 			if (VERBOSE || DEBUG)
>@@ -173,7 +176,7 @@
> /*
>  * Creates an empty index at the given location, for the given container path, if none exist.
>  */
>-public synchronized void ensureIndexExists(IPath indexLocation, IPath containerPath) {
>+public synchronized void ensureIndexExists(IndexLocation indexLocation, IPath containerPath) {
> 	SimpleLookupTable states = getIndexStates();
> 	Object state = states.get(indexLocation);
> 	if (state == null) {
>@@ -207,7 +210,7 @@
>  * @param indexLocation The path of the index file
>  * @return The corresponding index or <code>null</code> if not found
>  */
>-public synchronized Index getIndex(IPath indexLocation) {
>+public synchronized Index getIndex(IndexLocation indexLocation) {
> 	return (Index) this.indexes.get(indexLocation); // is null if unknown, call if the containerPath must be computed
> }
> /**
>@@ -219,7 +222,7 @@
>  * Warning: Does not check whether index is consistent (not being used)
>  */
> public synchronized Index getIndex(IPath containerPath, boolean reuseExistingFile, boolean createIfMissing) {
>-	IPath indexLocation = computeIndexLocation(containerPath);
>+	IndexLocation indexLocation = computeIndexLocation(containerPath);
> 	return getIndex(containerPath, indexLocation, reuseExistingFile, createIfMissing);
> }
> /**
>@@ -230,7 +233,7 @@
>  *
>  * Warning: Does not check whether index is consistent (not being used)
>  */
>-public synchronized Index getIndex(IPath containerPath, IPath indexLocation, boolean reuseExistingFile, boolean createIfMissing) {
>+public synchronized Index getIndex(IPath containerPath, IndexLocation indexLocation, boolean reuseExistingFile, boolean createIfMissing) {
> 	// Path is already canonical per construction
> 	Index index = getIndex(indexLocation);
> 	if (index == null) {
>@@ -245,19 +248,17 @@
> 
> 		// index isn't cached, consider reusing an existing index file
> 		String containerPathString = containerPath.getDevice() == null ? containerPath.toString() : containerPath.toOSString();
>-		String indexLocationString = indexLocation.toOSString();
> 		if (reuseExistingFile) {
>-			File indexFile = new File(indexLocationString);
>-			if (indexFile.exists()) { // check before creating index so as to avoid creating a new empty index if file is missing
>+			if (indexLocation.exists()) { // check before creating index so as to avoid creating a new empty index if file is missing
> 				try {
>-					index = new Index(indexLocationString, containerPathString, true /*reuse index file*/);
>+					index = new Index(indexLocation, containerPathString, true /*reuse index file*/);
> 					this.indexes.put(indexLocation, index);
> 					return index;
> 				} catch (IOException e) {
> 					// failed to read the existing file or its no longer compatible
>-					if (currentIndexState != REBUILDING_STATE) { // rebuild index if existing file is corrupt, unless the index is already being rebuilt
>+					if (currentIndexState != REBUILDING_STATE && currentIndexState != REUSE_STATE) { // rebuild index if existing file is corrupt, unless the index is already being rebuilt
> 						if (VERBOSE)
>-							Util.verbose("-> cannot reuse existing index: "+indexLocationString+" path: "+containerPathString); //$NON-NLS-1$ //$NON-NLS-2$
>+							Util.verbose("-> cannot reuse existing index: "+indexLocation+" path: "+containerPathString); //$NON-NLS-1$ //$NON-NLS-2$
> 						rebuildIndex(indexLocation, containerPath);
> 						return null;
> 					}
>@@ -268,18 +269,27 @@
> 				rebuildIndex(indexLocation, containerPath);
> 				return null;
> 			}
>+			if (currentIndexState == REUSE_STATE) {
>+				// supposed to be in reuse state but error in the index file, so reindex.
>+				if (VERBOSE)
>+					Util.verbose("-> cannot reuse given index: "+indexLocation+" path: "+containerPathString); //$NON-NLS-1$ //$NON-NLS-2$
>+				this.indexLocations.put(containerPath, null);
>+				indexLocation = computeIndexLocation(containerPath);
>+				rebuildIndex(indexLocation, containerPath);
>+				return null;
>+			}
> 		}
> 		// index wasn't found on disk, consider creating an empty new one
> 		if (createIfMissing) {
> 			try {
> 				if (VERBOSE)
>-					Util.verbose("-> create empty index: "+indexLocationString+" path: "+containerPathString); //$NON-NLS-1$ //$NON-NLS-2$
>-				index = new Index(indexLocationString, containerPathString, false /*do not reuse index file*/);
>+					Util.verbose("-> create empty index: "+indexLocation+" path: "+containerPathString); //$NON-NLS-1$ //$NON-NLS-2$
>+				index = new Index(indexLocation, containerPathString, false /*do not reuse index file*/);
> 				this.indexes.put(indexLocation, index);
> 				return index;
> 			} catch (IOException e) {
> 				if (VERBOSE)
>-					Util.verbose("-> unable to create empty index: "+indexLocationString+" path: "+containerPathString); //$NON-NLS-1$ //$NON-NLS-2$
>+					Util.verbose("-> unable to create empty index: "+indexLocation+" path: "+containerPathString); //$NON-NLS-1$ //$NON-NLS-2$
> 				// The file could not be created. Possible reason: the project has been deleted.
> 				return null;
> 			}
>@@ -295,7 +305,7 @@
>  * @param locations The list of of the index files path
>  * @return The corresponding indexes list.
>  */
>-public Index[] getIndexes(IPath[] locations, IProgressMonitor progressMonitor) {
>+public Index[] getIndexes(IndexLocation[] locations, IProgressMonitor progressMonitor) {
> 	// acquire the in-memory indexes on the fly
> 	int length = locations.length;
> 	Index[] locatedIndexes = new Index[length];
>@@ -308,7 +318,7 @@
> 			throw new OperationCanceledException();
> 		}
> 		// may trigger some index recreation work
>-		IPath indexLocation = locations[i];
>+		IndexLocation indexLocation = locations[i];
> 		Index index = getIndex(indexLocation);
> 		if (index == null) {
> 			// only need containerPath if the index must be built
>@@ -330,18 +340,16 @@
> 					index = null;
> 				}
> 			} else {
>-				if (!getJavaPluginWorkingLocation().isPrefixOf(indexLocation)) { // the index belongs to non-jdt search participant
>-					if (indexLocation.toFile().exists()) { 
>-						try {
>-							IPath container = getParticipantsContainer(indexLocation);
>-							if (container != null) {
>-								index = new Index(indexLocation.toOSString(), container.toOSString(), true /*reuse index file*/);
>-								this.indexes.put(indexLocation, index);
>-							}
>-						} catch (IOException e) {
>-							// ignore
>+				if (indexLocation.isParticipantIndex() && indexLocation.exists()) { // the index belongs to non-jdt search participant
>+					try {
>+						IPath container = getParticipantsContainer(indexLocation);
>+						if (container != null) {
>+							index = new Index(indexLocation, container.toOSString(), true /*reuse index file*/);
>+							this.indexes.put(indexLocation, index);
> 						}
>-					} 
>+					} catch (IOException e) {
>+						// ignore
>+					}
> 				}
> 			}
> 		}
>@@ -358,7 +366,7 @@
> 	return locatedIndexes;
> }
> public synchronized Index getIndexForUpdate(IPath containerPath, boolean reuseExistingFile, boolean createIfMissing) {
>-	IPath indexLocation = computeIndexLocation(containerPath);
>+	IndexLocation indexLocation = computeIndexLocation(containerPath);
> 	if (getIndexStates().get(indexLocation) == REBUILDING_STATE)
> 		return getIndex(containerPath, indexLocation, reuseExistingFile, createIfMissing);
> 
>@@ -368,13 +376,13 @@
> 	if (this.indexStates != null) return this.indexStates;
> 
> 	this.indexStates = new SimpleLookupTable();
>-	IPath indexesDirectoryPath = getJavaPluginWorkingLocation();
>-	char[][] savedNames = readIndexState(indexesDirectoryPath.toOSString());
>+	File indexesDirectoryPath = getSavedIndexesDirectory();
>+	char[][] savedNames = readIndexState(getJavaPluginWorkingLocation().toOSString());
> 	if (savedNames != null) {
> 		for (int i = 1, l = savedNames.length; i < l; i++) { // first name is saved signature, see readIndexState()
> 			char[] savedName = savedNames[i];
> 			if (savedName.length > 0) {
>-				IPath indexLocation = indexesDirectoryPath.append(new String(savedName)); // shares indexesDirectoryPath's segments
>+				IndexLocation indexLocation = new FileIndexLocation(new File(indexesDirectoryPath, String.valueOf(savedName))); // shares indexesDirectoryPath's segments
> 				if (VERBOSE)
> 					Util.verbose("Reading saved index file " + indexLocation); //$NON-NLS-1$
> 				this.indexStates.put(indexLocation, SAVED_STATE);
>@@ -387,9 +395,10 @@
> 		this.javaLikeNamesChanged = false;
> 		deleteIndexFiles();
> 	}
>+	readIndexMap();
> 	return this.indexStates;
> }
>-private IPath getParticipantsContainer(IPath indexLocation) {
>+private IPath getParticipantsContainer(IndexLocation indexLocation) {
> 	if (this.participantsContainers == null) {
> 		readParticipantsIndexNamesFile();
> 	}
>@@ -474,7 +483,7 @@
> 		for (int i = 0; i < entries.length; i++) {
> 			IClasspathEntry entry= entries[i];
> 			if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY)
>-				indexLibrary(entry.getPath(), project);
>+				indexLibrary(entry.getPath(), project, ((ClasspathEntry)entry).getLibraryIndexLocation());
> 		}
> 	} catch(JavaModelException e){ // cannot retrieve classpath info
> 	}
>@@ -488,16 +497,16 @@
>  * Trigger addition of a library to an index
>  * Note: the actual operation is performed in background
>  */
>-public void indexLibrary(IPath path, IProject requestingProject) {
>+public void indexLibrary(IPath path, IProject requestingProject, URL indexURL) {
> 	// requestingProject is no longer used to cancel jobs but leave it here just in case
>+	IndexLocation indexFile = indexURL != null ? IndexLocation.createIndexLocation(indexURL): null;
> 	if (JavaCore.getPlugin() == null) return;
>-
>-	Object target = JavaModel.getTarget(path, true);
> 	IndexRequest request = null;
>+	Object target = JavaModel.getTarget(path, true);
> 	if (target instanceof IFile) {
>-		request = new AddJarFileToIndex((IFile) target, this);
>+		request = new AddJarFileToIndex((IFile) target, indexFile, this);
> 	} else if (target instanceof File) {
>-		request = new AddJarFileToIndex(path, this);
>+		request = new AddJarFileToIndex(path, indexFile, this);
> 	} else if (target instanceof IContainer) {
> 		request = new IndexBinaryFolder((IContainer) target, this);
> 	} else {
>@@ -508,6 +517,20 @@
> 	if (!isJobWaiting(request))
> 		request(request);
> }
>+
>+synchronized boolean addIndex(IPath containerPath, IndexLocation indexFile) {
>+	getIndexStates().put(indexFile, REUSE_STATE);
>+	this.indexLocations.put(containerPath, indexFile);
>+	Index index = getIndex(containerPath, indexFile, true, false);
>+	if (index == null) {
>+		indexFile.close();
>+		this.indexLocations.put(containerPath, null);
>+		return false;
>+	}
>+	writeIndexMapFile();
>+	return true;
>+}
>+
> /**
>  * Index the content of the given source folder.
>  */
>@@ -522,7 +545,7 @@
> 	request(new AddFolderToIndex(sourceFolder, project, inclusionPatterns, exclusionPatterns, this));
> }
> public synchronized void jobWasCancelled(IPath containerPath) {
>-	IPath indexLocation = computeIndexLocation(containerPath);
>+	IndexLocation indexLocation = computeIndexLocation(containerPath);
> 	Index index = getIndex(indexLocation);
> 	if (index != null) {
> 		index.monitor = null;
>@@ -568,7 +591,7 @@
> 	}
> 	return null;
> }
>-private void rebuildIndex(IPath indexLocation, IPath containerPath) {
>+private void rebuildIndex(IndexLocation indexLocation, IPath containerPath) {
> 	Object target = JavaModel.getTarget(containerPath, true);
> 	if (target == null) return;
> 
>@@ -584,9 +607,9 @@
> 	} else if (target instanceof IFolder) {
> 		request = new IndexBinaryFolder((IFolder) target, this);
> 	} else if (target instanceof IFile) {
>-		request = new AddJarFileToIndex((IFile) target, this);
>+		request = new AddJarFileToIndex((IFile) target, null, this);
> 	} else if (target instanceof File) {
>-		request = new AddJarFileToIndex(containerPath, this);
>+		request = new AddJarFileToIndex(containerPath, null, this);
> 	}
> 	if (request != null)
> 		request(request);
>@@ -601,13 +624,13 @@
> 	String containerPathString = containerPath.getDevice() == null ? containerPath.toString() : containerPath.toOSString();
> 	try {
> 		// Path is already canonical
>-		IPath indexLocation = computeIndexLocation(containerPath);
>+		IndexLocation indexLocation = computeIndexLocation(containerPath);
> 		Index index = getIndex(indexLocation);
> 		ReadWriteMonitor monitor = index == null ? null : index.monitor;
> 
> 		if (VERBOSE)
> 			Util.verbose("-> recreating index: "+indexLocation+" for path: "+containerPathString); //$NON-NLS-1$ //$NON-NLS-2$
>-		index = new Index(indexLocation.toOSString(), containerPathString, false /*do not reuse index file*/);
>+		index = new Index(indexLocation, containerPathString, false /*do not reuse index file*/);
> 		this.indexes.put(indexLocation, index);
> 		index.monitor = monitor;
> 		return index;
>@@ -634,7 +657,7 @@
> public synchronized void removeIndex(IPath containerPath) {
> 	if (VERBOSE || DEBUG)
> 		Util.verbose("removing index " + containerPath); //$NON-NLS-1$
>-	IPath indexLocation = computeIndexLocation(containerPath);
>+	IndexLocation indexLocation = computeIndexLocation(containerPath);
> 	Index index = getIndex(indexLocation);
> 	File indexFile = null;
> 	if (index != null) {
>@@ -642,8 +665,11 @@
> 		indexFile = index.getIndexFile();
> 	}
> 	if (indexFile == null)
>-		indexFile = new File(indexLocation.toOSString()); // index is not cached yet, but still want to delete the file
>-	if (indexFile.exists()) {
>+		indexFile = indexLocation.getIndexFile(); // index is not cached yet, but still want to delete the file
>+	if (this.indexStates.get(indexLocation) == REUSE_STATE) {
>+		indexLocation.close();
>+		this.indexLocations.put(containerPath, null);
>+	} else if (indexFile != null && indexFile.exists()) {
> 		if (DEBUG)
> 			Util.verbose("removing index file " + indexFile); //$NON-NLS-1$
> 		indexFile.delete();
>@@ -659,24 +685,25 @@
> 		Util.verbose("removing index path " + path); //$NON-NLS-1$
> 	Object[] keyTable = this.indexes.keyTable;
> 	Object[] valueTable = this.indexes.valueTable;
>-	IPath[] locations = null;
>+	IndexLocation[] locations = null;
> 	int max = this.indexes.elementSize;
> 	int count = 0;
> 	for (int i = 0, l = keyTable.length; i < l; i++) {
>-		IPath indexLocation = (IPath) keyTable[i];
>+		IndexLocation indexLocation = (IndexLocation) keyTable[i];
> 		if (indexLocation == null)
> 			continue;
>-		if (path.isPrefixOf(indexLocation)) {
>+		if (indexLocation.startsWith(path)) {
> 			Index index = (Index) valueTable[i];
> 			index.monitor = null;
> 			if (locations == null)
>-				locations = new IPath[max];
>+				locations = new IndexLocation[max];
> 			locations[count++] = indexLocation;
>-			File indexFile = index.getIndexFile();
>-			if (indexFile.exists()) {
>+			if (this.indexStates.get(indexLocation) == REUSE_STATE) {
>+				indexLocation.close();
>+			} else {
> 				if (DEBUG)
>-					Util.verbose("removing index file " + indexFile); //$NON-NLS-1$
>-				indexFile.delete();
>+					Util.verbose("removing index file " + indexLocation); //$NON-NLS-1$
>+				indexLocation.delete();
> 			}
> 		} else {
> 			max--;
>@@ -686,9 +713,15 @@
> 		for (int i = 0; i < count; i++)
> 			this.indexes.removeKey(locations[i]);
> 		removeIndexesState(locations);
>-		if (this.participantsContainers != null && this.participantsContainers.get(path.toOSString()) != null) {
>-			this.participantsContainers.removeKey(path.toOSString());	
>-			writeParticipantsIndexNamesFile();
>+		if (this.participantsContainers != null) {
>+			boolean update = false;
>+			for (int i = 0; i < count; i++) {
>+				if (this.participantsContainers.get(locations[i]) != null) {
>+					update = true;
>+					this.participantsContainers.removeKey(locations[i]);
>+				}
>+			}
>+			if (update) writeParticipantsIndexNamesFile();
> 		}
> 	}
> }
>@@ -746,7 +779,7 @@
> 	String containerPathString = containerPath.getDevice() == null ? containerPath.toString() : containerPath.toOSString();
> 	try {
> 		// Path is already canonical
>-		IPath indexLocation = computeIndexLocation(containerPath);
>+		IndexLocation indexLocation = computeIndexLocation(containerPath);
> 		Index index = getIndex(indexLocation);
> 		if (VERBOSE) {
> 			Util.verbose("-> reseting index: "+indexLocation+" for path: "+containerPathString); //$NON-NLS-1$ //$NON-NLS-2$
>@@ -770,7 +803,7 @@
> 	// must have permission to write from the write monitor
> 	if (index.hasChanged()) {
> 		if (VERBOSE)
>-			Util.verbose("-> saving index " + index.getIndexFile()); //$NON-NLS-1$
>+			Util.verbose("-> saving index " + index.getIndexLocation()); //$NON-NLS-1$
> 		index.save();
> 	}
> 	synchronized (this) {
>@@ -782,7 +815,7 @@
> 					if (((IndexRequest) job).containerPath.equals(containerPath)) return;
> 			}
> 		}
>-		IPath indexLocation = computeIndexLocation(containerPath);
>+		IndexLocation indexLocation = computeIndexLocation(containerPath);
> 		updateIndexState(indexLocation, SAVED_STATE);
> 	}
> }
>@@ -837,7 +870,7 @@
> 	}
> 	this.needToSave = !allSaved;
> }
>-public void scheduleDocumentIndexing(final SearchDocument searchDocument, IPath container, final IPath indexLocation, final SearchParticipant searchParticipant) {
>+public void scheduleDocumentIndexing(final SearchDocument searchDocument, IPath container, final IndexLocation indexLocation, final SearchParticipant searchParticipant) {
> 	request(new IndexRequest(container, this) {
> 		public boolean execute(IProgressMonitor progressMonitor) {
> 			if (this.isCancelled || progressMonitor != null && progressMonitor.isCanceled()) return true;
>@@ -850,7 +883,7 @@
> 
> 			try {
> 				monitor.enterWrite(); // ask permission to write
>-				indexDocument(searchDocument, searchParticipant, index, indexLocation);
>+				indexDocument(searchDocument, searchParticipant, index, new Path(indexLocation.getCanonicalFilePath()));
> 			} finally {
> 				monitor.exitWrite(); // free write lock
> 			}
>@@ -876,6 +909,27 @@
> 	return buffer.toString();
> }
> 
>+private void readIndexMap() {
>+	try {
>+		char[] indexMaps = org.eclipse.jdt.internal.compiler.util.Util.getFileCharContent(this.indexNamesMapFile, null);
>+		char[][] names = CharOperation.splitOn('\n', indexMaps);
>+		if (names.length >= 3) {
>+			// First line is DiskIndex signature (see writeIndexMapFile())
>+			String savedSignature = DiskIndex.SIGNATURE;
>+			if (savedSignature.equals(new String(names[0]))) {
>+				for (int i = 1, l = names.length-1 ; i < l ; i+=2) {
>+					IndexLocation indexPath = IndexLocation.createIndexLocation(new URL(new String(names[i])));
>+					this.indexLocations.put(new Path(new String(names[i+1])), indexPath );
>+					this.indexStates.put(indexPath, REUSE_STATE);
>+				}
>+			}		
>+		}
>+	} catch (IOException ignored) {
>+		if (VERBOSE)
>+			Util.verbose("Failed to read saved index file names"); //$NON-NLS-1$
>+	}
>+	return;
>+}
> private char[][] readIndexState(String dirOSString) {
> 	try {
> 		char[] savedIndexNames = org.eclipse.jdt.internal.compiler.util.Util.getFileCharContent(this.savedIndexNamesFile, null);
>@@ -904,7 +958,8 @@
> 				// First line is DiskIndex signature  (see writeParticipantsIndexNamesFile())
> 				if (DiskIndex.SIGNATURE.equals(new String(names[0]))) {					
> 					for (int i = 1, l = names.length-1 ; i < l ; i+=2) {
>-						containers.put(new Path(new String(names[i])), new Path(new String(names[i+1])));
>+						IndexLocation indexLocation = new FileIndexLocation(new File(new String(names[i])), true);
>+						containers.put(indexLocation, new Path(new String(names[i+1])));
> 					}
> 				}				
> 			}
>@@ -916,7 +971,7 @@
> 	this.participantsContainers = containers;
> 	return;
> }
>-private synchronized void removeIndexesState(IPath[] locations) {
>+private synchronized void removeIndexesState(IndexLocation[] locations) {
> 	getIndexStates(); // ensure the states are initialized
> 	int length = locations.length;
> 	boolean changed = false;
>@@ -932,9 +987,10 @@
> 	if (!changed) return;
> 
> 	writeSavedIndexNamesFile();
>+	writeIndexMapFile();
> }
>-private synchronized void updateIndexState(IPath indexLocation, Integer indexState) {
>-	if (indexLocation.isEmpty())
>+private synchronized void updateIndexState(IndexLocation indexLocation, Integer indexState) {
>+	if (indexLocation == null)
> 		throw new IllegalArgumentException();
> 
> 	getIndexStates(); // ensure the states are initialized
>@@ -962,10 +1018,11 @@
> 	}
> 
> }
>-public void updateParticipant(IPath indexLocation, IPath containerPath) {
>+public void updateParticipant(IPath indexPath, IPath containerPath) {
> 	if (this.participantsContainers == null) {
> 		readParticipantsIndexNamesFile();
>-	} 
>+	}
>+	IndexLocation indexLocation = new FileIndexLocation(indexPath.toFile(), true);
> 	if (this.participantsContainers.get(indexLocation) == null) {
> 		this.participantsContainers.put(indexLocation, containerPath);
> 		this.participantUpdated  = true;
>@@ -1005,6 +1062,39 @@
> 		}
> 	}
> }
>+private void writeIndexMapFile() {
>+	BufferedWriter writer = null;
>+	try {
>+		writer = new BufferedWriter(new FileWriter(this.indexNamesMapFile));
>+		writer.write(DiskIndex.SIGNATURE);
>+		writer.write('\n');
>+		Object[] keys = this.indexStates.keyTable;
>+		Object[] states = this.indexStates.valueTable;
>+		for (int i = 0, l = states.length; i < l; i++) {
>+			IndexLocation location = (IndexLocation)keys[i];
>+			if (location != null && states[i] == REUSE_STATE) {
>+				IPath container = (IPath)this.indexLocations.keyForValue(location);
>+				if (container != null) {
>+					writer.write(location.toString());
>+					writer.write('\n');
>+					writer.write(container.toOSString());
>+					writer.write('\n');
>+				}
>+			}
>+		}
>+	} catch (IOException ignored) {
>+		if (VERBOSE)
>+			Util.verbose("Failed to write saved index file names", System.err); //$NON-NLS-1$
>+	} finally {
>+		if (writer != null) {
>+			try {
>+				writer.close();
>+			} catch (IOException e) {
>+				// ignore
>+			}
>+		}
>+	}
>+}
> private void writeParticipantsIndexNamesFile() {
> 	BufferedWriter writer = null;
> 	try {
>@@ -1014,9 +1104,9 @@
> 		Object[] indexFiles = this.participantsContainers.keyTable;
> 		Object[] containers = this.participantsContainers.valueTable;
> 		for (int i = 0, l = indexFiles.length; i < l; i++) {
>-			IPath indexFile = (IPath)indexFiles[i];
>+			IndexLocation indexFile = (IndexLocation)indexFiles[i];
> 			if (indexFile != null) {
>-				writer.write(indexFile.toOSString());
>+				writer.write(indexFile.getIndexFile().getPath());
> 				writer.write('\n');
> 				writer.write(((IPath)containers[i]).toOSString());
> 				writer.write('\n');
>@@ -1046,9 +1136,9 @@
> 		Object[] keys = this.indexStates.keyTable;
> 		Object[] states = this.indexStates.valueTable;
> 		for (int i = 0, l = states.length; i < l; i++) {
>-			IPath key = (IPath) keys[i];
>-			if (key != null && !key.isEmpty() && states[i] == SAVED_STATE) {
>-				writer.write(key.lastSegment());
>+			IndexLocation key = (IndexLocation) keys[i];
>+			if (key != null && states[i] == SAVED_STATE) {
>+				writer.write(key.fileName());
> 				writer.write('\n');
> 			}
> 		}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ClassFileMatchLocator.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ClassFileMatchLocator.java
>index 37608aa..1c86721 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ClassFileMatchLocator.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ClassFileMatchLocator.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -90,6 +90,9 @@
> 	return true;
> }
> private boolean checkStandardAnnotations(long annotationTagBits, TypeReferencePattern pattern) {
>+	if ((annotationTagBits & TagBits.AllStandardAnnotationsMask) == 0) {
>+		return false;
>+	}
> 	if ((annotationTagBits & TagBits.AnnotationTargetMASK) != 0) {
> 		char[][] compoundName = TypeConstants.JAVA_LANG_ANNOTATION_TARGET;
> 		if (checkAnnotationTypeReference(CharOperation.concatWith(compoundName, '.'), pattern) ||
>@@ -142,18 +145,6 @@
> 	}
> 	if ((annotationTagBits & TagBits.AnnotationPolymorphicSignature) != 0) {
> 		char[][] compoundName = TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_$_POLYMORPHICSIGNATURE;
>-		if (checkAnnotationTypeReference(CharOperation.concatWith(compoundName, '.'), pattern)) {
>-			return true;
>-		}
>-	}
>-	if ((annotationTagBits & TagBits.AnnotationPostConstruct) != 0) {
>-		char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT;
>-		if (checkAnnotationTypeReference(CharOperation.concatWith(compoundName, '.'), pattern)) {
>-			return true;
>-		}
>-	}
>-	if ((annotationTagBits & TagBits.AnnotationPreDestroy) != 0) {
>-		char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_PREDESTROY;
> 		if (checkAnnotationTypeReference(CharOperation.concatWith(compoundName, '.'), pattern)) {
> 			return true;
> 		}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
>index 93f987e..fb5de81 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -70,9 +70,12 @@
> import org.eclipse.jdt.internal.core.SearchableEnvironment;
> import org.eclipse.jdt.internal.core.SourceMapper;
> import org.eclipse.jdt.internal.core.SourceMethod;
>+import org.eclipse.jdt.internal.core.SourceType;
> import org.eclipse.jdt.internal.core.SourceTypeElementInfo;
> import org.eclipse.jdt.internal.core.index.Index;
> import org.eclipse.jdt.internal.core.search.*;
>+import org.eclipse.jdt.internal.core.search.indexing.IIndexConstants;
>+import org.eclipse.jdt.internal.core.util.ASTNodeFinder;
> import org.eclipse.jdt.internal.core.util.HandleFactory;
> import org.eclipse.jdt.internal.core.util.Util;
> 
>@@ -145,6 +148,8 @@
> HashSet methodHandles;
> 
> private final boolean searchPackageDeclaration;
>+private int sourceStartOfMethodToRetain;
>+private int sourceEndOfMethodToRetain;
> 
> public static class WorkingCopyDocument extends JavaSearchDocument {
> 	public org.eclipse.jdt.core.ICompilationUnit workingCopy;
>@@ -293,6 +298,22 @@
> 		this.searchPackageDeclaration = ((OrPattern)pattern).hasPackageDeclaration();
> 	} else {
> 		this.searchPackageDeclaration = false;
>+	}
>+	if (pattern instanceof MethodPattern) {
>+	    IType type = ((MethodPattern) pattern).declaringType;
>+	    if (type != null && !type.isBinary()) {
>+	    	SourceType sourceType = (SourceType) type;
>+	    	IMember local = sourceType.getOuterMostLocalContext();
>+	    	if (local instanceof IMethod) { // remember this method's range so we don't purge its statements.
>+	    		try {
>+	    			ISourceRange range = local.getSourceRange();
>+	    			this.sourceStartOfMethodToRetain  = range.getOffset();
>+	    			this.sourceEndOfMethodToRetain = this.sourceStartOfMethodToRetain + range.getLength() - 1; // offset is 0 based.
>+	    		} catch (JavaModelException e) {
>+	    			// drop silently. 
>+	    		}
>+	    	}
>+	    }
> 	}
> }
> /**
>@@ -876,10 +897,47 @@
> 	// Get binding from unit scope
> 	char[][] compoundName = CharOperation.splitOn('.', typeName);
> 	TypeBinding typeBinding = this.unitScope.getType(compoundName, compoundName.length);
>+	if (typeBinding == null || !typeBinding.isValidBinding()) {
>+		typeBinding = this.lookupEnvironment.getType(compoundName);
>+	}
> 	this.bindings.put(typeKey, typeBinding);
>-	return typeBinding.isValidBinding() ? typeBinding : null;
>+	return typeBinding != null && typeBinding.isValidBinding() ? typeBinding : null;
> }
> public MethodBinding getMethodBinding(MethodPattern methodPattern) {
>+    MethodBinding methodBinding = getMethodBinding0(methodPattern);
>+    if (methodBinding != null)
>+    	return methodBinding; // known to be valid.
>+    // special handling for methods of anonymous/local types. Since these cannot be looked up in the environment the usual way ...
>+    if (methodPattern.focus instanceof SourceMethod) {
>+    	char[] typeName = PatternLocator.qualifiedPattern(methodPattern.declaringSimpleName, methodPattern.declaringQualification);
>+    	if (CharOperation.indexOf(IIndexConstants.ONE_STAR, typeName, true) >= 0) { // See org.eclipse.jdt.core.search.SearchPattern.enclosingTypeNames(IType)
>+    		IType type = methodPattern.declaringType;
>+    		IType enclosingType = type.getDeclaringType();
>+    		while (enclosingType != null) {
>+    			type = enclosingType;
>+    			enclosingType = type.getDeclaringType();
>+    		}
>+    		typeName = type.getFullyQualifiedName().toCharArray();
>+    		TypeBinding declaringTypeBinding = getType(typeName, typeName);
>+    		if (declaringTypeBinding instanceof SourceTypeBinding) {
>+    			SourceTypeBinding sourceTypeBinding = ((SourceTypeBinding) declaringTypeBinding);
>+    			ClassScope skope = sourceTypeBinding.scope;
>+    			if (skope != null) {
>+    				CompilationUnitDeclaration unit = skope.referenceCompilationUnit();
>+    				if (unit != null) {
>+    					AbstractMethodDeclaration amd = new ASTNodeFinder(unit).findMethod((IMethod) methodPattern.focus);
>+    					if (amd != null && amd.binding != null && amd.binding.isValidBinding()) {
>+    						this.bindings.put(methodPattern, amd.binding);
>+    						return amd.binding;
>+    					}
>+    				}
>+    			}
>+    		}
>+    	}
>+    }
>+	return null;
>+}
>+private MethodBinding getMethodBinding0(MethodPattern methodPattern) {
> 	if (this.unitScope == null) return null;
> 	// Try to get binding from cache
> 	Binding binding = (Binding) this.bindings.get(methodPattern);
>@@ -990,7 +1048,7 @@
> 			this.options,
> 			new DefaultProblemFactory());
> 	this.lookupEnvironment = new LookupEnvironment(this, this.options, problemReporter, this.nameEnvironment);
>-
>+	this.lookupEnvironment.mayTolerateMissingType = true;
> 	this.parser = MatchLocatorParser.createParser(problemReporter, this);
> 
> 	// basic parser needs also to be reset as project options may have changed
>@@ -1351,7 +1409,7 @@
> }
> //*/
> protected IType lookupType(ReferenceBinding typeBinding) {
>-	if (typeBinding == null) return null;
>+	if (typeBinding == null || !typeBinding.isValidBinding()) return null;
> 
> 	char[] packageName = typeBinding.qualifiedPackageName();
> 	IPackageFragment[] pkgs = this.nameLookup.findPackageFragments(
>@@ -1692,14 +1750,19 @@
> 			for (int j = 0, length = methods.length; j < length; j++) {
> 				AbstractMethodDeclaration method = methods[j];
> 				if (!this.currentPossibleMatch.nodeSet.hasPossibleNodes(method.declarationSourceStart, method.declarationSourceEnd)) {
>-					method.statements = null;
>-					method.javadoc = null;
>+					if (this.sourceStartOfMethodToRetain != method.declarationSourceStart || this.sourceEndOfMethodToRetain != method.declarationSourceEnd) { // approximate, but no big deal
>+						method.statements = null;
>+						method.javadoc = null;
>+					}
> 				}
> 			}
> 		} else {
> 			for (int j = 0, length = methods.length; j < length; j++) {
>-				methods[j].statements = null;
>-				methods[j].javadoc = null;
>+				AbstractMethodDeclaration method = methods[j];
>+				if (this.sourceStartOfMethodToRetain != method.declarationSourceStart || this.sourceEndOfMethodToRetain != method.declarationSourceEnd) { // approximate, but no big deal
>+					method.statements = null;
>+					method.javadoc = null;
>+				}
> 			}
> 		}
> 	}
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MethodLocator.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MethodLocator.java
>index 55e10cc..9b48938 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MethodLocator.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MethodLocator.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -31,6 +31,7 @@
> //extra reference info
> public char[][][] allSuperDeclaringTypeNames;
> 
>+private MatchLocator matchLocator;
> //method declarations which parameters verification fail
> private HashMap methodDeclarationsWithInvalidParam = new HashMap();
> 
>@@ -82,6 +83,7 @@
> 				locator,
> 				this.pattern.declaringType,
> 				locator.progressMonitor).collect();
>+		this.matchLocator = locator;	
> 	} catch (JavaModelException e) {
> 		// inaccurate matches will be found
> 	}
>@@ -251,7 +253,7 @@
> 			// return inaccurate match for ambiguous call (bug 80890)
> 			return INACCURATE_MATCH;
> 		}
>-
>+		boolean foundTypeVariable = false;
> 		// verify each parameter
> 		for (int i = 0; i < parameterCount; i++) {
> 			TypeBinding argType = method.parameters[i];
>@@ -272,6 +274,9 @@
> 						// Do not consider match as impossible while finding declarations and source level >= 1.5
> 					 	// (see  bugs https://bugs.eclipse.org/bugs/show_bug.cgi?id=79990, 96761, 96763)
> 						newLevel = level;
>+					} else if (argType.isTypeVariable()) {
>+						newLevel = level;
>+						foundTypeVariable = true;
> 					} else {
> 						return IMPOSSIBLE_MATCH;
> 					}
>@@ -279,10 +284,23 @@
> 				level = newLevel; // can only be downgraded
> 			}
> 		}
>+		if (foundTypeVariable) {
>+			if (!method.isStatic() && !method.isPrivate()) {
>+				// https://bugs.eclipse.org/bugs/show_bug.cgi?id=123836, No point in textually comparing type variables, captures etc with concrete types. 
>+				MethodBinding focusMethodBinding = this.matchLocator.getMethodBinding(this.pattern);
>+				if (focusMethodBinding != null) {
>+					if (matchOverriddenMethod(focusMethodBinding.declaringClass, focusMethodBinding, method)) {
>+						return ACCURATE_MATCH;
>+					}
>+				}
>+			} 
>+			return IMPOSSIBLE_MATCH;
>+		}
> 	}
> 
> 	return level;
> }
>+// This works for only methods of parameterized types.
> private boolean matchOverriddenMethod(ReferenceBinding type, MethodBinding method, MethodBinding matchMethod) {
> 	if (type == null || this.pattern.selector == null) return false;
> 
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PossibleMatch.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PossibleMatch.java
>index dc3450d..2a967c4 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PossibleMatch.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PossibleMatch.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -154,6 +154,9 @@
> 		hashCode += CharOperation.hashCode(this.compoundName[i]);
> 	return hashCode;
> }
>+public boolean ignoreOptionalProblems() {
>+	return false;
>+}
> void setSimilarMatch(PossibleMatch possibleMatch) {
> 	// source does not matter on similar match as it is read on
> 	// the first stored possible match

Actions: View | Diff

Attachments on bug 359724: 211628 | 211642 | 211643