Bug 483163 - Remove unnecessary whitespace from

eclipse.pde.ui repo

For the missing plug-ins in API tools

Change-Id: I94db18a67e39f16c780d753fd27ed2c1ea0ad606
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

19 files changed, 162 insertions, 117 deletions

diff --git a/apitools/org.eclipse.pde.api.tools.annotations/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.annotations/.settings/org.eclipse.jdt.core.prefs
index 194690bcef..07c0d90d0e 100644
--- a/apitools/org.eclipse.pde.api.tools.annotations/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.annotations/.settings/org.eclipse.jdt.core.prefs
@@ -126,30 +126,30 @@ org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH

 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

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

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

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

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

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

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

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

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

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=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=32

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

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

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

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

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

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

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

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

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

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

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

+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_resources_in_try=80

+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.alignment_for_union_type_in_multicatch=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

@@ -169,10 +169,11 @@ 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_lambda_body=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=true

+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

@@ -183,7 +184,7 @@ 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=do not insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

 org.eclipse.jdt.core.formatter.comment.line_length=80

 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

@@ -204,7 +205,7 @@ 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.indent_switchstatements_compare_to_switch=false

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

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

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

@@ -214,6 +215,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_label=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_after_type_annotation=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

@@ -232,7 +234,7 @@ 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_arguments=do not 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

@@ -261,6 +263,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 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_lambda_arrow=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

@@ -338,6 +341,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 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_lambda_arrow=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

@@ -392,7 +396,7 @@ 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=80

+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

@@ -407,3 +411,4 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

 org.eclipse.jdt.core.incompatibleJDKLevel=ignore

 org.eclipse.jdt.core.incompleteClasspath=error

+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

diff --git a/apitools/org.eclipse.pde.api.tools.annotations/.settings/org.eclipse.jdt.ui.prefs b/apitools/org.eclipse.pde.api.tools.annotations/.settings/org.eclipse.jdt.ui.prefs
index e7dfdc6431..6b6505005b 100644
--- a/apitools/org.eclipse.pde.api.tools.annotations/.settings/org.eclipse.jdt.ui.prefs
+++ b/apitools/org.eclipse.pde.api.tools.annotations/.settings/org.eclipse.jdt.ui.prefs
@@ -53,7 +53,7 @@ cleanup_profile=_Unmanaged profile 'API Tools Cleanups'
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Unmanaged profile 'API Tools Formatting'
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
 formatter_settings_version=12
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
@@ -68,10 +68,12 @@ 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_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=false
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=false
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
@@ -87,7 +89,8 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 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_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
 sp_cleanup.remove_unnecessary_casts=true
@@ -100,10 +103,13 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=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
+sp_cleanup.use_type_arguments=false
diff --git a/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoExtend.java b/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoExtend.java
index e012108781..742af4bd85 100644
--- a/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoExtend.java
+++ b/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoExtend.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
  * Classes and interfaces tagged with this annotation are declaring they are not
  * to be extended by clients. If this annotation is used anywhere except classes
  * or interfaces it will be ignored.
- * 
+ *
  * @since 1.0
  */
 @Documented
diff --git a/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoImplement.java b/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoImplement.java
index ec71adaeda..58dfeca609 100644
--- a/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoImplement.java
+++ b/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoImplement.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
  * Interfaces tagged with this annotation are declaring they are not to be
  * implemented by clients. If this annotation is used anywhere except for
  * interfaces it will be ignored.
- * 
+ *
  * @since 1.0
  */
 @Documented
diff --git a/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoInstantiate.java b/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoInstantiate.java
index 64d27efb1d..c92f09f93a 100644
--- a/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoInstantiate.java
+++ b/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoInstantiate.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
  * Classes tagged with this annotation are declaring they are not to be
  * instantiated by clients. If this annotation is used anywhere except for
  * classes it will be ignored.
- * 
+ *
  * @since 1.0
  */
 @Documented
diff --git a/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoOverride.java b/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoOverride.java
index 4e8a341f2c..894ba573be 100644
--- a/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoOverride.java
+++ b/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoOverride.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
  * Methods tagged with this annotation are declaring they are not to be
  * overridden by clients. If this annotation is used anywhere other than methods
  * it will be ignored.
- * 
+ *
  * @since 1.0
  */
 @Documented
