Bug 483443 - Remove unnecessary whitespace from org.eclipse.help.base

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

3 files changed, 52 insertions, 14 deletions

diff --git a/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs
index 07713d80a..3c58490f6 100644
--- a/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs
@@ -101,6 +101,7 @@ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.7

 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

@@ -111,24 +112,28 @@ 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_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_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

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

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

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

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

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

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

+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

@@ -138,23 +143,36 @@ 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=false

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

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

+org.eclipse.jdt.core.formatter.comment.format_block_comments=true

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

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

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

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

@@ -169,15 +187,18 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

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

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

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

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

 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

@@ -189,7 +210,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

@@ -218,6 +239,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

@@ -236,12 +258,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

@@ -265,6 +289,7 @@ 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

@@ -292,6 +317,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

@@ -320,14 +346,17 @@ 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

 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_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

@@ -337,14 +366,23 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 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.join_lines_in_comments=true

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

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

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

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

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

-org.eclipse.jdt.core.formatter.lineSplit=110

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

+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_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

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

diff --git a/org.eclipse.help.base/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.help.base/.settings/org.eclipse.jdt.ui.prefs
index ab6ab1dc8..05634d2db 100644
--- a/org.eclipse.help.base/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.help.base/.settings/org.eclipse.jdt.ui.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_UA
-formatter_settings_version=9
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
+formatter_settings_version=12
 internal.default.compliance=default
 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_annotations=true
 sp_cleanup.add_missing_deprecated_annotations=true
 sp_cleanup.add_missing_methods=false
 sp_cleanup.add_missing_nls_tags=false
@@ -19,8 +19,8 @@ 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=false
-sp_cleanup.format_source_code_changes_only=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=true
 sp_cleanup.make_parameters_final=false
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java
index ec6366119..69f7275f9 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *     Alex Blewitt - Bug 474070 
+ *     Alex Blewitt - Bug 474070
  *******************************************************************************/
 package org.eclipse.help.internal.base.remote;