Bug 449736 - [Tests] Solve whitespace issues in org.eclipse.ui.tests

plug-ins 

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

30 files changed, 108 insertions, 75 deletions

diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jface.tests.databinding.conformance/.settings/org.eclipse.jdt.core.prefs
index 330599f65a6..2fff2512a6f 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/.settings/org.eclipse.jdt.core.prefs
@@ -99,6 +99,7 @@ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 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
@@ -109,15 +110,18 @@ 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
@@ -137,6 +141,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
@@ -153,10 +158,16 @@ 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=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
@@ -172,9 +183,11 @@ 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
@@ -222,6 +235,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
@@ -240,12 +254,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
@@ -269,6 +285,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
@@ -296,6 +313,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
@@ -324,6 +342,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
@@ -333,6 +352,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
@@ -342,11 +362,13 @@ 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=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
@@ -354,7 +376,11 @@ 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.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jface.tests.databinding.conformance/.settings/org.eclipse.jdt.ui.prefs
index 25c80b6ad85..215fbd60adf 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/.settings/org.eclipse.jdt.ui.prefs
@@ -52,7 +52,7 @@ cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
-formatter_settings_version=11
+formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
@@ -70,15 +70,18 @@ sp_cleanup.add_missing_deprecated_annotations=true
 sp_cleanup.add_missing_methods=false
 sp_cleanup.add_missing_nls_tags=false
 sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
 sp_cleanup.add_serial_version_id=false
 sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_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=false
+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
@@ -86,7 +89,7 @@ sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=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
@@ -94,11 +97,12 @@ 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_nls_tags=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
 sp_cleanup.remove_unused_private_fields=true
@@ -107,10 +111,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
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableCollectionContractTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableCollectionContractTest.java
index f553f141e8e..17518b2b0fb 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableCollectionContractTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableCollectionContractTest.java
@@ -36,7 +36,7 @@ import org.eclipse.jface.databinding.conformance.util.SuiteBuilder;
  * and not final in order to allow for consumers to turn off a test if needed by
  * subclassing.
  * </p>
- * 
+ *
  * @since 3.2
  */
 public class MutableObservableCollectionContractTest extends
@@ -299,7 +299,7 @@ public class MutableObservableCollectionContractTest extends
 	 * Asserts that a ChangeEvent is fired once when the provided
 	 * <code>runnable</code> is invoked and the source is the provided
 	 * <code>collection</code>.
-	 * 
+	 *
 	 * @param runnable
 	 * @param methodName
 	 * @param collection
@@ -322,7 +322,7 @@ public class MutableObservableCollectionContractTest extends
 	 * Asserts that when the change event is fired for the action contained in
 	 * the <code>runnable</code> the change will have been applied to the
 	 * <code>collection</code>.
-	 * 
+	 *
 	 * @param runnable
 	 * @param methodName
 	 * @param collection
@@ -350,7 +350,7 @@ public class MutableObservableCollectionContractTest extends
 	 * Asserts that when the change event is fired for the action contained in
 	 * the <code>runnable</code> the change will have been applied to the
 	 * <code>collection</code>.
-	 * 
+	 *
 	 * @param runnable
 	 * @param methodName
 	 * @param collection
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableListContractTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableListContractTest.java
index 1ac6c5aeb37..9b69a404618 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableListContractTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableListContractTest.java
@@ -39,7 +39,7 @@ import org.junit.Assert;
  * and not final in order to allow for consumers to turn off a test if needed by
  * subclassing.
  * </p>