diff --git a/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoReference.java b/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoReference.java
index adb6aa80d5..f2068fef69 100644
--- a/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoReference.java
+++ b/apitools/org.eclipse.pde.api.tools.annotations/src/org/eclipse/pde/api/tools/annotations/NoReference.java
@@ -22,7 +22,7 @@ import java.lang.annotation.Target;
  * example a method tagged with this annotation should not be called by clients.
  * If this annotation appears anywhere other than classes, interfaces,
  * annotations, enums, methods and fields it will be ignored.
- * 
+ *
  * @since 1.0
  */
 @Documented
diff --git a/apitools/org.eclipse.pde.api.tools.generator/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.generator/.settings/org.eclipse.jdt.core.prefs
index ea8e794db2..cbbe2255ab 100644
--- a/apitools/org.eclipse.pde.api.tools.generator/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.generator/.settings/org.eclipse.jdt.core.prefs
@@ -126,30 +126,30 @@ org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH

 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

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

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

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

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

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

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

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

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

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=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=32

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

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

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

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

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

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

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

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

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

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

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

+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_resources_in_try=80

+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.alignment_for_union_type_in_multicatch=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

@@ -169,10 +169,11 @@ 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_lambda_body=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=true

+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

@@ -183,7 +184,7 @@ 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=do not insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

 org.eclipse.jdt.core.formatter.comment.line_length=80

 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

@@ -204,7 +205,7 @@ 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.indent_switchstatements_compare_to_switch=false

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

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

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

@@ -214,6 +215,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_label=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_after_type_annotation=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

@@ -232,7 +234,7 @@ 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_arguments=do not 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

@@ -261,6 +263,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 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_lambda_arrow=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

@@ -338,6 +341,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 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_lambda_arrow=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

@@ -392,7 +396,7 @@ 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=80

+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

@@ -407,3 +411,4 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

 org.eclipse.jdt.core.incompatibleJDKLevel=ignore

 org.eclipse.jdt.core.incompleteClasspath=error

+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

diff --git a/apitools/org.eclipse.pde.api.tools.generator/.settings/org.eclipse.jdt.ui.prefs b/apitools/org.eclipse.pde.api.tools.generator/.settings/org.eclipse.jdt.ui.prefs
index ebfd040be9..6b6505005b 100644
--- a/apitools/org.eclipse.pde.api.tools.generator/.settings/org.eclipse.jdt.ui.prefs
+++ b/apitools/org.eclipse.pde.api.tools.generator/.settings/org.eclipse.jdt.ui.prefs
@@ -53,7 +53,7 @@ cleanup_profile=_Unmanaged profile 'API Tools Cleanups'
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Platform Debug Formatting
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
 formatter_settings_version=12
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
@@ -68,10 +68,12 @@ 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_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=false
 sp_cleanup.format_source_code=true
 sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=false
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
@@ -87,7 +89,8 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 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_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
 sp_cleanup.remove_unnecessary_casts=true
@@ -100,10 +103,13 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=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
+sp_cleanup.use_type_arguments=false
diff --git a/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEDescriptionGenerator.java b/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEDescriptionGenerator.java
index 1235a37eff..5694e314be 100644
--- a/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEDescriptionGenerator.java
+++ b/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEDescriptionGenerator.java
@@ -1,10 +1,10 @@
 /*******************************************************************************

  * Copyright (c) 2011, 2014 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

+ * All rights reserved. This program and the accompanying materials

  * are made available under the terms 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

  *******************************************************************************/

diff --git a/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java b/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java
index 910a0e6a05..7c1c4c8d41 100644
--- a/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java
+++ b/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java
@@ -1,10 +1,10 @@
 /*******************************************************************************

  * Copyright (c) 2011, 2014 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

+ * All rights reserved. This program and the accompanying materials

  * are made available under the terms 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

  *******************************************************************************/

@@ -144,6 +144,7 @@ public class EEGenerator {
 				this.type = CharOperation.replaceOnCopy(ftype, '/', '.');

 			}

 		}

+		@Override

 		public int compareTo(Field field) {

 			return CharOperation.compareTo(this.name, field.name);

 		}

@@ -214,6 +215,7 @@ public class EEGenerator {
 				this.genericSignature = genericsig;

 			}

 		}

