Bug 449089 - Fix whitespace issues in org.eclipse.e4.core.services I20141125-0800I20141118-0830I20141118-0800I20141111-0830I20141111-0800I20141104-0800I20141029-2000I20141029-0800

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

2 files changed, 57 insertions, 28 deletions

diff --git a/bundles/org.eclipse.e4.core.services/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.core.services/.settings/org.eclipse.jdt.core.prefs
index cf71414ae..dccdcf7ca 100644
--- a/bundles/org.eclipse.e4.core.services/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.core.services/.settings/org.eclipse.jdt.core.prefs
@@ -11,36 +11,40 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6

 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_annotation=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=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_compact_if=52

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48

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

 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_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_superclass_in_type_declaration=64

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=64

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=64

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

+org.eclipse.jdt.core.formatter.blank_lines_after_imports=0

+org.eclipse.jdt.core.formatter.blank_lines_after_package=0

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

+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0

+org.eclipse.jdt.core.formatter.blank_lines_before_method=0

+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=0

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

 org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

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

+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=0

 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

@@ -49,6 +53,7 @@ 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

@@ -64,11 +69,17 @@ org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

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

-org.eclipse.jdt.core.formatter.comment.line_length=100

+org.eclipse.jdt.core.formatter.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

+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

 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.disabling_tag=@formatter\:off

+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

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

+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

 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

@@ -78,7 +89,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=false

+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_field=insert

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

@@ -86,7 +97,9 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

 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

@@ -134,10 +147,11 @@ 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

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

+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not 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

@@ -152,12 +166,14 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invoca
 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_try=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_semicolon_in_try_resources=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

@@ -166,7 +182,7 @@ 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_brace_in_array_initializer=do not 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

@@ -181,13 +197,14 @@ org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invoc
 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_try=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_case=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_default=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_colon_in_labeled_statement=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

@@ -208,12 +225,13 @@ 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

 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_array_initializer=do not 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

@@ -236,6 +254,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invoc
 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_try=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

@@ -245,6 +264,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=inser
 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_semicolon_in_try_resources=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

@@ -260,13 +280,16 @@ 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=100

+org.eclipse.jdt.core.formatter.lineSplit=80

 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.put_empty_statement_on_new_line=false

 org.eclipse.jdt.core.formatter.tabulation.char=tab

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

+org.eclipse.jdt.core.formatter.use_on_off_tags=false

 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.formatter.wrap_before_or_operator_multicatch=true

+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/bundles/org.eclipse.e4.core.services/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.e4.core.services/.settings/org.eclipse.jdt.ui.prefs
index 96041d15e..3400ff15b 100644
--- a/bundles/org.eclipse.e4.core.services/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.e4.core.services/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Eclipse long lines
-formatter_settings_version=11
+formatter_profile=org.eclipse.jdt.ui.default_profile
+formatter_settings_version=12
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=;
 org.eclipse.jdt.ui.ondemandthreshold=99
@@ -19,18 +19,20 @@ 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
 sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
+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=false
+sp_cleanup.on_save_use_additional_actions=true
 sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
@@ -38,10 +40,11 @@ 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
+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
@@ -51,10 +54,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=false
 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