- * 
+ *
  * @since 3.2
  */
 public class MutableObservableListContractTest extends
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableSetContractTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableSetContractTest.java
index 9bb6d8d53b9..ae945e0c534 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableSetContractTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableSetContractTest.java
@@ -300,7 +300,7 @@ public class MutableObservableSetContractTest extends
 
 	/**
 	 * Asserts the set diff entry for an add operation.
-	 * 
+	 *
 	 * @param runnable
 	 * @param methodName
 	 * @param set
@@ -324,7 +324,7 @@ public class MutableObservableSetContractTest extends
 
 	/**
 	 * Asserts the set diff entry for a remove operation.
-	 * 
+	 *
 	 * @param runnable
 	 * @param methodName
 	 * @param set
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableValueContractTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableValueContractTest.java
index 65802950287..28e26ac0790 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableValueContractTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableValueContractTest.java
@@ -25,7 +25,7 @@ import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
 
 /**
  * Mutability tests for IObservableValue.
- * 
+ *
  * <p>
  * This class is experimental and can change at any time. It is recommended to
  * not subclass or assume the test names will not change. The only API that is
@@ -33,7 +33,7 @@ import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
  * and not final in order to allow for consumers to turn off a test if needed by
  * subclassing.
  * </p>
- * 
+ *
  * @since 3.2
  */
 public class MutableObservableValueContractTest extends ObservableDelegateTest {
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableCollectionContractTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableCollectionContractTest.java
index 50b80bdb3ac..f0bfeb67fa4 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableCollectionContractTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableCollectionContractTest.java
@@ -32,7 +32,7 @@ import org.eclipse.jface.databinding.conformance.util.SuiteBuilder;
  * and not final in order to allow for consumers to turn off a test if needed by
  * subclassing.
  * </p>
- * 
+ *
  * @since 3.2
  */
 public class ObservableCollectionContractTest extends ObservableContractTest {
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableContractTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableContractTest.java
index 235a8f62378..84a4dfc2157 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableContractTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableContractTest.java
@@ -37,7 +37,7 @@ import org.eclipse.jface.databinding.conformance.util.SuiteBuilder;
  * and not final in order to allow for consumers to turn off a test if needed by
  * subclassing.
  * </p>
- * 
+ *
  * @since 3.2
  */
 public class ObservableContractTest extends ObservableDelegateTest {
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableDelegateTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableDelegateTest.java
index 31fe1c05ffa..c6555379352 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableDelegateTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableDelegateTest.java
@@ -25,7 +25,7 @@ import org.eclipse.jface.databinding.conformance.util.RealmTester;
 /**
  * TestCase that provides the standard behavior expected for delegating test
  * cases.
- * 
+ *
  * @since 3.2
  */
 public class ObservableDelegateTest extends TestCase {
@@ -73,7 +73,7 @@ public class ObservableDelegateTest extends TestCase {
 	 * Creates a new observable with a default realm. Invoked from
 	 * {@link #setUp()}. Override to customize the creation of observables (e.g.
 	 * specifying a different Realm).
-	 * 
+	 *
 	 * @return observable
 	 */
 	protected IObservable doCreateObservable() {
@@ -84,7 +84,7 @@ public class ObservableDelegateTest extends TestCase {
 	 * Returns the created observable. The observable is created in
 	 * {@link #setUp()}. If invoked before {@link #setUp()} will be
 	 * <code>null</code>.
-	 * 
+	 *
 	 * @return observable
 	 */
 	protected IObservable getObservable() {
@@ -93,7 +93,7 @@ public class ObservableDelegateTest extends TestCase {
 
 	/**
 	 * Returns the delegate in use.
-	 * 
+	 *
 	 * @return delegate
 	 */
 	protected IObservableContractDelegate getObservableContractDelegate() {
@@ -116,7 +116,7 @@ public class ObservableDelegateTest extends TestCase {
 	/**
 	 * Asserts that ObservableTracker.getterCalled(...) is invoked when the
 	 * provided <code>runnable</code> is invoked.
-	 * 
+	 *
 	 * @param runnable
 	 * @param methodName
 	 *            method name to display when displaying a message
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableListContractTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableListContractTest.java
index a02ef446c8e..ed14d741aba 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableListContractTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableListContractTest.java
@@ -29,7 +29,7 @@ import org.eclipse.jface.databinding.conformance.util.SuiteBuilder;
  * and not final in order to allow for consumers to turn off a test if needed by
  * subclassing.
  * </p>
- * 
+ *
  * @since 3.2
  */
 public class ObservableListContractTest extends
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableStaleContractTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableStaleContractTest.java
index af627945c0e..a3f3730bfe8 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableStaleContractTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/ObservableStaleContractTest.java
@@ -136,7 +136,7 @@ public class ObservableStaleContractTest extends ObservableDelegateTest {
 	/**
 	 * Ensures that stale is set to the provided state. Will throw an
 	 * AssertionFailedError if setting of the state is unsuccessful.
-	 * 
+	 *
 	 * @param observable
 	 * @param stale
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableCollectionContractDelegate.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableCollectionContractDelegate.java
index 6113368184c..83589cde27a 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableCollectionContractDelegate.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableCollectionContractDelegate.java
@@ -18,7 +18,7 @@ import org.eclipse.core.databinding.observable.Realm;
 
 /**
  * Abstract implementation of {@link IObservableCollectionContractDelegate}.
- * 
+ *
  * @since 3.2
  */
 public abstract class AbstractObservableCollectionContractDelegate extends
@@ -29,7 +29,7 @@ public abstract class AbstractObservableCollectionContractDelegate extends
 	 * Invokes
 	 * {@link IObservableCollectionContractDelegate#createObservableCollection(Realm, int)}
 	 * .
-	 * 
+	 *
 	 * @param realm
 	 * @return observable
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableContractDelegate.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableContractDelegate.java
index b7e62888b11..36df39694f6 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableContractDelegate.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableContractDelegate.java
@@ -16,7 +16,7 @@ import org.eclipse.core.databinding.observable.IObservable;
 
 /**
  * Abstract implementation of {@link IObservableContractDelegate}.
- * 
+ *
  * @since 1.1
  */
 public abstract class AbstractObservableContractDelegate implements
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableValueContractDelegate.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableValueContractDelegate.java
index 45dd6dfe230..ddd22ee0e90 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableValueContractDelegate.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/AbstractObservableValueContractDelegate.java
@@ -18,7 +18,7 @@ import org.eclipse.core.databinding.observable.value.IObservableValue;
 
 /**
  * Abstract implementation of {@link IObservableValueContractDelegate}.
- * 
+ *
  * @since 1.1
  */
 public abstract class AbstractObservableValueContractDelegate extends
@@ -27,7 +27,7 @@ public abstract class AbstractObservableValueContractDelegate extends
 
 	/**
 	 * Invokes {@link #createObservableValue(Realm)}.
-	 * 
+	 *
 	 * @param realm
 	 * @return observable
 	 */
@@ -38,7 +38,7 @@ public abstract class AbstractObservableValueContractDelegate extends
 
 	/**
 	 * Default implementation returns <code>null</code>.
-	 * 
+	 *
 	 * @param observable
 	 * @return value type
 	 */
@@ -50,7 +50,7 @@ public abstract class AbstractObservableValueContractDelegate extends
 
 	/**
 	 * Default implementation returns <code>null</code>.
-	 * 
+	 *
 	 * @param observable
 	 * @return value
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableCollectionContractDelegate.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableCollectionContractDelegate.java
index 5fb412c2eec..400cb1ed1ad 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableCollectionContractDelegate.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableCollectionContractDelegate.java
@@ -16,14 +16,14 @@ import org.eclipse.core.databinding.observable.Realm;
 
 /**
  * Delegate interface for an IObservableCollection.
- * 
+ *
  * <p>
  * This interface is not intended to be implemented by clients. Clients should
  * instead subclass one of the classes that implement this interface. Note that
  * direct implementers of this interface outside of the framework will be broken
  * in future releases when methods are added to this interface.
  * </p>
- * 
+ *
  * @since 1.1
  */
 public interface IObservableCollectionContractDelegate extends
@@ -31,11 +31,11 @@ public interface IObservableCollectionContractDelegate extends
 	/**
 	 * Creates a new observable collection with the provided
 	 * <code>elementCount</code>.
-	 * 
+	 *
 	 * @param realm realm of the collection
 	 * @param elementCount
 	 *            number of elements to initialize the collection with
-	 * 
+	 *
 	 * @return new observable collection
 	 */
 	public IObservableCollection createObservableCollection(Realm realm, int elementCount);
@@ -44,7 +44,7 @@ public interface IObservableCollectionContractDelegate extends
 	 * Creates a new element of the appropriate type for the provided
 	 * <code>collection</code>. This element will be employed to assert the
 	 * addition and removal of elements in the collection.
-	 * 
+	 *
 	 * @param collection
 	 * @return valid element for the collection
 	 */
@@ -52,7 +52,7 @@ public interface IObservableCollectionContractDelegate extends
 
 	/**
 	 * Returns the expected type of the elements in the collection.
-	 * 
+	 *
 	 * @param collection
 	 * @return element type
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableContractDelegate.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableContractDelegate.java
index bcd59bbf1fd..b0c3b6581dd 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableContractDelegate.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableContractDelegate.java
@@ -16,14 +16,14 @@ import org.eclipse.core.databinding.observable.Realm;
 
 /**
  * Delegate interface for observables.
- * 
+ *
  * <p>
  * This interface is not intended to be implemented by clients. Clients should
  * instead subclass one of the classes that implement this interface. Note that
  * direct implementers of this interface outside of the framework will be broken
  * in future releases when methods are added to this interface.
  * </p>
- * 
+ *
  * @since 1.1
  */
 public interface IObservableContractDelegate {
@@ -40,7 +40,7 @@ public interface IObservableContractDelegate {
 	/**
 	 * Invokes an operation to set the stale state of the provided
 	 * <code>observable</code>.
-	 * 
+	 *
 	 * @param observable
 	 * @param stale
 	 */
@@ -48,7 +48,7 @@ public interface IObservableContractDelegate {
 
 	/**
 	 * Creates a new observable.
-	 * 
+	 *
 	 * @param realm realm of the observable
 	 * @return observable
 	 */
@@ -60,7 +60,7 @@ public interface IObservableContractDelegate {
 	 * resulting in an observable event. There is no guaranteed as to the state
 	 * of the observable when invoked. The observable could be disposed to
 	 * assert the proper behavior of dispose.
-	 * 
+	 *
 	 * @param observable
 	 */
 	public void change(IObservable observable);
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableValueContractDelegate.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableValueContractDelegate.java
index 873b00506bb..16db50eb26c 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableValueContractDelegate.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/delegate/IObservableValueContractDelegate.java
@@ -16,14 +16,14 @@ import org.eclipse.core.databinding.observable.value.IObservableValue;
 
 /**
  * Delegate interface for an observable value.
- * 
+ *
  * <p>
  * This interface is not intended to be implemented by clients. Clients should
  * instead subclass one of the classes that implement this interface. Note that
  * direct implementers of this interface outside of the framework will be broken
  * in future releases when methods are added to this interface.
  * </p>
- * 
+ *
  * @since 1.1
  */
 public interface IObservableValueContractDelegate extends
@@ -31,7 +31,7 @@ public interface IObservableValueContractDelegate extends
 
 	/**
 	 * Creates a new observable value.
-	 * 
+	 *
 	 * @param realm
 	 *            realm of the observable
 	 * @return observable value
@@ -40,15 +40,15 @@ public interface IObservableValueContractDelegate extends
 
 	/**
 	 * Returns the expected type of the observable.
-	 * 
+	 *
 	 * @param observable
 	 * @return type
 	 */
 	public Object getValueType(IObservableValue observable);
-	
+
 	/**
 	 * Returns a valid value that is not the current value of the observable.
-	 * 
+	 *
 	 * @param observable
 	 * @return value
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/swt/SWTMutableObservableValueContractTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/swt/SWTMutableObservableValueContractTest.java
index b8e75b517fb..0c3beee8b0f 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/swt/SWTMutableObservableValueContractTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/swt/SWTMutableObservableValueContractTest.java
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Display;
 
 /**
  * Mutability tests for IObservableValue for a SWT widget.
- * 
+ *
  * <p>
  * This class is experimental and can change at any time. It is recommended to
  * not subclass or assume the test names will not change. The only API that is
@@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Display;
  * and not final in order to allow for consumers to turn off a test if needed by
  * subclassing.
  * </p>
- * 
+ *
  * @since 3.2
  */
 public class SWTMutableObservableValueContractTest extends
@@ -57,7 +57,7 @@ public class SWTMutableObservableValueContractTest extends
 
 	/**
 	 * Creates a new observable passing the realm for the current display.
-	 * 
+	 *
 	 * @return observable
 	 */
 	@Override
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/swt/SWTObservableValueContractTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/swt/SWTObservableValueContractTest.java
index 3294ed8e158..6d658bf7a94 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/swt/SWTObservableValueContractTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/swt/SWTObservableValueContractTest.java
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Display;
  * and not final in order to allow for consumers to turn off a test if needed by
  * subclassing.
  * </p>
- * 
+ *
  * @since 3.2
  */
 public class SWTObservableValueContractTest extends ObservableValueContractTest {
@@ -54,7 +54,7 @@ public class SWTObservableValueContractTest extends ObservableValueContractTest
 
 	/**
 	 * Creates a new observable passing the realm for the current display.
-	 * 
+	 *
 	 * @return observable
 	 */
 	@Override
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ChangeEventTracker.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ChangeEventTracker.java
index 76de956ccc3..dae9f69b4f5 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ChangeEventTracker.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ChangeEventTracker.java
@@ -51,7 +51,7 @@ public class ChangeEventTracker implements IChangeListener {
 
 	/**
 	 * Convenience method to register a new listener.
-	 * 
+	 *
 	 * @param observable
 	 * @return tracker
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/CurrentRealm.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/CurrentRealm.java
index 97c666d8cc7..f5affa05cd3 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/CurrentRealm.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/CurrentRealm.java
@@ -21,7 +21,7 @@ import org.eclipse.core.databinding.observable.Realm;
 /**
  * Allows for the toggling of the current status of the realm. The
  * asyncExec(...) implementations do nothing.
- * 
+ *
  * @since 3.2
  */
 public class CurrentRealm extends Realm {
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/DelegatingRealm.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/DelegatingRealm.java
index 1fbdc37430b..c11dc0ac9c5 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/DelegatingRealm.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/DelegatingRealm.java
@@ -17,7 +17,7 @@ import org.eclipse.core.databinding.observable.Realm;
  * Realm that will delegate to another for all operations except calls to
  * {@link #isCurrent()}. The current status can be set by the consumer to enable
  * testing of realm checks.
- * 
+ *
  * @since 3.2
  */
 public class DelegatingRealm extends CurrentRealm {
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/DisposeEventTracker.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/DisposeEventTracker.java
index 8a447e0bd9a..ae8d5a0c225 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/DisposeEventTracker.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/DisposeEventTracker.java
@@ -51,7 +51,7 @@ public class DisposeEventTracker implements IDisposeListener {
 
 	/**
 	 * Convenience method to register a new listener.
-	 * 
+	 *
 	 * @param observable
 	 * @return tracker
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ListChangeEventTracker.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ListChangeEventTracker.java
index f5eadd0ccfe..5ebaae30211 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ListChangeEventTracker.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ListChangeEventTracker.java
@@ -51,7 +51,7 @@ public class ListChangeEventTracker implements IListChangeListener {
 
 	/**
 	 * Convenience method to register a new listener.
-	 * 
+	 *
 	 * @param observable
 	 * @return tracker
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/MapChangeEventTracker.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/MapChangeEventTracker.java
index a7f8505d700..e5e40cb58f4 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/MapChangeEventTracker.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/MapChangeEventTracker.java
@@ -48,7 +48,7 @@ public class MapChangeEventTracker implements IMapChangeListener {
 
 	/**
 	 * Convenience method to register a new listener.
-	 * 
+	 *
 	 * @param observable
 	 * @return tracker
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/RealmTester.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/RealmTester.java
index 169159a5a87..2978ecc1b5c 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/RealmTester.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/RealmTester.java
@@ -18,7 +18,7 @@ import org.junit.Assert;
 
 /**
  * Aids in the testing of Realms.
- * 
+ *
  * @since 3.2
  */
 public class RealmTester {
@@ -26,7 +26,7 @@ public class RealmTester {
 	/**
 	 * Sets the default realm without using Realm.runWithDefault() for testing
 	 * purposes.
-	 * 
+	 *
 	 * @param realm
 	 */
 	public static void setDefault(Realm realm) {
@@ -40,7 +40,7 @@ public class RealmTester {
 	 * of an observable created before the method was invoked must be of type
 	 * {@link CurrentRealm}. The default realm during the runnable invocation is
 	 * set to an instance of {@link CurrentRealm} when the runnable is invoked.
-	 * 
+	 *
 	 * @param runnable
 	 */
 	public static void exerciseCurrent(Runnable runnable) {
@@ -79,7 +79,7 @@ public class RealmTester {
 	 * Runs the provided <code>runnable</code> when the realm is both current
 	 * and not current. It checks for AssertionFailedExceptions and if an
 	 * exception occurs or doesn't occur as expected the test fails.
-	 * 
+	 *
 	 * @param runnable
 	 * @param realm
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/SetChangeEventTracker.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/SetChangeEventTracker.java
index c4ba3d85b21..01e6abd4f07 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/SetChangeEventTracker.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/SetChangeEventTracker.java
@@ -48,7 +48,7 @@ public class SetChangeEventTracker implements ISetChangeListener {
 
 	/**
 	 * Convenience method to register a new listener.
-	 * 
+	 *
 	 * @param observable
 	 * @return tracker
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/StaleEventTracker.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/StaleEventTracker.java
index 78f89837490..f48c4254d92 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/StaleEventTracker.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/StaleEventTracker.java
@@ -21,7 +21,7 @@ import org.eclipse.core.databinding.observable.StaleEvent;
 
 /**
  * Listener for tracking the firing of StaleEvents.
- * 
+ *
  * @since 1.1
  */
 public class StaleEventTracker implements IStaleListener {
@@ -55,7 +55,7 @@ public class StaleEventTracker implements IStaleListener {
 
 	/**
 	 * Convenience method to register a new listener.
-	 * 
+	 *
 	 * @param observable
 	 * @return tracker
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/SuiteBuilder.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/SuiteBuilder.java
index 46491e1f18c..483be46ef33 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/SuiteBuilder.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/SuiteBuilder.java
@@ -24,7 +24,7 @@ import junit.framework.TestSuite;
 
 /**
  * Builds a test suite.
- * 
+ *
  * @since 1.1
  */
 public class SuiteBuilder {
@@ -37,7 +37,7 @@ public class SuiteBuilder {
 	/**
 	 * Adds all test methods from the provided <code>testCase</code> to the
 	 * suite.
-	 * 
+	 *
 	 * @param testCase
 	 * @return builder
 	 */
@@ -52,7 +52,7 @@ public class SuiteBuilder {
 	 * testCase that accepts a String as the first parameter followed by
 	 * parameters matching the provided parameters. If an appropriate
 	 * constructor is not found an exception will be thrown.
-	 * 
+	 *
 	 * @param testCase
 	 * @param parameters
 	 * @return builder
@@ -75,7 +75,7 @@ public class SuiteBuilder {
 	/**
 	 * Convenience method for invoking
 	 * {@link #addParameterizedTests(Class, Object[])} with a delegate.
-	 * 
+	 *
 	 * @param testCase
 	 * @param delegate
 	 * @return builder
@@ -89,7 +89,7 @@ public class SuiteBuilder {
 
 	/**
 	 * Builds a new TestSuite out of the tests.
-	 * 
+	 *
 	 * @return suite
 	 */
 	public TestSuite build() {
@@ -143,7 +143,7 @@ public class SuiteBuilder {
 	/**
 	 * Returns the constructor that has a String as the first parameters and
 	 * then matches the type of the parameters.
-	 * @param clazz 
+	 * @param clazz
 	 * @param parameters
 	 * @return constructor
 	 */
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ValueChangeEventTracker.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ValueChangeEventTracker.java
index 0e464006dd5..64b6bac2a95 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ValueChangeEventTracker.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/ValueChangeEventTracker.java
@@ -48,7 +48,7 @@ public class ValueChangeEventTracker implements IValueChangeListener {
 
 	/**
 	 * Convenience method to register a new listener.
-	 * 
+	 *
 	 * @param observable
 	 * @return tracker
 	 */