+		@Override

 		public int compareTo(Method method) {

 			int compare = CharOperation.compareTo(this.selector, method.selector);

 			if (compare == 0) {

@@ -307,6 +309,7 @@ public class EEGenerator {
 				result.put(typeName, type);

 			}

 		}

+		@Override

 		public int compareTo(Package package1) {

 			return this.name.compareTo(package1.name);

 		}

@@ -774,6 +777,7 @@ public class EEGenerator {
 			}

 			long time = System.currentTimeMillis();

 			this.allFiles = Util.getAllFiles(new File(this.JRElib), new FileFilter() {

+				@Override

 				public boolean accept(File pathname) {

 					return pathname.isDirectory() || pathname.getName().toLowerCase().endsWith(".jar"); //$NON-NLS-1$

 				}

@@ -1048,6 +1052,7 @@ public class EEGenerator {
 			System.out.println("Its generated size is " + this.generatedSize + " bytes."); //$NON-NLS-1$ //$NON-NLS-2$

 			System.out.println("Ratio : " + (((double) this.generatedSize / (double) this.totalSize) * 100.0) + "%"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

+		@Override

 		public String toString() {

 			return this.getProfileName();

 		}

@@ -1189,6 +1194,7 @@ public class EEGenerator {
 		 * @see org.objectweb.asm.ClassAdapter#visit(int, int, java.lang.String,

 		 * java.lang.String, java.lang.String, java.lang.String[])

 		 */

+		@Override

 		public void visit(int version, int access, String className, String signature, String superName, String[] interfaces) {

 			this.name = className;

 			this.stub = new StubClass(access, className, superName, interfaces);

@@ -1205,6 +1211,7 @@ public class EEGenerator {
 		 * org.objectweb.asm.ClassAdapter#visitAttribute(org.objectweb.asm.Attribute

 		 * )

 		 */

+		@Override

 		public void visitAttribute(Attribute attr) {

 			if ("Synthetic".equals(attr.type)) { //$NON-NLS-1$

 				this.flags |= IGNORE_CLASS_FILE;

@@ -1220,6 +1227,7 @@ public class EEGenerator {
 		 * @see org.objectweb.asm.ClassAdapter#visitField(int, java.lang.String,

 		 * java.lang.String, java.lang.String, java.lang.Object)

 		 */

+		@Override

 		public FieldVisitor visitField(int access, String fieldName, String desc, String signature, Object value) {

 			if (type.getField(fieldName) == null) {

 				return null;

@@ -1233,6 +1241,7 @@ public class EEGenerator {
 		 * @see org.objectweb.asm.ClassAdapter#visitInnerClass(java.lang.String,

 		 * java.lang.String, java.lang.String, int)

 		 */

+		@Override

 		public void visitInnerClass(String innerClassName, String outerName, String innerName, int access) {

 			if (this.name.equals(innerClassName) && (outerName == null)) {

 				// local class

@@ -1246,6 +1255,7 @@ public class EEGenerator {
 		 * java.lang.String, java.lang.String, java.lang.String,

 		 * java.lang.String[])

 		 */

+		@Override

 		public MethodVisitor visitMethod(int access, String methodName, String desc, String signature, String[] exceptions) {

 			if ("<clinit>".equals(methodName)) { //$NON-NLS-1$

 				return null;

@@ -1475,6 +1485,7 @@ public class EEGenerator {
 			}

 			this.methods.add(m);

 		}

+		@Override

 		public int compareTo(Type type) {

 			return this.getSimpleName().compareTo(type.getSimpleName());

 		}

diff --git a/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/util/Util.java b/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/util/Util.java
index 627ab3f5cf..3ff2281353 100644
--- a/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/util/Util.java
+++ b/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/util/Util.java
@@ -1,10 +1,10 @@
 /*******************************************************************************

  * Copyright (c) 2000, 2014 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

+ * All rights reserved. This program and the accompanying materials

  * are made available under the terms 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

  *******************************************************************************/

@@ -90,7 +90,7 @@ public class Util {
 	 * specified (ie. if length != -1), only length bytes are returned.

 	 * Otherwise all bytes in the stream are returned. Note this doesn't close

 	 * the stream.

-	 * 

+	 *

 	 * @throws IOException if a problem occured reading the stream.

 	 */

 	public static byte[] getInputStreamAsByteArray(InputStream stream, int length) throws IOException {

@@ -143,7 +143,7 @@ public class Util {
 	 * Returns the given input stream's contents as a character array. If a

 	 * length is specified (i.e. if length != -1), this represents the number of

 	 * bytes in the stream. Note this doesn't close the stream.

-	 * 

+	 *

 	 * @throws IOException if a problem occured reading the stream.

 	 */

 	public static char[] getInputStreamAsCharArray(InputStream stream, int length, String encoding) throws IOException {

@@ -270,7 +270,7 @@ public class Util {
 

 	/**

 	 * Writes the given entry information into the output stream

-	 * 

+	 *

 	 * @param outputStream the output stream to write out to

 	 * @param entryName

 	 * @param bytes

diff --git a/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs
index 6960915e48..e595b675ab 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs
@@ -126,30 +126,30 @@ org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+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=0
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=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=32
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=0
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=0
+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_resources_in_try=80
+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.alignment_for_union_type_in_multicatch=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
@@ -169,10 +169,11 @@ 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_lambda_body=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=true
+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
@@ -183,7 +184,7 @@ 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=do not insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
 org.eclipse.jdt.core.formatter.comment.line_length=80
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -204,7 +205,7 @@ 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.indent_switchstatements_compare_to_switch=false
 org.eclipse.jdt.core.formatter.indentation.size=4
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
@@ -214,6 +215,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=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_after_type_annotation=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
@@ -232,7 +234,7 @@ 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_arguments=do not 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
@@ -261,6 +263,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 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_lambda_arrow=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
@@ -338,6 +341,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 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_lambda_arrow=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
@@ -392,7 +396,7 @@ 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=80
+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
@@ -407,3 +411,4 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.ui.prefs b/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.ui.prefs
index f8b69410c7..6b6505005b 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -53,7 +53,7 @@ cleanup_profile=_Unmanaged profile 'API Tools Cleanups'
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Unmanaged profile 'API Tools Formatting'
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
 formatter_settings_version=12
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/annotations/ValidEnumAnnotationsTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/annotations/ValidEnumAnnotationsTests.java
index f6fdee0328..cf993db947 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/annotations/ValidEnumAnnotationsTests.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/annotations/ValidEnumAnnotationsTests.java
@@ -51,6 +51,7 @@ public class ValidEnumAnnotationsTests extends InvalidEnumAnnotationsTests {
 		x1(true);
 	}
 
+	@Override
 	public void testInvalidEnumTag1F() {
 		x1(false);
 	}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/org.eclipse.pde.apitools.test.oldshape/src/oldbundle/ApiClazz.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/org.eclipse.pde.apitools.test.oldshape/src/oldbundle/ApiClazz.java
index 297e7b570f..f6fa5ed05e 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/org.eclipse.pde.apitools.test.oldshape/src/oldbundle/ApiClazz.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/org.eclipse.pde.apitools.test.oldshape/src/oldbundle/ApiClazz.java
@@ -11,7 +11,7 @@
 package oldbundle;
 
 /**
- * 
+ *
  */
 public class ApiClazz {
 
diff --git a/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.core.prefs
index c075172a3e..0e9be45a32 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.core.prefs
@@ -126,30 +126,30 @@ org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH

 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

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

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

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

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

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

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

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

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

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=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=32

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

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

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

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

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

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

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

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

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

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

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

+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_resources_in_try=80

+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.alignment_for_union_type_in_multicatch=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

@@ -169,10 +169,11 @@ 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_lambda_body=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=true

+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

@@ -183,7 +184,7 @@ 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=do not insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

 org.eclipse.jdt.core.formatter.comment.line_length=80

 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

@@ -204,7 +205,7 @@ 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.indent_switchstatements_compare_to_switch=false

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

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

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

@@ -214,6 +215,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_label=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_after_type_annotation=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

@@ -232,7 +234,7 @@ 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_arguments=do not 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

@@ -261,6 +263,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 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_lambda_arrow=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

@@ -338,6 +341,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 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_lambda_arrow=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

@@ -392,7 +396,7 @@ 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=80

+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

@@ -407,3 +411,4 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

 org.eclipse.jdt.core.incompatibleJDKLevel=ignore

 org.eclipse.jdt.core.incompleteClasspath=error

+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

diff --git a/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.ui.prefs b/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.ui.prefs
index f8b69410c7..6b6505005b 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -53,7 +53,7 @@ cleanup_profile=_Unmanaged profile 'API Tools Cleanups'
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Unmanaged profile 'API Tools Formatting'
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
 formatter_settings_version=12
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/DirectoryBasedApiBaselineWizardPage.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/DirectoryBasedApiBaselineWizardPage.java
index 59094bbf60..47102c12b1 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/DirectoryBasedApiBaselineWizardPage.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/DirectoryBasedApiBaselineWizardPage.java
@@ -227,6 +227,7 @@ public class DirectoryBasedApiBaselineWizardPage extends ApiBaselineWizardPage {
 	 * Initializes the controls of the page if the profile is not
 	 * <code>null</code>
 	 */
+	@Override
 	protected void initialize() {
 		initializing = true;
 		try {