diff options
| author | Mike Rennie | 2013-07-16 16:57:17 +0000 |
|---|---|---|
| committer | Mike Rennie | 2013-07-16 16:57:17 +0000 |
| commit | 44c60018da2e1e14ec6b2d0b0f2b01a71df104fc (patch) | |
| tree | 45b05cd32d2c68aec0046b2204d81a0d40e5645a | |
| parent | 2123eb384fbb6bfe61a03e40ffe6836b2daf4696 (diff) | |
| download | eclipse.platform.debug-44c60018da2e1e14ec6b2d0b0f2b01a71df104fc.tar.gz eclipse.platform.debug-44c60018da2e1e14ec6b2d0b0f2b01a71df104fc.tar.xz eclipse.platform.debug-44c60018da2e1e14ec6b2d0b0f2b01a71df104fc.zip | |
Bug 413095 - Clean up deprecation and code warnings
196 files changed, 7369 insertions, 2757 deletions
diff --git a/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.core.prefs index f37e016fa..5d7a22fe3 100644 --- a/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.core.prefs @@ -125,5 +125,285 @@ org.eclipse.jdt.core.compiler.source=1.3 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_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_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_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +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.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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 +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_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=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_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_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_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.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.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_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 diff --git a/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..13d5dca2c --- /dev/null +++ b/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,109 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_Platform Debug 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_settings_version=12 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=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 +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +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.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +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 +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=true +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_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/org.eclipse.core.externaltools/META-INF/MANIFEST.MF b/org.eclipse.core.externaltools/META-INF/MANIFEST.MF index c507292da..1ecf7ced9 100644 --- a/org.eclipse.core.externaltools/META-INF/MANIFEST.MF +++ b/org.eclipse.core.externaltools/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.core.externaltools;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.0.300.qualifier Bundle-Activator: org.eclipse.core.externaltools.internal.ExternalToolsCore Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.debug.core;bundle-version="[3.6.0,4.0.0)", diff --git a/org.eclipse.core.externaltools/pom.xml b/org.eclipse.core.externaltools/pom.xml index 96fd073c3..9ac8972ab 100644 --- a/org.eclipse.core.externaltools/pom.xml +++ b/org.eclipse.core.externaltools/pom.xml @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.externaltools</artifactId> - <version>1.0.200-SNAPSHOT</version> + <version>1.0.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.core.variables/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.core.variables/.settings/org.eclipse.jdt.core.prefs index 32accb991..5d7a22fe3 100644 --- a/org.eclipse.core.variables/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.core.variables/.settings/org.eclipse.jdt.core.prefs @@ -8,6 +8,7 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault @@ -52,7 +53,9 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled @@ -69,6 +72,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error @@ -89,6 +93,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -113,11 +118,292 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.3 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_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_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_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +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.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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 +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_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=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_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_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_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.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.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_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 diff --git a/org.eclipse.core.variables/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.core.variables/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..13d5dca2c --- /dev/null +++ b/org.eclipse.core.variables/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,109 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_Platform Debug 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_settings_version=12 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=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 +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +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.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +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 +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=true +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_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/org.eclipse.core.variables/META-INF/MANIFEST.MF b/org.eclipse.core.variables/META-INF/MANIFEST.MF index c2cff387d..feba5d297 100644 --- a/org.eclipse.core.variables/META-INF/MANIFEST.MF +++ b/org.eclipse.core.variables/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.variables; singleton:=true -Bundle-Version: 3.2.700.qualifier +Bundle-Version: 3.2.800.qualifier Bundle-Activator: org.eclipse.core.variables.VariablesPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.core.variables/pom.xml b/org.eclipse.core.variables/pom.xml index 59c41c4bc..5985cef68 100644 --- a/org.eclipse.core.variables/pom.xml +++ b/org.eclipse.core.variables/pom.xml @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.variables</artifactId> - <version>3.2.700-SNAPSHOT</version> + <version>3.2.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.debug.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.debug.core/.settings/org.eclipse.jdt.core.prefs index 32accb991..5d7a22fe3 100644 --- a/org.eclipse.debug.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.debug.core/.settings/org.eclipse.jdt.core.prefs @@ -8,6 +8,7 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault @@ -52,7 +53,9 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled @@ -69,6 +72,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error @@ -89,6 +93,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -113,11 +118,292 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.3 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_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_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_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +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.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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 +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_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=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_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_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_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.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.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_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 diff --git a/org.eclipse.debug.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.debug.core/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..13d5dca2c --- /dev/null +++ b/org.eclipse.debug.core/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,109 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_Platform Debug 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_settings_version=12 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=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 +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +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.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +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 +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=true +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_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs index e3662aa86..5d7a22fe3 100644 --- a/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs @@ -1,123 +1,409 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-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.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
+eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=error +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=warning +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.3 +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_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_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_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +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.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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 +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_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=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_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_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_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.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.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_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 diff --git a/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..13d5dca2c --- /dev/null +++ b/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,109 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_Platform Debug 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_settings_version=12 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=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 +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +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.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +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 +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=true +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_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF b/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF index dab713cae..d6aa25d24 100644 --- a/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.core;singleton:=true -Bundle-Version: 1.3.200.qualifier +Bundle-Version: 1.3.300.qualifier Bundle-Activator: org.eclipse.debug.examples.core.pda.DebugCorePlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java b/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java index 11b4c24c8..06e9d2f36 100644 --- a/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java +++ b/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java @@ -8,6 +8,7 @@ * Contributors: * Bjorn Freeman-Benson - initial API and implementation * Pawel Piech (Wind River) - ported PDA Virtual Machine to Java (Bug 261400) + * IBM Coporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.pdavm; @@ -56,7 +57,7 @@ public class PDAVirtualMachine { fName = name; } String fName; - String fGroup = "<no_group>"; + String fGroup = "<no_group>"; //$NON-NLS-1$ boolean fIsWriteable = true; Map fBitFields = new LinkedHashMap(0); int fValue; @@ -91,7 +92,7 @@ public class PDAVirtualMachine { if (fArgs.length > next) { return fArgs[next++]; } - return ""; + return ""; //$NON-NLS-1$ } int getNextIntArg() { @@ -207,7 +208,7 @@ public class PDAVirtualMachine { } void set(String name, Object value) { - if (name.startsWith("$")) { + if (name.startsWith("$")) { //$NON-NLS-1$ setRegisterValue(name, value); } else { fLocalVariables.put(name, value); @@ -215,7 +216,7 @@ public class PDAVirtualMachine { } Object get(String name) { - if (name.startsWith("$")) { + if (name.startsWith("$")) { //$NON-NLS-1$ return getRegisterValue(name); } else { return fLocalVariables.get(name); @@ -314,8 +315,8 @@ public class PDAVirtualMachine { /** The eventstops table holds which events cause suspends and which do not. */ final Map fEventStops = new HashMap(); { - fEventStops.put("unimpinstr", Boolean.FALSE); - fEventStops.put("nosuchlabel", Boolean.FALSE); + fEventStops.put("unimpinstr", Boolean.FALSE); //$NON-NLS-1$ + fEventStops.put("nosuchlabel", Boolean.FALSE); //$NON-NLS-1$ } /** @@ -333,29 +334,29 @@ public class PDAVirtualMachine { public static void main(String[] args) { String programFile = args.length >= 1 ? args[0] : null; if (programFile == null) { - System.err.println("Error: No program specified"); + System.err.println("Error: No program specified"); //$NON-NLS-1$ return; } - String debugFlag = args.length >= 2 ? args[1] : ""; - boolean debug = "-debug".equals(debugFlag); + String debugFlag = args.length >= 2 ? args[1] : ""; //$NON-NLS-1$ + boolean debug = "-debug".equals(debugFlag); //$NON-NLS-1$ int commandPort = 0; int eventPort = 0; if (debug) { - String commandPortStr = args.length >= 3 ? args[2] : ""; + String commandPortStr = args.length >= 3 ? args[2] : ""; //$NON-NLS-1$ try { commandPort = Integer.parseInt(commandPortStr); } catch (NumberFormatException e) { - System.err.println("Error: Invalid command port"); + System.err.println("Error: Invalid command port"); //$NON-NLS-1$ return; } - String eventPortStr = args.length >= 4 ? args[3] : ""; + String eventPortStr = args.length >= 4 ? args[3] : ""; //$NON-NLS-1$ try { eventPort = Integer.parseInt(eventPortStr); } catch (NumberFormatException e) { - System.err.println("Error: Invalid event port"); + System.err.println("Error: Invalid event port"); //$NON-NLS-1$ return; } } @@ -365,7 +366,7 @@ public class PDAVirtualMachine { pdaVM = new PDAVirtualMachine(programFile, debug, commandPort, eventPort); pdaVM.startDebugger(); } catch (IOException e) { - System.err.println("Error: " + e.toString()); + System.err.println("Error: " + e.toString()); //$NON-NLS-1$ return; } pdaVM.run(); @@ -431,17 +432,17 @@ public class PDAVirtualMachine { fEventStream.write('\n'); fEventStream.flush(); } catch (IOException e) { - System.err.println("Error: " + e); + System.err.println("Error: " + e); //$NON-NLS-1$ System.exit(1); } } else if (error) { - System.err.println("Error: " + event); + System.err.println("Error: " + event); //$NON-NLS-1$ } } void startDebugger() throws IOException { if (fDebug) { - System.out.println("-debug " + fCommandPort + " " + fEventPort); + System.out.println("-debug " + fCommandPort + " " + fEventPort); //$NON-NLS-1$ //$NON-NLS-2$ } ServerSocket commandServerSocket = new ServerSocket(fCommandPort); @@ -455,17 +456,17 @@ public class PDAVirtualMachine { fEventStream = new PrintStream(fEventSocket.getOutputStream()); eventServerSocket.close(); - System.out.println("debug connection accepted"); + System.out.println("debug connection accepted"); //$NON-NLS-1$ - fSuspendVM = "client"; + fSuspendVM = "client"; //$NON-NLS-1$ } void run() { int id = fNextThreadId++; - sendDebugEvent("vmstarted", false); - fThreads.put(new Integer(id), new PDAThread(id, "main", 0)); + sendDebugEvent("vmstarted", false); //$NON-NLS-1$ + fThreads.put(new Integer(id), new PDAThread(id, "main", 0)); //$NON-NLS-1$ if (fDebug) { - sendDebugEvent("started " + id, false); + sendDebugEvent("started " + id, false); //$NON-NLS-1$ } boolean allThreadsSuspended = false; @@ -499,21 +500,21 @@ public class PDAVirtualMachine { // If this thread is in a step-return operation, check // if we've returned from a call. instruction = thread.fThreadCode[thread.fCurrentFrame.fPC]; - if ("return".equals(instruction)) { + if ("return".equals(instruction)) { //$NON-NLS-1$ // Note: this will only be triggered if the current // thread also has the fStepReturn flag set. if (fStepReturnVM) { - fSuspendVM = thread.fID + " step"; + fSuspendVM = thread.fID + " step"; //$NON-NLS-1$ } else { - thread.fSuspend = "step"; + thread.fSuspend = "step"; //$NON-NLS-1$ } } } if (!thread.fRun) { - sendDebugEvent("exited " + thread.fID, false); + sendDebugEvent("exited " + thread.fID, false); //$NON-NLS-1$ fThreads.remove(new Integer(thread.fID)); } else if (thread.fSuspend != null) { - sendDebugEvent("suspended " + thread.fID + " " + thread.fSuspend, false); + sendDebugEvent("suspended " + thread.fID + " " + thread.fSuspend, false); //$NON-NLS-1$ //$NON-NLS-2$ thread.fStep = thread.fStepReturn = thread.fPerformingEval = false; } } @@ -524,7 +525,7 @@ public class PDAVirtualMachine { Thread.yield(); } - sendDebugEvent("vmterminated", false); + sendDebugEvent("vmterminated", false); //$NON-NLS-1$ if (fDebug) { try { fCommandReceiveStream.close(); @@ -533,7 +534,7 @@ public class PDAVirtualMachine { fEventStream.close(); fEventSocket.close(); } catch (IOException e) { - System.out.println("Error: " + e); + System.out.println("Error: " + e); //$NON-NLS-1$ } } @@ -549,38 +550,38 @@ public class PDAVirtualMachine { Args args = new Args( (String[])tokens.toArray(new String[tokens.size()]) ); boolean opValid = true; - if (op.equals("add")) iAdd(thread, args); - else if (op.equals("branch_not_zero")) iBranchNotZero(thread, args); - else if (op.equals("call")) iCall(thread, args); - else if (op.equals("dec")) iDec(thread, args); - else if (op.equals("def")) iDef(thread, args); - else if (op.equals("dup")) iDup(thread, args); - else if (op.equals("exec")) iExec(thread, args); - else if (op.equals("halt")) iHalt(thread, args); - else if (op.equals("output")) iOutput(thread, args); - else if (op.equals("pop")) iPop(thread, args); - else if (op.equals("push")) iPush(thread, args); - else if (op.equals("return")) iReturn(thread, args); - else if (op.equals("var")) iVar(thread, args); - else if (op.equals("xyzzy")) iInternalEndEval(thread, args); - else if (op.startsWith(":")) {} // label - else if (op.startsWith("#")) {} // comment + if (op.equals("add")) iAdd(thread, args); //$NON-NLS-1$ + else if (op.equals("branch_not_zero")) iBranchNotZero(thread, args); //$NON-NLS-1$ + else if (op.equals("call")) iCall(thread, args); //$NON-NLS-1$ + else if (op.equals("dec")) iDec(thread, args); //$NON-NLS-1$ + else if (op.equals("def")) iDef(thread, args); //$NON-NLS-1$ + else if (op.equals("dup")) iDup(thread, args); //$NON-NLS-1$ + else if (op.equals("exec")) iExec(thread, args); //$NON-NLS-1$ + else if (op.equals("halt")) iHalt(thread, args); //$NON-NLS-1$ + else if (op.equals("output")) iOutput(thread, args); //$NON-NLS-1$ + else if (op.equals("pop")) iPop(thread, args); //$NON-NLS-1$ + else if (op.equals("push")) iPush(thread, args); //$NON-NLS-1$ + else if (op.equals("return")) iReturn(thread, args); //$NON-NLS-1$ + else if (op.equals("var")) iVar(thread, args); //$NON-NLS-1$ + else if (op.equals("xyzzy")) iInternalEndEval(thread, args); //$NON-NLS-1$ + else if (op.startsWith(":")) {} // label //$NON-NLS-1$ + else if (op.startsWith("#")) {} // comment //$NON-NLS-1$ else { opValid = false; } if (!opValid) { - sendDebugEvent("unimplemented instruction " + op, true); - if ( ((Boolean)fEventStops.get("unimpinstr")).booleanValue() ) { - fSuspendVM = thread.fID + " event unimpinstr"; + sendDebugEvent("unimplemented instruction " + op, true); //$NON-NLS-1$ + if ( ((Boolean)fEventStops.get("unimpinstr")).booleanValue() ) { //$NON-NLS-1$ + fSuspendVM = thread.fID + " event unimpinstr"; //$NON-NLS-1$ thread.fCurrentFrame.fPC--; } } else if (thread.fStep) { if (fStepVM) { - fSuspendVM = thread.fID + " step"; + fSuspendVM = thread.fID + " step"; //$NON-NLS-1$ fStepVM = false; } else { - thread.fSuspend = "step"; + thread.fSuspend = "step"; //$NON-NLS-1$ } thread.fStep = false; } @@ -600,11 +601,11 @@ public class PDAVirtualMachine { fBreakpoints.containsKey(pc)) { if ( ((Boolean)fBreakpoints.get(pc)).booleanValue() ) { - fSuspendVM = thread.fID + " breakpoint " + pc; + fSuspendVM = thread.fID + " breakpoint " + pc; //$NON-NLS-1$ } else { - thread.fSuspend = "breakpoint " + pc; + thread.fSuspend = "breakpoint " + pc; //$NON-NLS-1$ thread.fStep = thread.fStepReturn = false; - sendDebugEvent("suspended " + thread.fID + " " + thread.fSuspend, false); + sendDebugEvent("suspended " + thread.fID + " " + thread.fSuspend, false); //$NON-NLS-1$ //$NON-NLS-2$ } } } @@ -617,14 +618,14 @@ public class PDAVirtualMachine { */ void yieldToDebug(boolean allThreadsSuspended) { if (fDebug) { - String line = ""; + String line = ""; //$NON-NLS-1$ try { if (allThreadsSuspended || fCommandReceiveStream.ready()) { line = fCommandReceiveStream.readLine(); processDebugCommand(line); } } catch (IOException e) { - System.err.println("Error: " + e); + System.err.println("Error: " + e); //$NON-NLS-1$ System.exit(1); } } @@ -635,7 +636,7 @@ public class PDAVirtualMachine { */ void debugUI() { if (!fStarted) { - sendDebugEvent("vmsuspended " + fSuspendVM, false); + sendDebugEvent("vmsuspended " + fSuspendVM, false); //$NON-NLS-1$ } else { fStarted = false; } @@ -650,11 +651,11 @@ public class PDAVirtualMachine { } while (fSuspendVM != null) { - String line = ""; + String line = ""; //$NON-NLS-1$ try { line = fCommandReceiveStream.readLine(); } catch (IOException e) { - System.err.println("Error: " + e); + System.err.println("Error: " + e); //$NON-NLS-1$ System.exit(1); return; } @@ -662,9 +663,9 @@ public class PDAVirtualMachine { } if (fStepVM || fStepReturnVM) { - sendDebugEvent("vmresumed step", false); + sendDebugEvent("vmresumed step", false); //$NON-NLS-1$ } else { - sendDebugEvent("vmresumed client", false); + sendDebugEvent("vmresumed client", false); //$NON-NLS-1$ } } @@ -681,43 +682,43 @@ public class PDAVirtualMachine { } Args args = new Args( (String[])tokens.toArray(new String[tokens.size()])); - if ("children".equals(command)) debugChildren(args); - else if ("clear".equals(command)) debugClearBreakpoint(args); - else if ("data".equals(command)) debugData(args); - else if ("drop".equals(command)) debugDropFrame(args); - else if ("eval".equals(command)) debugEval(args); - else if ("eventstop".equals(command)) debugEventStop(args); - else if ("frame".equals(command)) debugFrame(args); - else if ("groups".equals(command)) debugGroups(args); - else if ("popdata".equals(command)) debugPopData(args); - else if ("pushdata".equals(command)) debugPushData(args); - else if ("registers".equals(command)) debugRegisters(args); - else if ("restart".equals(command)) debugRestart(args); - else if ("resume".equals(command)) debugResume(args); - else if ("set".equals(command)) debugSetBreakpoint(args); - else if ("setdata".equals(command)) debugSetData(args); - else if ("setvar".equals(command)) debugSetVariable(args); - else if ("stack".equals(command)) debugStack(args); - else if ("stackdepth".equals(command)) debugStackDepth(args); - else if ("state".equals(command)) debugState(args); - else if ("step".equals(command)) debugStep(args); - else if ("stepreturn".equals(command)) debugStepReturn(args); - else if ("suspend".equals(command)) debugSuspend(args); - else if ("terminate".equals(command)) debugTerminate(); - else if ("threads".equals(command)) debugThreads(); - else if ("var".equals(command)) debugVar(args); - else if ("vmresume".equals(command)) debugVMResume(); - else if ("vmsuspend".equals(command)) debugVMSuspend(); - else if ("watch".equals(command)) debugWatch(args); + if ("children".equals(command)) debugChildren(args); //$NON-NLS-1$ + else if ("clear".equals(command)) debugClearBreakpoint(args); //$NON-NLS-1$ + else if ("data".equals(command)) debugData(args); //$NON-NLS-1$ + else if ("drop".equals(command)) debugDropFrame(args); //$NON-NLS-1$ + else if ("eval".equals(command)) debugEval(args); //$NON-NLS-1$ + else if ("eventstop".equals(command)) debugEventStop(args); //$NON-NLS-1$ + else if ("frame".equals(command)) debugFrame(args); //$NON-NLS-1$ + else if ("groups".equals(command)) debugGroups(args); //$NON-NLS-1$ + else if ("popdata".equals(command)) debugPopData(args); //$NON-NLS-1$ + else if ("pushdata".equals(command)) debugPushData(args); //$NON-NLS-1$ + else if ("registers".equals(command)) debugRegisters(args); //$NON-NLS-1$ + else if ("restart".equals(command)) debugRestart(args); //$NON-NLS-1$ + else if ("resume".equals(command)) debugResume(args); //$NON-NLS-1$ + else if ("set".equals(command)) debugSetBreakpoint(args); //$NON-NLS-1$ + else if ("setdata".equals(command)) debugSetData(args); //$NON-NLS-1$ + else if ("setvar".equals(command)) debugSetVariable(args); //$NON-NLS-1$ + else if ("stack".equals(command)) debugStack(args); //$NON-NLS-1$ + else if ("stackdepth".equals(command)) debugStackDepth(args); //$NON-NLS-1$ + else if ("state".equals(command)) debugState(args); //$NON-NLS-1$ + else if ("step".equals(command)) debugStep(args); //$NON-NLS-1$ + else if ("stepreturn".equals(command)) debugStepReturn(args); //$NON-NLS-1$ + else if ("suspend".equals(command)) debugSuspend(args); //$NON-NLS-1$ + else if ("terminate".equals(command)) debugTerminate(); //$NON-NLS-1$ + else if ("threads".equals(command)) debugThreads(); //$NON-NLS-1$ + else if ("var".equals(command)) debugVar(args); //$NON-NLS-1$ + else if ("vmresume".equals(command)) debugVMResume(); //$NON-NLS-1$ + else if ("vmsuspend".equals(command)) debugVMSuspend(); //$NON-NLS-1$ + else if ("watch".equals(command)) debugWatch(args); //$NON-NLS-1$ else { - sendCommandResponse("error: invalid command\n"); + sendCommandResponse("error: invalid command\n"); //$NON-NLS-1$ } } void debugChildren(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -727,7 +728,7 @@ public class PDAVirtualMachine { Frame frame = sfnumber >= thread.fFrames.size() ? thread.fCurrentFrame : (Frame)thread.fFrames.get(sfnumber); - String varDot = var + "."; + String varDot = var + "."; //$NON-NLS-1$ List children = new ArrayList(); for (Iterator itr = frame.fLocalVariables.keySet().iterator(); itr.hasNext();) { String localVar = (String)itr.next(); @@ -750,15 +751,15 @@ public class PDAVirtualMachine { int line = args.getNextIntArg(); fBreakpoints.remove( new Integer(line) ); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } - private static Pattern fPackPattern = Pattern.compile("%([a-fA-F0-9][a-fA-F0-9])"); + private static Pattern fPackPattern = Pattern.compile("%([a-fA-F0-9][a-fA-F0-9])"); //$NON-NLS-1$ void debugData(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -774,7 +775,7 @@ public class PDAVirtualMachine { void debugDropFrame(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -782,34 +783,34 @@ public class PDAVirtualMachine { thread.fCurrentFrame = (Frame)thread.fFrames.remove(thread.fFrames.size() - 1); } thread.fCurrentFrame.fPC--; - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ if (fSuspendVM != null) { - sendDebugEvent("vmresumed drop", false); - sendDebugEvent("vmsuspended " + thread.fID + " drop", false); + sendDebugEvent("vmresumed drop", false); //$NON-NLS-1$ + sendDebugEvent("vmsuspended " + thread.fID + " drop", false); //$NON-NLS-1$ //$NON-NLS-2$ } else { - sendDebugEvent("resumed " + thread.fID + " drop", false); - sendDebugEvent("suspended " + thread.fID + " drop", false); + sendDebugEvent("resumed " + thread.fID + " drop", false); //$NON-NLS-1$ //$NON-NLS-2$ + sendDebugEvent("suspended " + thread.fID + " drop", false); //$NON-NLS-1$ //$NON-NLS-2$ } } void debugEval(Args args) { if (fSuspendVM != null) { - sendCommandResponse("error: cannot evaluate while vm is suspended\n"); + sendCommandResponse("error: cannot evaluate while vm is suspended\n"); //$NON-NLS-1$ return; } PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } if (thread.fSuspend == null) { - sendCommandResponse("error: thread running\n"); + sendCommandResponse("error: thread running\n"); //$NON-NLS-1$ return; } - StringTokenizer tokenizer = new StringTokenizer(args.getNextStringArg(), "|"); + StringTokenizer tokenizer = new StringTokenizer(args.getNextStringArg(), "|"); //$NON-NLS-1$ tokenizer.countTokens(); int numEvalLines = tokenizer.countTokens(); @@ -834,7 +835,7 @@ public class PDAVirtualMachine { } thread.fThreadCode[fCode.length + i] = lineBuf.toString(); } - thread.fThreadCode[fCode.length + numEvalLines] = "xyzzy"; + thread.fThreadCode[fCode.length + numEvalLines] = "xyzzy"; //$NON-NLS-1$ thread.fThreadLabels = mapLabels(fCode); thread.fSavedPC = thread.fCurrentFrame.fPC; @@ -843,28 +844,28 @@ public class PDAVirtualMachine { thread.fSuspend = null; - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ - sendDebugEvent("resumed " + thread.fID + " eval", false); + sendDebugEvent("resumed " + thread.fID + " eval", false); //$NON-NLS-1$ //$NON-NLS-2$ } void debugEventStop(Args args) { String event = args.getNextStringArg(); int stop = args.getNextIntArg(); fEventStops.put(event, new Boolean(stop > 0)); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugTerminate() { - sendCommandResponse("ok\n"); - sendDebugEvent("vmterminated", false); + sendCommandResponse("ok\n"); //$NON-NLS-1$ + sendDebugEvent("vmterminated", false); //$NON-NLS-1$ System.exit(0); } void debugFrame(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -875,9 +876,12 @@ public class PDAVirtualMachine { } else { frame = (Frame)thread.fFrames.get(sfnumber); } - sendCommandResponse(printFrame(frame) + "\n"); + sendCommandResponse(printFrame(frame) + "\n"); //$NON-NLS-1$ } + /** + * @param args + */ void debugGroups(Args args) { TreeSet groups = new TreeSet(); for (Iterator itr = fRegisters.values().iterator(); itr.hasNext();) { @@ -896,24 +900,24 @@ public class PDAVirtualMachine { void debugPopData(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } thread.fStack.pop(); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugPushData(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } Object val = args.getNextIntOrStringArg(); thread.fStack.push(val); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugRegisters(Args args) { @@ -951,43 +955,46 @@ public class PDAVirtualMachine { sendCommandResponse(response.toString()); } + /** + * @param args + */ void debugRestart(Args args) { - fSuspendVM = "restart"; + fSuspendVM = "restart"; //$NON-NLS-1$ for (Iterator itr = fThreads.keySet().iterator(); itr.hasNext();) { Integer id = (Integer)itr.next(); - sendDebugEvent("exited " + id, false); + sendDebugEvent("exited " + id, false); //$NON-NLS-1$ } fThreads.clear(); int id = fNextThreadId++; - fThreads.put(new Integer(id), new PDAThread(id, "main", 0)); - sendDebugEvent("started " + id, false); + fThreads.put(new Integer(id), new PDAThread(id, "main", 0)); //$NON-NLS-1$ + sendDebugEvent("started " + id, false); //$NON-NLS-1$ fRegisters.clear(); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugResume(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } if (fSuspendVM != null) { - sendCommandResponse("error: cannot resume thread when vm is suspended\n"); + sendCommandResponse("error: cannot resume thread when vm is suspended\n"); //$NON-NLS-1$ return; } if (thread.fSuspend == null) { - sendCommandResponse("error: thread already running\n"); + sendCommandResponse("error: thread already running\n"); //$NON-NLS-1$ return; } thread.fSuspend = null; - sendDebugEvent("resumed " + thread.fID + " client", false); + sendDebugEvent("resumed " + thread.fID + " client", false); //$NON-NLS-1$ //$NON-NLS-2$ - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugSetBreakpoint(Args args) { @@ -995,13 +1002,13 @@ public class PDAVirtualMachine { int stopVM = args.getNextIntArg(); fBreakpoints.put(new Integer(line), new Boolean(stopVM != 0)); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugSetData(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1013,13 +1020,13 @@ public class PDAVirtualMachine { } else { thread.fStack.add(0, val); } - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugSetVariable(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1027,7 +1034,7 @@ public class PDAVirtualMachine { String var = args.getNextStringArg(); Object val = args.getNextIntOrStringArg(); while (args.hasNextArg()) { - val = val.toString() + " " + args.getNextStringArg(); + val = val.toString() + " " + args.getNextStringArg(); //$NON-NLS-1$ } if (sfnumber >= thread.fFrames.size()) { @@ -1035,13 +1042,13 @@ public class PDAVirtualMachine { } else { ((Frame)thread.fFrames.get(sfnumber)).set(var, val); } - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugStack(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1060,10 +1067,10 @@ public class PDAVirtualMachine { void debugStackDepth(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } - sendCommandResponse( Integer.toString(thread.fFrames.size() + 1) + "\n" ); + sendCommandResponse( Integer.toString(thread.fFrames.size() + 1) + "\n" ); //$NON-NLS-1$ } @@ -1092,19 +1099,19 @@ public class PDAVirtualMachine { PDAThread thread = args.getThreadArg(); String response = null; if (thread == null) { - response = fSuspendVM == null ? "running" : fSuspendVM; + response = fSuspendVM == null ? "running" : fSuspendVM; //$NON-NLS-1$ } else if (fSuspendVM != null) { - response = "vm"; + response = "vm"; //$NON-NLS-1$ } else { - response = thread.fSuspend == null ? "running" : thread.fSuspend; + response = thread.fSuspend == null ? "running" : thread.fSuspend; //$NON-NLS-1$ } - sendCommandResponse(response + "\n"); + sendCommandResponse(response + "\n"); //$NON-NLS-1$ } void debugStep(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1123,20 +1130,20 @@ public class PDAVirtualMachine { thread.fStep = true; } else { if (thread.fSuspend == null) { - sendCommandResponse("error: thread already running\n"); + sendCommandResponse("error: thread already running\n"); //$NON-NLS-1$ return; } thread.fSuspend = null; thread.fStep = true; - sendDebugEvent("resumed " + thread.fID + " step", false); + sendDebugEvent("resumed " + thread.fID + " step", false); //$NON-NLS-1$ //$NON-NLS-2$ } - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugStepReturn(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1146,34 +1153,34 @@ public class PDAVirtualMachine { thread.fStepReturn = true; } else { if (thread.fSuspend == null) { - sendCommandResponse("error: thread running\n"); + sendCommandResponse("error: thread running\n"); //$NON-NLS-1$ return; } thread.fSuspend = null; thread.fStepReturn = true; - sendDebugEvent("resumed " + thread.fID + " step", false); + sendDebugEvent("resumed " + thread.fID + " step", false); //$NON-NLS-1$ //$NON-NLS-2$ } - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugSuspend(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } if (fSuspendVM != null) { - sendCommandResponse("error: vm already suspended\n"); + sendCommandResponse("error: vm already suspended\n"); //$NON-NLS-1$ return; } if (thread.fSuspend != null) { - sendCommandResponse("error: thread already suspended\n"); + sendCommandResponse("error: thread already suspended\n"); //$NON-NLS-1$ return; } - thread.fSuspend = "client"; - sendDebugEvent("suspended " + thread.fID + " client", false); - sendCommandResponse("ok\n"); + thread.fSuspend = "client"; //$NON-NLS-1$ + sendDebugEvent("suspended " + thread.fID + " client", false); //$NON-NLS-1$ //$NON-NLS-2$ + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugThreads() { @@ -1182,13 +1189,13 @@ public class PDAVirtualMachine { response.append(itr.next()); response.append(' '); } - sendCommandResponse(response.toString().trim() + "\n"); + sendCommandResponse(response.toString().trim() + "\n"); //$NON-NLS-1$ } void debugVar(Args args) { PDAThread thread = args.getThreadArg(); if (thread == null) { - sendCommandResponse("error: invalid thread\n"); + sendCommandResponse("error: invalid thread\n"); //$NON-NLS-1$ return; } @@ -1200,39 +1207,43 @@ public class PDAVirtualMachine { Object val = frame.get(var); if (val == null) { - sendCommandResponse("error: variable undefined\n"); + sendCommandResponse("error: variable undefined\n"); //$NON-NLS-1$ } else { - sendCommandResponse(val.toString() + "\n"); + sendCommandResponse(val.toString() + "\n"); //$NON-NLS-1$ } } void debugVMResume() { if (fSuspendVM == null) { - sendCommandResponse("error: vm already running\n"); + sendCommandResponse("error: vm already running\n"); //$NON-NLS-1$ return; } fSuspendVM = null; - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugVMSuspend() { if (fSuspendVM != null) { - sendCommandResponse("error: vm already suspended\n"); + sendCommandResponse("error: vm already suspended\n"); //$NON-NLS-1$ return; } - fSuspendVM = "client"; - sendCommandResponse("ok\n"); + fSuspendVM = "client"; //$NON-NLS-1$ + sendCommandResponse("ok\n"); //$NON-NLS-1$ } void debugWatch(Args args) { String funcAndVar = args.getNextStringArg(); int flags = args.getNextIntArg(); fWatchpoints.put(funcAndVar, new Integer(flags)); - sendCommandResponse("ok\n"); + sendCommandResponse("ok\n"); //$NON-NLS-1$ } + /** + * @param thread + * @param args + */ void iAdd(PDAThread thread, Args args) { Object val1 = thread.fStack.pop(); Object val2 = thread.fStack.pop(); @@ -1252,9 +1263,9 @@ public class PDAVirtualMachine { if (thread.fThreadLabels.containsKey(label)) { thread.fCurrentFrame.fPC = ((Integer)thread.fThreadLabels.get(label)).intValue(); } else { - sendDebugEvent("no such label " + label, true); - if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { - fSuspendVM = thread.fID + " event nosuchlabel"; + sendDebugEvent("no such label " + label, true); //$NON-NLS-1$ + if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { //$NON-NLS-1$ + fSuspendVM = thread.fID + " event nosuchlabel"; //$NON-NLS-1$ thread.fStack.push(val); thread.fCurrentFrame.fPC--; } @@ -1268,14 +1279,18 @@ public class PDAVirtualMachine { thread.fFrames.add(thread.fCurrentFrame); thread.fCurrentFrame = new Frame(label, ((Integer)thread.fThreadLabels.get(label)).intValue()); } else { - sendDebugEvent("no such label " + label, true); - if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { - fSuspendVM = thread.fID + " event nosuchlabel"; + sendDebugEvent("no such label " + label, true); //$NON-NLS-1$ + if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { //$NON-NLS-1$ + fSuspendVM = thread.fID + " event nosuchlabel"; //$NON-NLS-1$ thread.fCurrentFrame.fPC--; } } } + /** + * @param thread + * @param args + */ void iDec(PDAThread thread, Args args) { Object val = thread.fStack.pop(); if (val instanceof Integer) { @@ -1284,6 +1299,10 @@ public class PDAVirtualMachine { thread.fStack.push(val); } + /** + * @param thread + * @param args + */ void iDef(PDAThread thread, Args args) { String type = args.getNextStringArg(); @@ -1291,30 +1310,30 @@ public class PDAVirtualMachine { String regName = getRegisterPartOfName(name); String bitFieldName = getBitFieldPartOfName(name); - if ("register".equals(type)) { + if ("register".equals(type)) { //$NON-NLS-1$ Register reg = new Register(regName); reg.fGroup = args.getNextStringArg(); fRegisters.put(regName, reg); reg.fIsWriteable = args.getNextBooleanArg(); - } else if ("bitfield".equals(type)) { + } else if ("bitfield".equals(type)) { //$NON-NLS-1$ Register reg = (Register)fRegisters.get(regName); if (reg == null) return; BitField bitField = new BitField(bitFieldName); bitField.fBitOffset = args.getNextIntArg(); bitField.fBitCount = args.getNextIntArg(); reg.fBitFields.put(bitFieldName, bitField); - } else if ("mnemonic".equals(type)) { + } else if ("mnemonic".equals(type)) { //$NON-NLS-1$ Register reg = (Register)fRegisters.get(regName); if (reg == null) return; BitField bitField = (BitField)reg.fBitFields.get(bitFieldName); if (bitField == null) return; bitField.fMnemonics.put(args.getNextStringArg(), new Integer(args.getNextIntArg())); } - sendDebugEvent("registers", false); + sendDebugEvent("registers", false); //$NON-NLS-1$ } private String getRegisterPartOfName(String name) { - if (name.startsWith("$")) { + if (name.startsWith("$")) { //$NON-NLS-1$ int end = name.indexOf('.'); end = end != -1 ? end : name.length(); return name.substring(1, end); @@ -1324,12 +1343,16 @@ public class PDAVirtualMachine { private String getBitFieldPartOfName(String name) { int start = name.indexOf('.'); - if (name.startsWith("$") && start != -1) { + if (name.startsWith("$") && start != -1) { //$NON-NLS-1$ return name.substring(start + 1, name.length()); } return null; } + /** + * @param thread + * @param args + */ void iDup(PDAThread thread, Args args) { Object val = thread.fStack.pop(); thread.fStack.push(val); @@ -1341,32 +1364,40 @@ public class PDAVirtualMachine { if (fLabels.containsKey(label)) { int id = fNextThreadId++; fThreads.put( new Integer(id), new PDAThread(id, label, ((Integer)fLabels.get(label)).intValue()) ); - sendDebugEvent("started " + id, false); + sendDebugEvent("started " + id, false); //$NON-NLS-1$ } else { - sendDebugEvent("no such label " + label, true); - if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { - thread.fSuspend = "event nosuchlabel"; + sendDebugEvent("no such label " + label, true); //$NON-NLS-1$ + if ( ((Boolean)fEventStops.get("nosuchlabel")).booleanValue() ) { //$NON-NLS-1$ + thread.fSuspend = "event nosuchlabel"; //$NON-NLS-1$ thread.fCurrentFrame.fPC--; } } } + /** + * @param thread + * @param args + */ void iHalt(PDAThread thread, Args args) { thread.fRun = false; } + /** + * @param thread + * @param args + */ void iOutput(PDAThread thread, Args args) { System.out.println(thread.fStack.pop()); } void iPop(PDAThread thread, Args args) { String arg = args.getNextStringArg(); - if (arg.startsWith("$")) { + if (arg.startsWith("$")) { //$NON-NLS-1$ String var = arg.substring(1); thread.fCurrentFrame.set(var, thread.fStack.pop()); - String key = thread.fCurrentFrame.fFunction + "::" + var; + String key = thread.fCurrentFrame.fFunction + "::" + var; //$NON-NLS-1$ if ( fWatchpoints.containsKey(key) && (((Integer)fWatchpoints.get(key)).intValue() & 2) != 0 ) { - fSuspendVM = thread.fID + " watch write " + key; + fSuspendVM = thread.fID + " watch write " + key; //$NON-NLS-1$ } } else { thread.fStack.pop(); @@ -1376,20 +1407,20 @@ public class PDAVirtualMachine { void iPush(PDAThread thread, Args args) { String arg = args.getNextStringArg(); while (arg.length() != 0) { - if (arg.startsWith("$")) { + if (arg.startsWith("$")) { //$NON-NLS-1$ String var = arg.substring(1); Object val = thread.fCurrentFrame.get(var); - if (val == null) val = "<undefined>"; + if (val == null) val = "<undefined>"; //$NON-NLS-1$ thread.fStack.push(val); - String key = thread.fCurrentFrame.fFunction + "::" + var; + String key = thread.fCurrentFrame.fFunction + "::" + var; //$NON-NLS-1$ if (fWatchpoints.containsKey(key) && (((Integer)fWatchpoints.get(key)).intValue() & 1) != 0) { - fSuspendVM = thread.fID + " watch read " + key; + fSuspendVM = thread.fID + " watch read " + key; //$NON-NLS-1$ } } else { Object val = arg; if (args.hasNextArg()) { while (args.hasNextArg()) { - val = val.toString() + " " + args.getNextStringArg(); + val = val.toString() + " " + args.getNextStringArg(); //$NON-NLS-1$ } } else { try { @@ -1404,6 +1435,10 @@ public class PDAVirtualMachine { } } + /** + * @param thread + * @param args + */ void iReturn(PDAThread thread, Args args) { if (!thread.fFrames.isEmpty()) { thread.fCurrentFrame = (Frame)thread.fFrames.remove(thread.fFrames.size() - 1); @@ -1419,13 +1454,17 @@ public class PDAVirtualMachine { thread.fCurrentFrame.set(var, new Integer(0)); } + /** + * @param thread + * @param args + */ void iInternalEndEval(PDAThread thread, Args args) { Object result = thread.fStack.pop(); thread.fThreadCode = fCode; thread.fThreadLabels = fLabels; thread.fCurrentFrame.fPC = thread.fSavedPC; - sendDebugEvent("evalresult " + result, false); - thread.fSuspend = "eval"; + sendDebugEvent("evalresult " + result, false); //$NON-NLS-1$ + thread.fSuspend = "eval"; //$NON-NLS-1$ thread.fPerformingEval = false; } diff --git a/org.eclipse.debug.examples.core/pom.xml b/org.eclipse.debug.examples.core/pom.xml index 04c89dada..16a8c4b5f 100644 --- a/org.eclipse.debug.examples.core/pom.xml +++ b/org.eclipse.debug.examples.core/pom.xml @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.debug</groupId> <artifactId>org.eclipse.debug.examples.core</artifactId> - <version>1.3.200-SNAPSHOT</version> + <version>1.3.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java index 639f1acf5..f972867d8 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/ClockControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,7 +27,7 @@ public class ClockControl extends TimeControl { * @param launch */ public ClockControl(MidiLaunch launch) { - super("Time" , launch); + super("Time" , launch); //$NON-NLS-1$ } /* (non-Javadoc) @@ -84,7 +84,7 @@ public class ClockControl extends TimeControl { return secs * 1000000; } } catch (NumberFormatException e) { - throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Time must be an integer (seconds) or 00:00 (minutes:seconds) format", e)); + throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Time must be an integer (seconds) or 00:00 (minutes:seconds) format", e)); //$NON-NLS-1$ } return 0L; } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java index 3a754c91a..01e63a6b9 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/LengthControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ public class LengthControl extends TimeControl { * @param launch */ public LengthControl(MidiLaunch launch) { - super("Duration" , launch); + super("Duration" , launch); //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java index 59e3131e8..fbd531236 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/MidiLaunchDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -44,25 +44,25 @@ public class MidiLaunchDelegate extends LaunchConfigurationDelegate { * Identifier for the MIDI launch configuration type * (value <code>midi.launchType</code>) */ - public static final String ID_MIDI_LAUNCH_CONFIGURATION_TYPE = "midi.launchType"; + public static final String ID_MIDI_LAUNCH_CONFIGURATION_TYPE = "midi.launchType"; //$NON-NLS-1$ /** * Launch configuration attribute for the MIDI file to play * (value <code>midi.file</code>) */ - public static final String ATTR_MIDI_FILE = "midi.file"; + public static final String ATTR_MIDI_FILE = "midi.file"; //$NON-NLS-1$ /** * Launch configuration attribute for the MIDI launcher. Specifies whether to throw * an exception when present. Value is one of <code>HANDLED</code> or <code>UNHANDLED</code>. */ - public static final String ATTR_THROW_EXCEPTION = "throw.exception"; + public static final String ATTR_THROW_EXCEPTION = "throw.exception"; //$NON-NLS-1$ /** * Possible values for the <code>ATTR_THROW_EXCEPTION</code>. */ - public static final String HANDLED = "HANDLED"; - public static final String UNHANDLED = "UNHANDLED"; + public static final String HANDLED = "HANDLED"; //$NON-NLS-1$ + public static final String UNHANDLED = "UNHANDLED"; //$NON-NLS-1$ /* (non-Javadoc) * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor) @@ -71,19 +71,19 @@ public class MidiLaunchDelegate extends LaunchConfigurationDelegate { String excep = configuration.getAttribute(ATTR_THROW_EXCEPTION, (String)null); if (excep != null) { if (HANDLED.equals(excep)) { - throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, 303, "Test handled exception during launch", null)); + throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, 303, "Test handled exception during launch", null)); //$NON-NLS-1$ } else { - throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Test unhandled exception during launch", new Error("Test unhandled exception during launch"))); + throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Test unhandled exception during launch", new Error("Test unhandled exception during launch"))); //$NON-NLS-1$ //$NON-NLS-2$ } } String fileName = configuration.getAttribute(ATTR_MIDI_FILE, (String)null); if (fileName == null) { - abort("MIDI file not specified.", null); + abort("MIDI file not specified.", null); //$NON-NLS-1$ } IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); IFile file = root.getFile(new Path(fileName)); if (!file.exists()) { - abort("MIDI file does not exist.", null); + abort("MIDI file does not exist.", null); //$NON-NLS-1$ } Sequencer sequencer = null; MidiFileFormat fileFormat = null; @@ -95,24 +95,29 @@ public class MidiLaunchDelegate extends LaunchConfigurationDelegate { fileFormat = MidiSystem.getMidiFileFormat(location.toFile()); } } catch (MidiUnavailableException e) { - abort("Cannot initialize sequencer.", e); + abort("Cannot initialize sequencer.", e); //$NON-NLS-1$ } catch (InvalidMidiDataException e) { - abort("Invalid MIDI file.", e); + abort("Invalid MIDI file.", e); //$NON-NLS-1$ } catch (IOException e) { - abort("Error reading MIDI file.", e); + abort("Error reading MIDI file.", e); //$NON-NLS-1$ } - BufferedInputStream stream = new BufferedInputStream(file.getContents()); - try { - sequencer.setSequence(stream); - } catch (IOException e) { - abort("Error reading MIDI file", e); - } catch (InvalidMidiDataException e) { - abort("Inavlid MIDI file.", e); + if(sequencer != null) { + BufferedInputStream stream = new BufferedInputStream(file.getContents()); + try { + sequencer.setSequence(stream); + } catch (IOException e) { + abort("Error reading MIDI file", e); //$NON-NLS-1$ + } catch (InvalidMidiDataException e) { + abort("Inavlid MIDI file.", e); //$NON-NLS-1$ + } + MidiLaunch midiLaunch = (MidiLaunch)launch; + midiLaunch.setSequencer(sequencer); + midiLaunch.setFormat(fileFormat); + sequencer.start(); + } + else { + abort("Could not create the sequencer", null); //$NON-NLS-1$ } - MidiLaunch midiLaunch = (MidiLaunch)launch; - midiLaunch.setSequencer(sequencer); - midiLaunch.setFormat(fileFormat); - sequencer.start(); } /** diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java index feb3b32e4..28def4594 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/midi/launcher/TempoControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,7 +27,7 @@ public class TempoControl extends SequencerControl { * Constructs a tempo control for the given launch. */ public TempoControl(MidiLaunch launch) { - super("Tempo (BPM)", launch); + super("Tempo (BPM)", launch); //$NON-NLS-1$ } /* (non-Javadoc) @@ -82,7 +82,7 @@ public class TempoControl extends SequencerControl { try { return Float.parseFloat(value); } catch (NumberFormatException e) { - throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Tempo must be a number", e)); + throw new CoreException(new Status(IStatus.ERROR, DebugCorePlugin.PLUGIN_ID, "Tempo must be a number", e)); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java index 2fe236a43..dbdb1fc85 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,30 +35,30 @@ public class DebugCorePlugin extends Plugin { * Unique identifier for the PDA debug model (value * <code>pda.debugModel</code>). */ - public static final String ID_PDA_DEBUG_MODEL = "pda.debugModel"; + public static final String ID_PDA_DEBUG_MODEL = "pda.debugModel"; //$NON-NLS-1$ /** * Name of the string substitution variable that resolves to the * location of a local Perl executable (value <code>perlExecutable</code>). */ - public static final String VARIALBE_PERL_EXECUTABLE = "perlExecutable"; + public static final String VARIALBE_PERL_EXECUTABLE = "perlExecutable"; //$NON-NLS-1$ /** * Launch configuration attribute key. Value is a path to a Perl * program. The path is a string representing a full path * to a Perl program in the workspace. */ - public static final String ATTR_PDA_PROGRAM = ID_PDA_DEBUG_MODEL + ".ATTR_PDA_PROGRAM"; + public static final String ATTR_PDA_PROGRAM = ID_PDA_DEBUG_MODEL + ".ATTR_PDA_PROGRAM"; //$NON-NLS-1$ /** * Identifier for the PDA launch configuration type * (value <code>pda.launchType</code>) */ - public static final String ID_PDA_LAUNCH_CONFIGURATION_TYPE = "pda.launchType"; + public static final String ID_PDA_LAUNCH_CONFIGURATION_TYPE = "pda.launchType"; //$NON-NLS-1$ /** * Plug-in identifier. */ - public static final String PLUGIN_ID = "org.eclipse.debug.examples.core"; + public static final String PLUGIN_ID = "org.eclipse.debug.examples.core"; //$NON-NLS-1$ /** * The constructor. @@ -110,7 +110,7 @@ public class DebugCorePlugin extends Plugin { public ResourceBundle getResourceBundle() { try { if (resourceBundle == null) - resourceBundle = ResourceBundle.getBundle("org.eclipse.debug.examples.core.pda.DebugCorePluginResources"); + resourceBundle = ResourceBundle.getBundle("org.eclipse.debug.examples.core.pda.DebugCorePluginResources"); //$NON-NLS-1$ } catch (MissingResourceException x) { resourceBundle = null; } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java index 45f2a06b4..41d3a9074 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDALineBreakpoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -61,12 +61,12 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen public PDALineBreakpoint(final IResource resource, final int lineNumber) throws CoreException { IWorkspaceRunnable runnable = new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - IMarker marker = resource.createMarker("org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint"); + IMarker marker = resource.createMarker("org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint"); //$NON-NLS-1$ setMarker(marker); marker.setAttribute(IBreakpoint.ENABLED, Boolean.TRUE); marker.setAttribute(IMarker.LINE_NUMBER, lineNumber); marker.setAttribute(IBreakpoint.ID, getModelIdentifier()); - marker.setAttribute(IMarker.MESSAGE, "Line Breakpoint: " + resource.getName() + " [line: " + lineNumber + "]"); + marker.setAttribute(IMarker.MESSAGE, "Line Breakpoint: " + resource.getName() + " [line: " + lineNumber + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } }; run(getMarkerRule(resource), runnable); @@ -177,7 +177,7 @@ public class PDALineBreakpoint extends LineBreakpoint implements IPDAEventListen public void handleEvent(PDAEvent event) { if (event instanceof PDASuspendedEvent || event instanceof PDAVMSuspendedEvent) { PDARunControlEvent rcEvent = (PDARunControlEvent)event; - if (rcEvent.fReason.equals("breakpoint")) { + if (rcEvent.fReason.equals("breakpoint")) { //$NON-NLS-1$ handleHit(rcEvent); } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java index b861fff20..42705dd62 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDARunToLineBreakpoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -38,7 +38,7 @@ public class PDARunToLineBreakpoint extends PDALineBreakpoint { IWorkspaceRunnable runnable = new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { // associate with workspace root to avoid drawing in editor ruler - IMarker marker = ResourcesPlugin.getWorkspace().getRoot().createMarker("org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint"); + IMarker marker = ResourcesPlugin.getWorkspace().getRoot().createMarker("org.eclipse.debug.examples.core.pda.markerType.lineBreakpoint"); //$NON-NLS-1$ setMarker(marker); marker.setAttribute(IBreakpoint.ENABLED, Boolean.TRUE); marker.setAttribute(IMarker.LINE_NUMBER, lineNumber); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java index f013f8327..d3f7dc593 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/breakpoints/PDAWatchpoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,10 +36,10 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint { private String fLastSuspendType; // marker attributes - public static final String ACCESS = "ACCESS"; - public static final String MODIFICATION = "MODIFICATION"; - public static final String FUNCTION_NAME = "FUNCTION_NAME"; - public static final String VAR_NAME = "VAR_NAME"; + public static final String ACCESS = "ACCESS"; //$NON-NLS-1$ + public static final String MODIFICATION = "MODIFICATION"; //$NON-NLS-1$ + public static final String FUNCTION_NAME = "FUNCTION_NAME"; //$NON-NLS-1$ + public static final String VAR_NAME = "VAR_NAME"; //$NON-NLS-1$ /** * Default constructor is required for the breakpoint manager @@ -66,7 +66,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint { public PDAWatchpoint(final IResource resource, final int lineNumber, final String functionName, final String varName, final boolean access, final boolean modification) throws CoreException { IWorkspaceRunnable runnable = new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - IMarker marker = resource.createMarker("org.eclipse.debug.examples.core.pda.markerType.watchpoint"); + IMarker marker = resource.createMarker("org.eclipse.debug.examples.core.pda.markerType.watchpoint"); //$NON-NLS-1$ setMarker(marker); setEnabled(true); ensureMarker().setAttribute(IMarker.LINE_NUMBER, lineNumber); @@ -74,7 +74,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint { setAccess(access); setModification(modification); setVariable(functionName, varName); - marker.setAttribute(IMarker.MESSAGE, "Watchpoint: " + resource.getName() + " [line: " + lineNumber + "]"); + marker.setAttribute(IMarker.MESSAGE, "Watchpoint: " + resource.getName() + " [line: " + lineNumber + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } }; run(getMarkerRule(resource), runnable); @@ -199,7 +199,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint { public void handleEvent(PDAEvent event) { if (event instanceof PDASuspendedEvent || event instanceof PDAVMSuspendedEvent) { PDARunControlEvent rcEvent = (PDARunControlEvent)event; - if (rcEvent.fReason.equals("watch")) { + if (rcEvent.fReason.equals("watch")) { //$NON-NLS-1$ handleHit(rcEvent); } } @@ -211,10 +211,10 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint { * @param event breakpoint event */ private void handleHit(PDARunControlEvent event) { - String[] strings = event.fMessage.split(" "); + String[] strings = event.fMessage.split(" "); //$NON-NLS-1$ if (strings.length == 4) { String fv = strings[3]; - int j = fv.indexOf("::"); + int j = fv.indexOf("::"); //$NON-NLS-1$ if (j > 0) { String fcn = fv.substring(0, j); String var = fv.substring(j + 2); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java index 7d43a1848..95c4c34d6 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -55,31 +55,31 @@ public class PDALaunchDelegate extends LaunchConfigurationDelegate { List commandList = new ArrayList(); // Get Java VM path - String javaVMHome = System.getProperty("java.home"); - String javaVMExec = javaVMHome + File.separatorChar + "bin" + File.separatorChar + "java"; + String javaVMHome = System.getProperty("java.home"); //$NON-NLS-1$ + String javaVMExec = javaVMHome + File.separatorChar + "bin" + File.separatorChar + "java"; //$NON-NLS-1$ //$NON-NLS-2$ if (File.separatorChar == '\\') { - javaVMExec += ".exe"; + javaVMExec += ".exe"; //$NON-NLS-1$ } File exe = new File(javaVMExec); if (!exe.exists()) { - abort(MessageFormat.format("Specified java VM executable {0} does not exist.", new Object[]{javaVMExec}), null); + abort(MessageFormat.format("Specified java VM executable {0} does not exist.", new Object[]{javaVMExec}), null); //$NON-NLS-1$ } commandList.add(javaVMExec); - commandList.add("-cp"); - commandList.add(File.pathSeparator + DebugCorePlugin.getFileInPlugin(new Path("bin"))); + commandList.add("-cp"); //$NON-NLS-1$ + commandList.add(File.pathSeparator + DebugCorePlugin.getFileInPlugin(new Path("bin"))); //$NON-NLS-1$ - commandList.add("org.eclipse.debug.examples.pdavm.PDAVirtualMachine"); + commandList.add("org.eclipse.debug.examples.pdavm.PDAVirtualMachine"); //$NON-NLS-1$ // program name String program = configuration.getAttribute(DebugCorePlugin.ATTR_PDA_PROGRAM, (String)null); if (program == null) { - abort("Perl program unspecified.", null); + abort("Perl program unspecified.", null); //$NON-NLS-1$ } IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(program)); if (!file.exists()) { - abort(MessageFormat.format("Perl program {0} does not exist.", new String[] {file.getFullPath().toString()}), null); + abort(MessageFormat.format("Perl program {0} does not exist.", new String[] {file.getFullPath().toString()}), null); //$NON-NLS-1$ } commandList.add(file.getLocation().toOSString()); @@ -91,11 +91,11 @@ public class PDALaunchDelegate extends LaunchConfigurationDelegate { requestPort = findFreePort(); eventPort = findFreePort(); if (requestPort == -1 || eventPort == -1) { - abort("Unable to find free port", null); + abort("Unable to find free port", null); //$NON-NLS-1$ } - commandList.add("-debug"); - commandList.add("" + requestPort); - commandList.add("" + eventPort); + commandList.add("-debug"); //$NON-NLS-1$ + commandList.add("" + requestPort); //$NON-NLS-1$ + commandList.add("" + eventPort); //$NON-NLS-1$ } String[] commandLine = (String[]) commandList.toArray(new String[commandList.size()]); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java index bcc07ba35..5107b2695 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArray.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -39,7 +39,7 @@ public class PDAArray extends PDAValue { */ public IVariable[] getVariables() throws DebugException { String string = getValueString(); - String[] words = string.split("\\W+"); + String[] words = string.split("\\W+"); //$NON-NLS-1$ IVariable[] variables = new IVariable[words.length]; for (int i = 0; i < words.length; i++) { String word = words[i]; diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java index 9ff3ca74e..834198ebe 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAArrayEntry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -45,14 +45,14 @@ public class PDAArrayEntry extends PDADebugElement implements IVariable { * @see org.eclipse.debug.core.model.IVariable#getName() */ public String getName() throws DebugException { - return "[" + fIndex + "]"; + return "[" + fIndex + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName() */ public String getReferenceTypeName() throws DebugException { - return "String"; + return "String"; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java index 180c528d7..b5e4a0607 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2010 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -103,7 +103,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr class EventDispatchJob extends Job { public EventDispatchJob() { - super("PDA Event Dispatch"); + super("PDA Event Dispatch"); //$NON-NLS-1$ setSystem(true); } @@ -111,7 +111,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ protected IStatus run(IProgressMonitor monitor) { - String message = ""; + String message = ""; //$NON-NLS-1$ while (!isTerminated() && message != null) { try { message = fEventReader.readLine(); @@ -122,7 +122,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr } catch (IllegalArgumentException e) { DebugCorePlugin.getDefault().getLog().log( - new Status (IStatus.ERROR, "org.eclipse.debug.examples.core", "Error parsing PDA event", e)); + new Status (IStatus.ERROR, "org.eclipse.debug.examples.core", "Error parsing PDA event", e)); //$NON-NLS-1$ //$NON-NLS-2$ continue; } Object[] listeners = fEventListeners.toArray(); @@ -185,7 +185,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr Thread.sleep(1000); } catch (InterruptedException e) { } - fRequestSocket = new Socket("localhost", requestPort); + fRequestSocket = new Socket("localhost", requestPort); //$NON-NLS-1$ fRequestWriter = new PrintWriter(fRequestSocket.getOutputStream()); fRequestReader = new BufferedReader(new InputStreamReader(fRequestSocket.getInputStream())); // give interpreter a chance to open next socket @@ -193,12 +193,12 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr Thread.sleep(1000); } catch (InterruptedException e) { } - fEventSocket = new Socket("localhost", eventPort); + fEventSocket = new Socket("localhost", eventPort); //$NON-NLS-1$ fEventReader = new BufferedReader(new InputStreamReader(fEventSocket.getInputStream())); } catch (UnknownHostException e) { - requestFailed("Unable to connect to PDA VM", e); + requestFailed("Unable to connect to PDA VM", e); //$NON-NLS-1$ } catch (IOException e) { - requestFailed("Unable to connect to PDA VM", e); + requestFailed("Unable to connect to PDA VM", e); //$NON-NLS-1$ } fEventDispatch = new EventDispatchJob(); fEventDispatch.schedule(); @@ -235,7 +235,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr * @see org.eclipse.debug.core.model.IDebugTarget#getName() */ public String getName() throws DebugException { - return "PDA"; + return "PDA"; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugTarget#supportsBreakpoint(org.eclipse.debug.core.model.IBreakpoint) @@ -406,6 +406,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr /** * Notification we have connected to the VM and it has started. * Resume the VM. + * @param event */ private void vmStarted(PDAVMStartedEvent event) { fireCreationEvent(); @@ -451,15 +452,15 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr } private int calcDetail(String reason) { - if (reason.equals("breakpoint") || reason.equals("watch")) { + if (reason.equals("breakpoint") || reason.equals("watch")) { //$NON-NLS-1$ //$NON-NLS-2$ return DebugEvent.BREAKPOINT; - } else if (reason.equals("step")) { + } else if (reason.equals("step")) { //$NON-NLS-1$ return DebugEvent.STEP_OVER; - } else if (reason.equals("drop")) { + } else if (reason.equals("drop")) { //$NON-NLS-1$ return DebugEvent.STEP_RETURN; - } else if (reason.equals("client")) { + } else if (reason.equals("client")) { //$NON-NLS-1$ return DebugEvent.CLIENT_REQUEST; - } else if (reason.equals("event")) { + } else if (reason.equals("event")) { //$NON-NLS-1$ return DebugEvent.BREAKPOINT; } else { return DebugEvent.UNSPECIFIED; @@ -498,11 +499,11 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr // wait for reply String retVal = fRequestReader.readLine(); if (retVal == null) { - requestFailed("Request failed: " + request + ". Debugger connection closed.", null); + requestFailed("Request failed: " + request + ". Debugger connection closed.", null); //$NON-NLS-1$ //$NON-NLS-2$ } return retVal; } catch (IOException e) { - requestFailed("Request failed: " + request, e); + requestFailed("Request failed: " + request, e); //$NON-NLS-1$ } } // Should never reach this satement. diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java index 8d92f129c..409746bc3 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -149,7 +149,7 @@ public class PDAThread extends PDADebugElement implements IThread, IPDAEventList * @see org.eclipse.debug.core.model.IThread#getName() */ public String getName() { - return "Main thread"; + return "Main thread"; //$NON-NLS-1$ } /* (non-Javadoc) @@ -329,21 +329,21 @@ public class PDAThread extends PDADebugElement implements IThread, IPDAEventList // handle events if (event instanceof PDAResumedEvent || event instanceof PDAVMResumedEvent) { setSuspended(false); - if ("step".equals(event.fReason)) { + if ("step".equals(event.fReason)) { //$NON-NLS-1$ setStepping(true); resumed(DebugEvent.STEP_OVER); //#ifdef ex2 //# } //# // TODO: Exercise 2 - handle/fire "client" resume event //#else - } else if ("client".equals(event.fReason)) { + } else if ("client".equals(event.fReason)) { //$NON-NLS-1$ resumed(DebugEvent.CLIENT_REQUEST); } //#endif //#ifdef ex5 //# // TODO: Exercise 5 - handle start of drop event //#else - else if ("drop".equals(event.fReason)) { + else if ("drop".equals(event.fReason)) { //$NON-NLS-1$ resumed(DebugEvent.STEP_RETURN); } //#endif @@ -357,18 +357,18 @@ public class PDAThread extends PDADebugElement implements IThread, IPDAEventList //# exceptionHit(); //# } //#else - if ("client".equals(event.fReason)) { + if ("client".equals(event.fReason)) { //$NON-NLS-1$ suspended(DebugEvent.CLIENT_REQUEST); - } else if ("step".equals(event.fReason)) { + } else if ("step".equals(event.fReason)) { //$NON-NLS-1$ suspended(DebugEvent.STEP_END); - } else if ("event".equals(event.fReason) && getError() != null) { + } else if ("event".equals(event.fReason) && getError() != null) { //$NON-NLS-1$ exceptionHit(); } //#endif //#ifdef ex5 //# // TODO: Exercise 5 - handle end of drop event //#else - else if ("drop".equals(event.fReason)) { + else if ("drop".equals(event.fReason)) { //$NON-NLS-1$ suspended(DebugEvent.STEP_END); } //#endif @@ -523,7 +523,7 @@ public class PDAThread extends PDADebugElement implements IThread, IPDAEventList sendCommand(new PDAPopDataCommand(fThreadId)); return dataStack[0]; } - requestFailed("Empty stack", null); + requestFailed("Empty stack", null); //$NON-NLS-1$ return null; } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java index a4c6cc7e2..81a92db29 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAValue.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -39,9 +39,9 @@ public class PDAValue extends PDADebugElement implements IValue { try { Integer.parseInt(fValue); } catch (NumberFormatException e) { - return "text"; + return "text"; //$NON-NLS-1$ } - return "integer"; + return "integer"; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#getValueString() @@ -79,7 +79,7 @@ public class PDAValue extends PDADebugElement implements IValue { // Value with multiple words can be show as an array using logical // structures. If the value has multiple words, it needs to indicate // that it has children even if logical structures are not turned on. - return fValue.split("\\W+").length > 1; + return fValue.split("\\W+").length > 1; //$NON-NLS-1$ } /* * (non-Javadoc) diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java index 2329b584d..08ca276be 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAVariable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -62,7 +62,7 @@ public class PDAVariable extends PDADebugElement implements IVariable { * @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName() */ public String getReferenceTypeName() throws DebugException { - return "Thing"; + return "Thing"; //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IVariable#hasValueChanged() diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java index dbb06cb22..ccc6b2647 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/WordStructureDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -30,7 +30,7 @@ public class WordStructureDelegate implements ILogicalStructureTypeDelegate { //#else try { String string = value.getValueString(); - String[] words = string.split("\\W+"); + String[] words = string.split("\\W+"); //$NON-NLS-1$ return words.length > 1; } catch (DebugException e) { } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDABitFieldData.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDABitFieldData.java index a1cf5e3de..6a8caaa19 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDABitFieldData.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDABitFieldData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -27,7 +28,7 @@ public class PDABitFieldData { final public Map fMnemonics; PDABitFieldData(String bitFieldString) { - StringTokenizer st = new StringTokenizer(bitFieldString, " "); + StringTokenizer st = new StringTokenizer(bitFieldString, " "); //$NON-NLS-1$ fName = st.nextToken(); fOffset = Integer.parseInt(st.nextToken()); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java index f9a3f001e..9886a920a 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAChildrenCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,7 +26,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAChildrenCommand extends PDACommand { public PDAChildrenCommand(int threadId, int frameId, String name ) { - super("children " + threadId + " " + frameId + " " + name); + super("children " + threadId + " " + frameId + " " + name); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java index 07dba5b96..76f688bf4 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAClearBreakpointCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -22,7 +23,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAClearBreakpointCommand extends PDACommand { public PDAClearBreakpointCommand(int line) { - super("clear " + line); + super("clear " + line); //$NON-NLS-1$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java index 66ba35a35..61cc412e1 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADataCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -26,7 +27,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDADataCommand extends PDACommand { public PDADataCommand(int threadId) { - super("data " + threadId); + super("data " + threadId); //$NON-NLS-1$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java index 2204fa177..1d77bbe79 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDADropFrameCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -35,7 +36,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDADropFrameCommand extends PDACommand { public PDADropFrameCommand(int threadId) { - super("drop " + threadId); + super("drop " + threadId); //$NON-NLS-1$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java index bb0bdc6b9..50f79cf26 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -34,7 +35,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAEvalCommand extends PDACommand { public PDAEvalCommand(int threadId, String operation) { - super("eval " + threadId + " " + operation); + super("eval " + threadId + " " + operation); //$NON-NLS-1$ //$NON-NLS-2$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java index 720147697..d8dc61ef5 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEvalResultEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -27,6 +28,6 @@ public class PDAEvalResultEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("evalresult"); + return message.startsWith("evalresult"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java index f538c0d65..713723eea 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAEventStopCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -36,9 +37,9 @@ public class PDAEventStopCommand extends PDACommand { public static final int NOSUCHLABEL = 1; public PDAEventStopCommand(int event, boolean enable) { - super("eventstop " + - (event == UNIMPINSTR ? "unimpinstr " : "nosuchlabel ") + - (enable ? "1" : "0")); + super("eventstop " + //$NON-NLS-1$ + (event == UNIMPINSTR ? "unimpinstr " : "nosuchlabel ") + //$NON-NLS-1$ //$NON-NLS-2$ + (enable ? "1" : "0")); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java index f452e8138..22c65c103 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAExitedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -24,6 +25,6 @@ public class PDAExitedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("exited"); + return message.startsWith("exited"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java index c2a83af3c..3c30b3bfb 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -26,7 +27,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAFrameCommand extends PDACommand { public PDAFrameCommand(int threadId, int frameNum) { - super("frame " + threadId + " " + frameNum); + super("frame " + threadId + " " + frameNum); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java index 5bd1b5e00..01cfbf4cd 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAFrameData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -31,7 +32,7 @@ public class PDAFrameData { final public String[] fVariables; PDAFrameData(String frameString) { - StringTokenizer st = new StringTokenizer(frameString, "|"); + StringTokenizer st = new StringTokenizer(frameString, "|"); //$NON-NLS-1$ fFilePath = new Path(st.nextToken()); fPC = Integer.parseInt(st.nextToken()); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java index 4e6f1eb5b..bf503d461 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAGroupsCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -23,7 +24,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAGroupsCommand extends PDACommand { public PDAGroupsCommand() { - super("groups"); + super("groups"); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java index 4ac17b284..99199a5e9 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAListResult.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,7 +26,7 @@ public class PDAListResult extends PDACommandResult { PDAListResult(String response) { super(response); - StringTokenizer st = new StringTokenizer(response, "|"); + StringTokenizer st = new StringTokenizer(response, "|"); //$NON-NLS-1$ List valuesList = new ArrayList(); while (st.hasMoreTokens()) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java index b85ca868e..c90b0b600 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDANoSuchLabelEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -28,13 +29,13 @@ public class PDANoSuchLabelEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("no such label"); + return message.startsWith("no such label"); //$NON-NLS-1$ } protected String getName(String message) { if (isEventMessage(message)) { - return "no such label"; + return "no such label"; //$NON-NLS-1$ } - throw new IllegalArgumentException("Invalid event: " + message); + throw new IllegalArgumentException("Invalid event: " + message); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java index be04801e2..c181a2971 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPopDataCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,7 +26,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAPopDataCommand extends PDACommand { public PDAPopDataCommand(int threadId) { - super("popdata " + threadId); + super("popdata " + threadId); //$NON-NLS-1$ } public PDACommandResult createResult(String resultText) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java index 10837ea16..c6ff895c6 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAPushDataCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -26,7 +27,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAPushDataCommand extends PDACommand { public PDAPushDataCommand(int threadId, String value) { - super("pushdata " + threadId + " " + value); + super("pushdata " + threadId + " " + value); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java index 52b883bf4..05a12cd5e 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegisterData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,10 +27,10 @@ public class PDARegisterData { final public PDABitFieldData[] fBitFields; PDARegisterData(String regString) { - StringTokenizer st = new StringTokenizer(regString, "|"); + StringTokenizer st = new StringTokenizer(regString, "|"); //$NON-NLS-1$ String regInfo = st.nextToken(); - StringTokenizer regSt = new StringTokenizer(regInfo, " "); + StringTokenizer regSt = new StringTokenizer(regInfo, " "); //$NON-NLS-1$ fName = regSt.nextToken(); fWritable = Boolean.getBoolean(regSt.nextToken()); diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java index 2e766ca1d..0592d6b56 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -23,7 +24,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDARegistersCommand extends PDACommand { public PDARegistersCommand(String group) { - super("registers " + group); + super("registers " + group); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommandResult.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommandResult.java index f5d4cd983..a53bac5e2 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommandResult.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersCommandResult.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -28,7 +29,7 @@ public class PDARegistersCommandResult extends PDACommandResult { PDARegistersCommandResult(String response) { super(response); - StringTokenizer st = new StringTokenizer(response, "#"); + StringTokenizer st = new StringTokenizer(response, "#"); //$NON-NLS-1$ List regList = new ArrayList(); while (st.hasMoreTokens()) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java index 9212273b5..1abada3a8 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARegistersEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,6 +26,6 @@ public class PDARegistersEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("registers"); + return message.startsWith("registers"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java index 21e58c430..6f518e9fe 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARestartCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,7 +26,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDARestartCommand extends PDACommand { public PDARestartCommand() { - super("restart"); + super("restart"); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java index bf65d40e5..657860137 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumeCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -30,7 +31,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAResumeCommand extends PDACommand { public PDAResumeCommand(int threadId) { - super("resume " + threadId); + super("resume " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java index 36f89ed0d..e8ee71750 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAResumedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -24,6 +25,6 @@ public class PDAResumedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("resumed"); + return message.startsWith("resumed"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java index e3af4eb5e..3f507d1e4 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDARunControlEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -33,7 +34,7 @@ public class PDARunControlEvent extends PDAEvent { try { return Integer.parseInt(message.substring(nameEnd + 1, threadIdEnd)); } catch (NumberFormatException e) { - throw new IllegalArgumentException("Invalid event: " + message); + throw new IllegalArgumentException("Invalid event: " + message); //$NON-NLS-1$ } } else { return -1; @@ -49,7 +50,7 @@ public class PDARunControlEvent extends PDAEvent { idx++; } if (idx >= message.length()) { - return ""; + return ""; //$NON-NLS-1$ } int endIdx = message.indexOf(' ', idx); @@ -64,6 +65,6 @@ public class PDARunControlEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("started"); + return message.startsWith("started"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java index 1abb7fa8c..a5223a916 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetBreakpointCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -34,9 +35,9 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDASetBreakpointCommand extends PDACommand { public PDASetBreakpointCommand(int line, boolean stopVM) { - super("set " + - line + " " + - (stopVM ? "1" : "0")); + super("set " + //$NON-NLS-1$ + line + " " + //$NON-NLS-1$ + (stopVM ? "1" : "0")); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java index e0c22db45..85ed35ae4 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetDataCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -26,7 +27,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDASetDataCommand extends PDACommand { public PDASetDataCommand(int threadId, int index, String value) { - super("setdata " + threadId + " " + index + " " + value); + super("setdata " + threadId + " " + index + " " + value); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java index c5f6b090f..ac7dde342 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASetVarCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -28,7 +29,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDASetVarCommand extends PDACommand { public PDASetVarCommand(int threadId, int frame, String variable, String value) { - super("setvar " + threadId + " " + frame + " " + variable + " " + value); + super("setvar " + threadId + " " + frame + " " + variable + " " + value); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java index 84545feb1..92cd55bbc 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -29,7 +30,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAStackCommand extends PDACommand { public PDAStackCommand(int threadId) { - super("stack " + threadId); + super("stack " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommandResult.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommandResult.java index e22aa12b0..b98bcba70 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommandResult.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackCommandResult.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -29,7 +30,7 @@ public class PDAStackCommandResult extends PDACommandResult { PDAStackCommandResult(String response) { super(response); - StringTokenizer st = new StringTokenizer(response, "#"); + StringTokenizer st = new StringTokenizer(response, "#"); //$NON-NLS-1$ List framesList = new ArrayList(); while (st.hasMoreTokens()) { diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java index 6c04530c2..3b6abfa82 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStackDepthCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -26,7 +27,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAStackDepthCommand extends PDACommand { public PDAStackDepthCommand(int threadId) { - super("stackdepth " + threadId); + super("stackdepth " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java index 6b980e105..39b21876a 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStartedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,6 +26,6 @@ public class PDAStartedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("started"); + return message.startsWith("started"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java index 3a21492ad..5a5124ef1 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -35,7 +36,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAStepCommand extends PDACommand { public PDAStepCommand(int threadId) { - super("step " + threadId); + super("step " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java index 2a7fd9505..973c93e53 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAStepReturnCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -36,7 +37,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAStepReturnCommand extends PDACommand { public PDAStepReturnCommand(int threadId) { - super("stepreturn " + threadId); + super("stepreturn " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java index fb124d3e0..cba45439d 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -30,7 +31,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDASuspendCommand extends PDACommand { public PDASuspendCommand(int threadId) { - super("suspend " + threadId); + super("suspend " + threadId); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java index b226347c3..de6363391 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDASuspendedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -38,6 +39,6 @@ public class PDASuspendedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("suspended"); + return message.startsWith("suspended"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java index 3e91596f1..55db441ec 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminateCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -24,7 +25,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDATerminateCommand extends PDACommand { public PDATerminateCommand() { - super("terminate"); + super("terminate"); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java index 648e838ab..d3aa4a2a0 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDATerminatedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -24,6 +25,6 @@ public class PDATerminatedEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("terminated"); + return message.startsWith("terminated"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java index 7a0ce54ba..c6a593322 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAUnimplementedInstructionEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -29,13 +30,13 @@ public class PDAUnimplementedInstructionEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("unimplemented instruction"); + return message.startsWith("unimplemented instruction"); //$NON-NLS-1$ } protected String getName(String message) { if (isEventMessage(message)) { - return "unimplemented instruction"; + return "unimplemented instruction"; //$NON-NLS-1$ } - throw new IllegalArgumentException("Invalid event: " + message); + throw new IllegalArgumentException("Invalid event: " + message); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java index 85ca473ab..83bb95d6e 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumeCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -27,7 +28,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAVMResumeCommand extends PDACommand { public PDAVMResumeCommand() { - super("vmresume"); + super("vmresume"); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java index 74801c6c5..056270d61 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMResumedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -31,6 +32,6 @@ public class PDAVMResumedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("vmresumed"); + return message.startsWith("vmresumed"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java index ff5f1dc0f..27d519105 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMStartedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -25,6 +26,6 @@ public class PDAVMStartedEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("vmstarted"); + return message.startsWith("vmstarted"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java index ad62d3321..88f7d5dd8 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -27,7 +28,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAVMSuspendCommand extends PDACommand { public PDAVMSuspendCommand() { - super("vmsuspend"); + super("vmsuspend"); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java index 0e36297ec..eac42a107 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMSuspendedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -39,6 +40,6 @@ public class PDAVMSuspendedEvent extends PDARunControlEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("vmsuspended"); + return message.startsWith("vmsuspended"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java index 348778625..b73884746 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVMTerminatedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,6 +24,6 @@ public class PDAVMTerminatedEvent extends PDAEvent { } public static boolean isEventMessage(String message) { - return message.startsWith("vmterminated"); + return message.startsWith("vmterminated"); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java index 5e2f34c03..b81302b79 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAVarCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -29,7 +30,7 @@ package org.eclipse.debug.examples.core.pda.protocol; public class PDAVarCommand extends PDACommand { public PDAVarCommand(int threadId, int frameId, String name) { - super("var " + threadId + " " + frameId + " " + name); + super("var " + threadId + " " + frameId + " " + name); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java index 4bd8af72c..c3b88cf64 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/protocol/PDAWatchCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.core.pda.protocol; @@ -33,7 +34,7 @@ public class PDAWatchCommand extends PDACommand { public static final int NONE = 0; public PDAWatchCommand(String function, String variable, int operation) { - super("watch " + function+ "::" + variable + " " + operation); + super("watch " + function+ "::" + variable + " " + operation); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.debug.examples.core/src_ant/org/eclipse/debug/examples/ant/tasks/PreProcessor.java b/org.eclipse.debug.examples.core/src_ant/org/eclipse/debug/examples/ant/tasks/PreProcessor.java index 59baccb85..dc19387ac 100644 --- a/org.eclipse.debug.examples.core/src_ant/org/eclipse/debug/examples/ant/tasks/PreProcessor.java +++ b/org.eclipse.debug.examples.core/src_ant/org/eclipse/debug/examples/ant/tasks/PreProcessor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -59,10 +59,10 @@ public class PreProcessor extends Task { private static final int STATE_POST_TRUE_CONDITION = 3; // matchers - private Matcher IF_DEF_MATCHER = Pattern.compile("#ifdef\\s+\\w+").matcher(""); - private Matcher ELSE_IF_MATCHER = Pattern.compile("#elseif\\s+\\w+").matcher(""); - private Matcher ELSE_MATCHER = Pattern.compile("#else$|#else\\W+").matcher(""); - private Matcher END_MATCHER = Pattern.compile("#endif").matcher(""); + private Matcher IF_DEF_MATCHER = Pattern.compile("#ifdef\\s+\\w+").matcher(""); //$NON-NLS-1$ //$NON-NLS-2$ + private Matcher ELSE_IF_MATCHER = Pattern.compile("#elseif\\s+\\w+").matcher(""); //$NON-NLS-1$ //$NON-NLS-2$ + private Matcher ELSE_MATCHER = Pattern.compile("#else$|#else\\W+").matcher(""); //$NON-NLS-1$ //$NON-NLS-2$ + private Matcher END_MATCHER = Pattern.compile("#endif").matcher(""); //$NON-NLS-1$ //$NON-NLS-2$ /** @@ -95,7 +95,7 @@ public class PreProcessor extends Task { * @param symbols symbols that are "on" for the preprocessing */ public void setSymbols(String symbols) { - String[] strings = symbols.split(","); + String[] strings = symbols.split(","); //$NON-NLS-1$ for (int i = 0; i < strings.length; i++) { String string = strings[i].trim(); if (string.length() > 0) { @@ -106,21 +106,21 @@ public class PreProcessor extends Task { public void execute() throws BuildException { if (fSymbols.size() == 0) { - throw new BuildException("No symbols specified for preprocessor"); + throw new BuildException("No symbols specified for preprocessor"); //$NON-NLS-1$ } if (fFileSets.isEmpty()) { - throw new BuildException("No filesets specified for processing"); + throw new BuildException("No filesets specified for processing"); //$NON-NLS-1$ } if (!fDestDir.exists()) { - throw new BuildException("destdir does not exist: " + fDestDir.getAbsolutePath()); + throw new BuildException("destdir does not exist: " + fDestDir.getAbsolutePath()); //$NON-NLS-1$ } - StringBuffer buf = new StringBuffer("Symbols: "); + StringBuffer buf = new StringBuffer("Symbols: "); //$NON-NLS-1$ String[] symbols = (String[]) fSymbols.toArray(new String[fSymbols.size()]); for (int i = 0; i < symbols.length; i++) { String symbol = symbols[i]; buf.append(symbol); if(i < (symbols.length -1)) { - buf.append(", "); + buf.append(", "); //$NON-NLS-1$ } } log(buf.toString()); @@ -153,9 +153,9 @@ public class PreProcessor extends Task { dir.mkdirs(); } String contents = null; - if (fileName.endsWith(".java")) { - contents = preProcessFile(srcFile, "//#"); - } else if (fileName.equals("plugin.xml")) { + if (fileName.endsWith(".java")) { //$NON-NLS-1$ + contents = preProcessFile(srcFile, "//#"); //$NON-NLS-1$ + } else if (fileName.equals("plugin.xml")) { //$NON-NLS-1$ contents = preProcessFile(srcFile, null); } if (contents == null) { @@ -180,101 +180,106 @@ public class PreProcessor extends Task { } /** - * Preprocesses a file + * Pre-processes a file * * @param srcFile the file to process - * @param strip chars to stip off lines in a true condition, or <code>null</code> + * @param strip chars to strip off lines in a true condition, or <code>null</code> * @return */ public String preProcessFile(File srcFile, String strip) { try { FileReader fileReader = new FileReader(srcFile); BufferedReader reader = new BufferedReader(fileReader); - StringBuffer buffer = new StringBuffer(); - String line = reader.readLine(); - String activeSymbol = null; - int state = STATE_OUTSIDE_CONDITION; boolean changed = false; - while (line != null) { - boolean ifdef = IF_DEF_MATCHER.reset(line).find(); - boolean elseif = ELSE_IF_MATCHER.reset(line).find(); - boolean elze = ELSE_MATCHER.reset(line).find(); - boolean endif = END_MATCHER.reset(line).find(); - boolean commandLine = ifdef || elseif || elze || endif; - boolean written = false; - switch (state) { - case STATE_OUTSIDE_CONDITION: - if (ifdef) { - String condition = line.substring(IF_DEF_MATCHER.start(), IF_DEF_MATCHER.end()); - String[] strings = condition.split("\\s+"); - activeSymbol = strings[1].trim(); - if (fSymbols.contains(activeSymbol)) { - state = STATE_TRUE_CONDITION; - } else { - state = STATE_FALSE_CONDITION; - } - } else if (elseif) { - throw new BuildException("#elseif encountered without corresponding #ifdef"); - } else if (elze) { - throw new BuildException("#else encountered without corresponding #ifdef (" + srcFile.getPath() + ")"); - } else if (endif) { - throw new BuildException("#endif encountered without corresponding #ifdef"); - } - break; - case STATE_TRUE_CONDITION: - if (elze || elseif) { - state = STATE_POST_TRUE_CONDITION; + StringBuffer buffer = new StringBuffer(); + try { + String line = reader.readLine(); + String activeSymbol = null; + int state = STATE_OUTSIDE_CONDITION; + while (line != null) { + boolean ifdef = IF_DEF_MATCHER.reset(line).find(); + boolean elseif = ELSE_IF_MATCHER.reset(line).find(); + boolean elze = ELSE_MATCHER.reset(line).find(); + boolean endif = END_MATCHER.reset(line).find(); + boolean commandLine = ifdef || elseif || elze || endif; + boolean written = false; + switch (state) { + case STATE_OUTSIDE_CONDITION: + if (ifdef) { + String condition = line.substring(IF_DEF_MATCHER.start(), IF_DEF_MATCHER.end()); + String[] strings = condition.split("\\s+"); //$NON-NLS-1$ + activeSymbol = strings[1].trim(); + if (fSymbols.contains(activeSymbol)) { + state = STATE_TRUE_CONDITION; + } else { + state = STATE_FALSE_CONDITION; + } + } else if (elseif) { + throw new BuildException("#elseif encountered without corresponding #ifdef"); //$NON-NLS-1$ + } else if (elze) { + throw new BuildException("#else encountered without corresponding #ifdef (" + srcFile.getPath() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ + } else if (endif) { + throw new BuildException("#endif encountered without corresponding #ifdef"); //$NON-NLS-1$ + } break; - } else if (endif) { - state = STATE_OUTSIDE_CONDITION; + case STATE_TRUE_CONDITION: + if (elze || elseif) { + state = STATE_POST_TRUE_CONDITION; + break; + } else if (endif) { + state = STATE_OUTSIDE_CONDITION; + break; + } else if (ifdef) { + throw new BuildException("illegal nested #ifdef"); //$NON-NLS-1$ + } break; - } else if (ifdef) { - throw new BuildException("illegal nested #ifdef"); - } - break; - case STATE_FALSE_CONDITION: - if (elseif) { - String condition = line.substring(ELSE_IF_MATCHER.start(), ELSE_IF_MATCHER.end()); - String[] strings = condition.split("\\s+"); - activeSymbol = strings[1].trim(); - if (fSymbols.contains(activeSymbol)) { + case STATE_FALSE_CONDITION: + if (elseif) { + String condition = line.substring(ELSE_IF_MATCHER.start(), ELSE_IF_MATCHER.end()); + String[] strings = condition.split("\\s+"); //$NON-NLS-1$ + activeSymbol = strings[1].trim(); + if (fSymbols.contains(activeSymbol)) { + state = STATE_TRUE_CONDITION; + } else { + state = STATE_FALSE_CONDITION; + } + } else if (elze) { state = STATE_TRUE_CONDITION; - } else { - state = STATE_FALSE_CONDITION; + break; + } else if (endif) { + state = STATE_OUTSIDE_CONDITION; + break; + } else if (ifdef) { + throw new BuildException("illegal nested #ifdef"); //$NON-NLS-1$ } - } else if (elze) { - state = STATE_TRUE_CONDITION; - break; - } else if (endif) { - state = STATE_OUTSIDE_CONDITION; break; - } else if (ifdef) { - throw new BuildException("illegal nested #ifdef"); - } - break; - case STATE_POST_TRUE_CONDITION: - if (endif) { - state = STATE_OUTSIDE_CONDITION; + case STATE_POST_TRUE_CONDITION: + if (endif) { + state = STATE_OUTSIDE_CONDITION; + break; + } else if (ifdef) { + throw new BuildException("illegal nested #ifdef"); //$NON-NLS-1$ + } break; - } else if (ifdef) { - throw new BuildException("illegal nested #ifdef"); - } - break; - } - if (!commandLine) { - if (state == STATE_OUTSIDE_CONDITION || state == STATE_TRUE_CONDITION) { - if (state == STATE_TRUE_CONDITION && strip != null) { - if (line.startsWith(strip)) { - line = line.substring(strip.length()); + } + if (!commandLine) { + if (state == STATE_OUTSIDE_CONDITION || state == STATE_TRUE_CONDITION) { + if (state == STATE_TRUE_CONDITION && strip != null) { + if (line.startsWith(strip)) { + line = line.substring(strip.length()); + } } + buffer.append(line); + buffer.append("\n"); //$NON-NLS-1$ + written = true; } - buffer.append(line); - buffer.append("\n"); - written = true; - } - } - changed = changed || !written; - line = reader.readLine(); + } + changed = changed || !written; + line = reader.readLine(); + } + } + finally { + reader.close(); } if (!changed) { return null; @@ -287,8 +292,8 @@ public class PreProcessor extends Task { public static void main(String[] args) { PreProcessor processor = new PreProcessor(); - processor.setSymbols("ex2"); - String string = processor.preProcessFile(new File("c:\\eclipse3.1\\dev\\example.debug.core\\src\\example\\debug\\core\\launcher\\PDALaunchDelegate.java"), "//#"); + processor.setSymbols("ex2"); //$NON-NLS-1$ + String string = processor.preProcessFile(new File("c:\\eclipse3.1\\dev\\example.debug.core\\src\\example\\debug\\core\\launcher\\PDALaunchDelegate.java"), "//#"); //$NON-NLS-1$ //$NON-NLS-2$ //String string = processor.preProcessFile(new File("c:\\eclipse3.1\\dev\\example.debug.core\\plugin.xml"), null); System.out.println(string); } diff --git a/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs index e3662aa86..5d7a22fe3 100644 --- a/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,123 +1,409 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-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.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
+eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=error +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=warning +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.3 +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_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_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_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +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.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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 +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_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=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_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_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_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.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.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_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 diff --git a/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..13d5dca2c --- /dev/null +++ b/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,109 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_Platform Debug 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_settings_version=12 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=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 +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +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.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +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 +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=true +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_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF b/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF index 862a5550e..cdbdcd9bc 100644 --- a/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.ui;singleton:=true -Bundle-Version: 1.4.100.qualifier +Bundle-Version: 1.4.200.qualifier Bundle-Activator: org.eclipse.debug.examples.ui.pda.DebugUIPlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/org.eclipse.debug.examples.ui/pom.xml b/org.eclipse.debug.examples.ui/pom.xml index a0c8dfc74..fd42a5873 100644 --- a/org.eclipse.debug.examples.ui/pom.xml +++ b/org.eclipse.debug.examples.ui/pom.xml @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.debug</groupId> <artifactId>org.eclipse.debug.examples.ui</artifactId> - <version>1.4.100-SNAPSHOT</version> + <version>1.4.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlLabelProvider.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlLabelProvider.java index f54234bf8..febdf3e42 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlLabelProvider.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,7 +34,7 @@ public class ControlLabelProvider extends ElementLabelProvider { if (SequencerColumnPresentation.COL_VALUE.equals(columnId)) { return control.getValue(); } - return ""; + return ""; //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlsMementoProvider.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlsMementoProvider.java index 6df637fc8..1e3988ad1 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlsMementoProvider.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/ControlsMementoProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,10 +28,10 @@ public class ControlsMementoProvider extends DebugElementMementoProvider { */ protected String getElementName(Object element, IPresentationContext context) throws CoreException { if (element instanceof MidiLaunch) { - return "SEQUENCER"; + return "SEQUENCER"; //$NON-NLS-1$ } if (element instanceof TempoControl) { - return "TEMPO_CONTROL"; + return "TEMPO_CONTROL"; //$NON-NLS-1$ } return null; } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiEventLabelProvider.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiEventLabelProvider.java index 6ea60ef96..13406acda 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiEventLabelProvider.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiEventLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -55,7 +55,7 @@ public class MidiEventLabelProvider extends ElementLabelProvider { return Integer.toString(((ShortMessage)message).getChannel()); } } - return ""; + return ""; //$NON-NLS-1$ } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiEventModelProxy.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiEventModelProxy.java index b535c3d2d..884062f09 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiEventModelProxy.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiEventModelProxy.java @@ -1,5 +1,5 @@ /***************************************************************** - * Copyright (c) 2009 Texas Instruments and others + * Copyright (c) 2009, 2013 Texas Instruments and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Patrick Chuong (Texas Instruments) - Initial API and implementation (Bug 286310) + * IBM Corporation - bug fixing *****************************************************************/ package org.eclipse.debug.examples.ui.midi.adapters; @@ -26,7 +27,7 @@ public class MidiEventModelProxy extends AbstractModelProxy implements ICheckbox * @see org.eclipse.debug.internal.ui.viewers.model.provisional.ICheckboxModelProxy#setChecked(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object, org.eclipse.jface.viewers.TreePath, boolean) */ public boolean setChecked(IPresentationContext context, Object viewerInput, TreePath path, boolean checked) { - System.out.println("TrackCheckListener.setChecked() element = " + path.getLastSegment() + " checked = " + checked); + System.out.println("TrackCheckListener.setChecked() element = " + path.getLastSegment() + " checked = " + checked); //$NON-NLS-1$ //$NON-NLS-2$ gChecked.put(path, Boolean.valueOf(checked)); return true; } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiStepOverHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiStepOverHandler.java index fb2bdaafa..440b79e46 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiStepOverHandler.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/MidiStepOverHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -38,7 +38,7 @@ public class MidiStepOverHandler implements IStepOverHandler { public boolean execute(IDebugCommandRequest request) { // We could create a job to do this work, schedule it, then return to be asynchronous // If running asynchronously, remember to return the enablement you want the action to have while this action is run - request.setStatus(new Status(IStatus.WARNING,"org.eclipse.debug.examples.ui","This is an example command handler overriding the default using an adapter on " + request.getElements()[0].getClass().getName())); + request.setStatus(new Status(IStatus.WARNING, "org.eclipse.debug.examples.ui", "This is an example command handler overriding the default using an adapter on " + request.getElements()[0].getClass().getName())); //$NON-NLS-1$ //$NON-NLS-2$ request.done(); return true; } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnPresentation.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnPresentation.java index 4542f844e..5be898b41 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnPresentation.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/SequencerColumnPresentation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,8 +22,8 @@ public class SequencerColumnPresentation extends AbstractColumnPresentation { /** * Column identifiers */ - public static final String COL_NAME = "NAME"; - public static final String COL_VALUE = "VALUE"; + public static final String COL_NAME = "NAME"; //$NON-NLS-1$ + public static final String COL_VALUE = "VALUE"; //$NON-NLS-1$ /** * All columns @@ -33,7 +33,7 @@ public class SequencerColumnPresentation extends AbstractColumnPresentation { /** * Column presentation ID. */ - public static final String ID = "org.eclipse.debug.examples.ui.midi.columnPresentation"; + public static final String ID = "org.eclipse.debug.examples.ui.midi.columnPresentation"; //$NON-NLS-1$ /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#getAvailableColumns() @@ -47,12 +47,12 @@ public class SequencerColumnPresentation extends AbstractColumnPresentation { */ public String getHeader(String id) { if (COL_NAME.equals(id)) { - return "Control"; + return "Control"; //$NON-NLS-1$ } if (COL_VALUE.equals(id)) { - return "Value"; + return "Value"; //$NON-NLS-1$ } - return ""; + return ""; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnPresentation.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnPresentation.java index 05713db26..a24ce8c19 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnPresentation.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackColumnPresentation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,10 +22,10 @@ public class TrackColumnPresentation extends AbstractColumnPresentation { /** * Column identifiers */ - public static final String COL_TICK = "TICK"; - public static final String COL_BYTES = "BYTES"; - public static final String COL_COMMAND = "COMMAND"; - public static final String COL_CHANNEL = "CHANNEL"; + public static final String COL_TICK = "TICK"; //$NON-NLS-1$ + public static final String COL_BYTES = "BYTES"; //$NON-NLS-1$ + public static final String COL_COMMAND = "COMMAND"; //$NON-NLS-1$ + public static final String COL_CHANNEL = "CHANNEL"; //$NON-NLS-1$ /** * All columns @@ -40,7 +40,7 @@ public class TrackColumnPresentation extends AbstractColumnPresentation { /** * Column presentation ID. */ - public static final String ID = "org.eclipse.debug.examples.ui.midi.trackColumns"; + public static final String ID = "org.eclipse.debug.examples.ui.midi.trackColumns"; //$NON-NLS-1$ /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#getAvailableColumns() @@ -54,18 +54,18 @@ public class TrackColumnPresentation extends AbstractColumnPresentation { */ public String getHeader(String id) { if (COL_TICK.equals(id)) { - return "Tick"; + return "Tick"; //$NON-NLS-1$ } if (COL_BYTES.equals(id)) { - return "Bytes"; + return "Bytes"; //$NON-NLS-1$ } if (COL_CHANNEL.equals(id)) { - return "Channel"; + return "Channel"; //$NON-NLS-1$ } if (COL_COMMAND.equals(id)) { - return "Command"; + return "Command"; //$NON-NLS-1$ } - return ""; + return ""; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackLabelProvider.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackLabelProvider.java index fa8f891fb..817ebb5be 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackLabelProvider.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/adapters/TrackLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -39,11 +39,11 @@ public class TrackLabelProvider extends ElementLabelProvider { } } StringBuffer buf = new StringBuffer(); - buf.append("Track "); + buf.append("Track "); //$NON-NLS-1$ buf.append(i); - buf.append(" ["); + buf.append(" ["); //$NON-NLS-1$ buf.append(track.size()); - buf.append(" events]"); + buf.append(" events]"); //$NON-NLS-1$ return buf.toString(); } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ClockSliderDetailPane.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ClockSliderDetailPane.java index 234618f4a..d80481839 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ClockSliderDetailPane.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ClockSliderDetailPane.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -77,7 +77,7 @@ public class ClockSliderDetailPane implements IDetailPane { * @see org.eclipse.debug.ui.IDetailPane#getDescription() */ public String getDescription() { - return "Location (seconds)"; + return "Location (seconds)"; //$NON-NLS-1$ } /* (non-Javadoc) @@ -91,7 +91,7 @@ public class ClockSliderDetailPane implements IDetailPane { * @see org.eclipse.debug.ui.IDetailPane#getName() */ public String getName() { - return "Clock Slider (seconds)"; + return "Clock Slider (seconds)"; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ControlDetailPaneFactory.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ControlDetailPaneFactory.java index 10353fd57..fda22c034 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ControlDetailPaneFactory.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/ControlDetailPaneFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,12 +29,12 @@ public class ControlDetailPaneFactory implements IDetailPaneFactory { /** * Identifier for the tempo slider detail pane */ - public static final String ID_TEMPO_SLIDER = "TEMPO_SLIDER"; + public static final String ID_TEMPO_SLIDER = "TEMPO_SLIDER"; //$NON-NLS-1$ /** * Identifier for the clock slider detail pane */ - public static final String ID_CLOCK_SLIDER = "CLOCK_SLIDER"; + public static final String ID_CLOCK_SLIDER = "CLOCK_SLIDER"; //$NON-NLS-1$ /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPaneFactory#createDetailPane(java.lang.String) @@ -70,10 +70,10 @@ public class ControlDetailPaneFactory implements IDetailPaneFactory { */ public String getDetailPaneDescription(String paneID) { if (ID_TEMPO_SLIDER.equals(paneID)) { - return "Tempo Slider"; + return "Tempo Slider"; //$NON-NLS-1$ } if (ID_CLOCK_SLIDER.equals(paneID)) { - return "Clock Slider"; + return "Clock Slider"; //$NON-NLS-1$ } return null; } @@ -83,10 +83,10 @@ public class ControlDetailPaneFactory implements IDetailPaneFactory { */ public String getDetailPaneName(String paneID) { if (ID_TEMPO_SLIDER.equals(paneID)) { - return "Tempo Slider"; + return "Tempo Slider"; //$NON-NLS-1$ } if (ID_CLOCK_SLIDER.equals(paneID)) { - return "Clock Slider"; + return "Clock Slider"; //$NON-NLS-1$ } return null; } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/TempoSliderDetailPane.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/TempoSliderDetailPane.java index d5e1c7bb7..ccce38df3 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/TempoSliderDetailPane.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/detailpanes/TempoSliderDetailPane.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -74,7 +74,7 @@ public class TempoSliderDetailPane implements IDetailPane { * @see org.eclipse.debug.ui.IDetailPane#getDescription() */ public String getDescription() { - return "Tempo (beats per minute)"; + return "Tempo (beats per minute)"; //$NON-NLS-1$ } /* (non-Javadoc) @@ -88,7 +88,7 @@ public class TempoSliderDetailPane implements IDetailPane { * @see org.eclipse.debug.ui.IDetailPane#getName() */ public String getName() { - return "Tempo Slider (BPM)"; + return "Tempo Slider (BPM)"; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/ExampleLaunchStatusHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/ExampleLaunchStatusHandler.java index 16562cdd8..2af3957ef 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/ExampleLaunchStatusHandler.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/ExampleLaunchStatusHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -26,7 +26,7 @@ public class ExampleLaunchStatusHandler implements IStatusHandler { if (source instanceof ILaunchConfigurationDialog) { return null; } - throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.debug.examples.ui", "'source' should be an instanceof ILaunchConfigrationDialog")); + throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.debug.examples.ui", "'source' should be an instanceof ILaunchConfigrationDialog")); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiLaunchShortcut.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiLaunchShortcut.java index 3421dd217..987b12bb4 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiLaunchShortcut.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiLaunchShortcut.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -121,8 +121,8 @@ public class MidiLaunchShortcut implements ILaunchShortcut { IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation(); ElementListSelectionDialog dialog= new ElementListSelectionDialog(DebugUIPlugin.getActiveWorkbenchShell(), labelProvider); dialog.setElements(configList.toArray()); - dialog.setTitle("Select Configuraiton"); - dialog.setMessage("&Select an existing configuration:"); + dialog.setTitle("Select Configuraiton"); //$NON-NLS-1$ + dialog.setMessage("&Select an existing configuration:"); //$NON-NLS-1$ dialog.setMultipleSelection(false); int result = dialog.open(); labelProvider.dispose(); @@ -144,7 +144,7 @@ public class MidiLaunchShortcut implements ILaunchShortcut { try { ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, getLaunchManager(). generateLaunchConfigurationName( - "[" + file.getProject().getName() + "] " + file.getName())); +"[" + file.getProject().getName() + "] " + file.getName())); //$NON-NLS-1$ //$NON-NLS-2$ workingCopy.setAttribute(MidiLaunchDelegate.ATTR_MIDI_FILE, file.getFullPath().toString()); workingCopy.setMappedResources(new IResource[]{file}); return workingCopy.doSave(); diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java index d063008b4..b7d2bd092 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiMainTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -71,7 +71,7 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab { createVerticalSpacer(comp, 3); Label programLabel = new Label(comp, SWT.NONE); - programLabel.setText("&Midi File:"); + programLabel.setText("&Midi File:"); //$NON-NLS-1$ GridData gd = new GridData(GridData.BEGINNING); programLabel.setLayoutData(gd); programLabel.setFont(font); @@ -98,13 +98,13 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab { gd.horizontalSpan = 3; Group test = new Group(comp, SWT.NONE); - test.setText("Exceptions"); + test.setText("Exceptions"); //$NON-NLS-1$ gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 3; test.setLayoutData(gd); test.setLayout(new GridLayout()); fExceptions = new Button(test, SWT.CHECK); - fExceptions.setText("&Throw an exception during launch for testing purposes"); + fExceptions.setText("&Throw an exception during launch for testing purposes"); //$NON-NLS-1$ gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 3; fExceptions.setLayoutData(gd); @@ -116,7 +116,7 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab { } }); fHandled = new Button(test, SWT.RADIO); - fHandled.setText("Throw a handled e&xception during launch to re-open launch dialog"); + fHandled.setText("Throw a handled e&xception during launch to re-open launch dialog"); //$NON-NLS-1$ SelectionAdapter sa = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); @@ -124,7 +124,7 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab { }; fHandled.addSelectionListener(sa); fUnhandled = new Button(test, SWT.RADIO); - fUnhandled.setText("Throw an &unhandled exception during launch to open error dialog"); + fUnhandled.setText("Throw an &unhandled exception during launch to open error dialog"); //$NON-NLS-1$ fUnhandled.addSelectionListener(sa); } @@ -133,8 +133,8 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab { */ protected void browseMidiFiles() { ResourceListSelectionDialog dialog = new ResourceListSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), IResource.FILE); - dialog.setTitle("MIDI File"); - dialog.setMessage("Select MIDI File"); + dialog.setTitle("MIDI File"); //$NON-NLS-1$ + dialog.setMessage("Select MIDI File"); //$NON-NLS-1$ if (dialog.open() == Window.OK) { Object[] files = dialog.getResult(); IFile file = (IFile) files[0]; @@ -206,7 +206,7 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab { * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ public String getName() { - return "Main"; + return "Main"; //$NON-NLS-1$ } /* (non-Javadoc) @@ -219,11 +219,11 @@ public class MidiMainTab extends AbstractLaunchConfigurationTab { if (text.length() > 0) { IPath path = new Path(text); if (ResourcesPlugin.getWorkspace().getRoot().findMember(path) == null) { - setErrorMessage("File does not exist"); + setErrorMessage("File does not exist"); //$NON-NLS-1$ return false; } } else { - setMessage("Select a MIDI file"); + setMessage("Select a MIDI file"); //$NON-NLS-1$ } return true; } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/DebugUIPlugin.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/DebugUIPlugin.java index f46234338..523952c40 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/DebugUIPlugin.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/DebugUIPlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,9 +15,9 @@ import java.net.URL; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.MissingResourceException; import java.util.ResourceBundle; -import java.util.Map.Entry; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; @@ -47,24 +47,24 @@ public class DebugUIPlugin extends AbstractUIPlugin { /** * Toolbar action to pop data stack */ - public final static String IMG_ELCL_POP = "IMG_ELCL_POP"; - public final static String IMG_DLCL_POP = "IMG_DLCL_POP"; + public final static String IMG_ELCL_POP = "IMG_ELCL_POP"; //$NON-NLS-1$ + public final static String IMG_DLCL_POP = "IMG_DLCL_POP"; //$NON-NLS-1$ /** * Toolbar action to push onto data stack */ - public final static String IMG_ELCL_PUSH = "IMG_ELCL_PUSH"; - public final static String IMG_DLCL_PUSH = "IMG_DLCL_PUSH"; + public final static String IMG_ELCL_PUSH = "IMG_ELCL_PUSH"; //$NON-NLS-1$ + public final static String IMG_DLCL_PUSH = "IMG_DLCL_PUSH"; //$NON-NLS-1$ /** * PDA program image */ - public final static String IMG_OBJ_PDA = "IMB_OBJ_PDA"; + public final static String IMG_OBJ_PDA = "IMB_OBJ_PDA"; //$NON-NLS-1$ /** * MIDI file image */ - public final static String IMG_OBJ_MIDI = "IMB_OBJ_MIDI"; + public final static String IMG_OBJ_MIDI = "IMB_OBJ_MIDI"; //$NON-NLS-1$ /** * Keyword color @@ -75,7 +75,7 @@ public class DebugUIPlugin extends AbstractUIPlugin { /** * Managed colors */ - private Map fColors = new HashMap(); + private final Map fColors = new HashMap(); /** * The constructor. @@ -136,7 +136,9 @@ public class DebugUIPlugin extends AbstractUIPlugin { public ResourceBundle getResourceBundle() { try { if (resourceBundle == null) - resourceBundle = ResourceBundle.getBundle("org.eclipse.debug.examples.ui.pda.DebugUIPluginResources"); + { + resourceBundle = ResourceBundle.getBundle("org.eclipse.debug.examples.ui.pda.DebugUIPluginResources"); //$NON-NLS-1$ + } } catch (MissingResourceException x) { resourceBundle = null; } @@ -148,12 +150,12 @@ public class DebugUIPlugin extends AbstractUIPlugin { * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry) */ protected void initializeImageRegistry(ImageRegistry reg) { - declareImage(IMG_OBJ_PDA, PATH_OBJECT + "pda.gif"); - declareImage(IMG_OBJ_MIDI, PATH_OBJECT + "note.gif"); - declareImage(IMG_ELCL_POP, PATH_ELOCALTOOL + "pop.gif"); - declareImage(IMG_DLCL_POP, PATH_DLOCALTOOL + "pop.gif"); - declareImage(IMG_ELCL_PUSH, PATH_ELOCALTOOL + "push.gif"); - declareImage(IMG_DLCL_PUSH, PATH_DLOCALTOOL + "push.gif"); + declareImage(IMG_OBJ_PDA, PATH_OBJECT + "pda.gif"); //$NON-NLS-1$ + declareImage(IMG_OBJ_MIDI, PATH_OBJECT + "note.gif"); //$NON-NLS-1$ + declareImage(IMG_ELCL_POP, PATH_ELOCALTOOL + "pop.gif"); //$NON-NLS-1$ + declareImage(IMG_DLCL_POP, PATH_DLOCALTOOL + "pop.gif"); //$NON-NLS-1$ + declareImage(IMG_ELCL_PUSH, PATH_ELOCALTOOL + "push.gif"); //$NON-NLS-1$ + declareImage(IMG_DLCL_PUSH, PATH_DLOCALTOOL + "push.gif"); //$NON-NLS-1$ } /** @@ -167,7 +169,7 @@ public class DebugUIPlugin extends AbstractUIPlugin { * <code>false</code> if this is not a shared image */ private void declareImage(String key, String path) { - URL url = BundleUtility.find("org.eclipse.debug.examples.ui", path); + URL url = BundleUtility.find("org.eclipse.debug.examples.ui", path); //$NON-NLS-1$ ImageDescriptor desc = ImageDescriptor.createFromURL(url); getImageRegistry().put(key, desc); } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java index ab77bd09d..60d0bbc6c 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -108,6 +108,10 @@ public class PDAThreadEventHandler extends DebugEventHandler { return newdelta.addNode(debugTarget, indexOf(children, debugTarget), IModelDelta.NO_CHANGE, numFrames); } + /** + * @param thread + * @param flags + */ private void fireDeltaAndClearTopFrame(IThread thread, int flags) { ModelDelta delta = buildRootDelta(); addTarget(delta, thread); diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java index d594d8fab..b5e613ef3 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2012 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -62,7 +62,7 @@ import org.eclipse.ui.texteditor.IUpdate; */ public class PDAVirtualFindAction extends Action implements IUpdate { - private TreeModelViewer fClientViewer; + private final TreeModelViewer fClientViewer; protected class VirtualViewerListener implements IViewerUpdateListener, ILabelUpdateListener { @@ -121,8 +121,8 @@ public class PDAVirtualFindAction extends Action implements IUpdate { } private static class FindLabelProvider extends LabelProvider { - private VirtualTreeModelViewer fVirtualViewer; - private Map fTextCache = new HashMap(); + private final VirtualTreeModelViewer fVirtualViewer; + private final Map fTextCache = new HashMap(); public FindLabelProvider(VirtualTreeModelViewer viewer, List items) { fVirtualViewer = viewer; for (int i = 0; i < items.size(); i++) { @@ -141,7 +141,7 @@ public class PDAVirtualFindAction extends Action implements IUpdate { } public PDAVirtualFindAction(IPresentationContext context) { - setText("Find"); + setText("Find"); //$NON-NLS-1$ setId(DebugUIPlugin.getUniqueIdentifier() + ".FindElementAction"); //$NON-NLS-1$ PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.FIND_ELEMENT_ACTION); setActionDefinitionId(IWorkbenchCommandConstants.EDIT_FIND_AND_REPLACE); @@ -280,8 +280,8 @@ public class PDAVirtualFindAction extends Action implements IUpdate { fClientViewer.getControl().getShell(), labelProvider, items.toArray()); - dialog.setTitle("PDA Variables View Find"); - dialog.setMessage("&Specify an element to select (? = any character, * = any String):"); + dialog.setTitle("PDA Variables View Find"); //$NON-NLS-1$ + dialog.setMessage("&Specify an element to select (? = any character, * = any String):"); //$NON-NLS-1$ if (dialog.open() == Window.OK) { Object[] elements = dialog.getResult(); if (elements.length == 1) { @@ -304,9 +304,9 @@ public class PDAVirtualFindAction extends Action implements IUpdate { } else { DebugUIPlugin.errorDialog( fClientViewer.getControl().getShell(), - "Error", - "Could not select item:" + labelProvider.getText(findItem), - new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), "Element no longer in viewer.")); + "Error", //$NON-NLS-1$ + "Could not select item:" + labelProvider.getText(findItem), //$NON-NLS-1$ + new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), "Element no longer in viewer.")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDABreakpointAdapter.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDABreakpointAdapter.java index 0f2639f7c..6eba0bad9 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDABreakpointAdapter.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDABreakpointAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -81,7 +81,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension { IResource resource = (IResource) editorPart.getEditorInput().getAdapter(IResource.class); if (resource != null) { String extension = resource.getFileExtension(); - if (extension != null && extension.equals("pda")) { + if (extension != null && extension.equals("pda")) { //$NON-NLS-1$ return editorPart; } } @@ -161,7 +161,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension { IDocument document = documentProvider.getDocument(editor.getEditorInput()); IRegion region = document.getLineInformationOfOffset(textSelection.getOffset()); String string = document.get(region.getOffset(), region.getLength()).trim(); - if (string.startsWith("var ")) { + if (string.startsWith("var ")) { //$NON-NLS-1$ String varName = string.substring(4).trim(); String fcnName = getFunctionName(document, varName, document.getLineOfOffset(textSelection.getOffset())); return new String[] {varName, fcnName}; @@ -194,9 +194,9 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension { try { IRegion information = document.getLineInformation(lineIndex); String lineText = document.get(information.getOffset(), information.getLength()); - if (lineText.startsWith(":")) { + if (lineText.startsWith(":")) { //$NON-NLS-1$ String label = lineText.substring(1); - if (source.indexOf("call " + label) >= 0) { + if (source.indexOf("call " + label) >= 0) { //$NON-NLS-1$ return label; } } @@ -204,7 +204,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension { } catch (BadLocationException e) { } } - return "_main_"; + return "_main_"; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAEditorAdapterFactory.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAEditorAdapterFactory.java index c67200a40..4fd2f8504 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAEditorAdapterFactory.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAEditorAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -32,7 +32,7 @@ public class PDAEditorAdapterFactory implements IAdapterFactory { IResource resource = (IResource) editorPart.getEditorInput().getAdapter(IResource.class); if (resource != null) { String extension = resource.getFileExtension(); - if (extension != null && extension.equals("pda")) { + if (extension != null && extension.equals("pda")) { //$NON-NLS-1$ if (adapterType.equals(IToggleBreakpointsTarget.class)) { return new PDABreakpointAdapter(); } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java index 4c51afeb9..f5f6afb89 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -85,7 +85,7 @@ public class PDAToggleWatchpointsTarget extends PDABreakpointAdapter { final PDAStackFrame frame = var.getStackFrame(); final Shell shell = part.getSite().getShell(); - new Job("Toggle PDA Watchpoint") { + new Job("Toggle PDA Watchpoint") { //$NON-NLS-1$ { setSystem(true); } protected IStatus run(IProgressMonitor monitor) { @@ -98,11 +98,11 @@ public class PDAToggleWatchpointsTarget extends PDABreakpointAdapter { } catch (final CoreException e) { // Need to switch back to the UI thread to show the error // dialog. - new WorkbenchJob(shell.getDisplay(), "Toggle PDA Watchpoint") { + new WorkbenchJob(shell.getDisplay(), "Toggle PDA Watchpoint") { //$NON-NLS-1$ { setSystem(true); } - public IStatus runInUIThread(IProgressMonitor monitor) { - ErrorDialog.openError(shell, "Failed to create PDA watchpoint", "Failed to create PDA watchpoint.\n", e.getStatus()); + public IStatus runInUIThread(IProgressMonitor submonitor) { + ErrorDialog.openError(shell, "Failed to create PDA watchpoint", "Failed to create PDA watchpoint.\n", e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$ return Status.OK_STATUS; } }.schedule(); @@ -129,8 +129,8 @@ public class PDAToggleWatchpointsTarget extends PDABreakpointAdapter { try { while(true) { String line = reader.readLine().trim(); - if (line.startsWith("var")) { - String varName = line.substring("var".length()).trim(); + if (line.startsWith("var")) { //$NON-NLS-1$ + String varName = line.substring("var".length()).trim(); //$NON-NLS-1$ if (varName.equals(var)) { break; } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTargetFactory.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTargetFactory.java index 9c9ebd9cc..e0f5c2652 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTargetFactory.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTargetFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.ui.pda.breakpoints; @@ -27,13 +28,13 @@ import org.eclipse.ui.IWorkbenchPart; */ public class PDAToggleWatchpointsTargetFactory implements IToggleBreakpointsTargetFactory { - private static final String TOGGLE_WATCHPOINT_TARGET_ACCESS = "org.eclipse.debug.examples.ui.pda.watchpoint_access"; - private static final String TOGGLE_WATCHPOINT_TARGET_MODIFICATION = "org.eclipse.debug.examples.ui.pda.watchpoint_modification"; - private static final String TOGGLE_WATCHPOINT_TARGET_BOTH = "org.eclipse.debug.examples.ui.pda.watchpoint_both"; + private static final String TOGGLE_WATCHPOINT_TARGET_ACCESS = "org.eclipse.debug.examples.ui.pda.watchpoint_access"; //$NON-NLS-1$ + private static final String TOGGLE_WATCHPOINT_TARGET_MODIFICATION = "org.eclipse.debug.examples.ui.pda.watchpoint_modification"; //$NON-NLS-1$ + private static final String TOGGLE_WATCHPOINT_TARGET_BOTH = "org.eclipse.debug.examples.ui.pda.watchpoint_both"; //$NON-NLS-1$ private static Set TOGGLE_WATCHPOINTS_TARGETS = new LinkedHashSet(); - private Map fToggleWatchpointTargets = new HashMap(3); + private final Map fToggleWatchpointTargets = new HashMap(3); static { TOGGLE_WATCHPOINTS_TARGETS.add(TOGGLE_WATCHPOINT_TARGET_BOTH); @@ -68,11 +69,11 @@ public class PDAToggleWatchpointsTargetFactory implements IToggleBreakpointsTarg public String getToggleTargetName(String targetID) { if (TOGGLE_WATCHPOINT_TARGET_BOTH.equals(targetID)) { - return "Watchpoints (Read/Write)"; + return "Watchpoints (Read/Write)"; //$NON-NLS-1$ } else if (TOGGLE_WATCHPOINT_TARGET_ACCESS.equals(targetID)) { - return "Watchpoints (Read)"; + return "Watchpoints (Read)"; //$NON-NLS-1$ } else if (TOGGLE_WATCHPOINT_TARGET_MODIFICATION.equals(targetID)) { - return "Watchpoints (Write)"; + return "Watchpoints (Write)"; //$NON-NLS-1$ } else { return null; } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAContentAssistProcessor.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAContentAssistProcessor.java index 5d7089472..469bf452f 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAContentAssistProcessor.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAContentAssistProcessor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -48,14 +48,14 @@ public class PDAContentAssistProcessor implements IContentAssistProcessor { for (int i = 0; i < keywords.length; i++) { String keyword = keywords[i]; if (keyword.startsWith(word) && word.length() < keyword.length()) { - proposals.add(new CompletionProposal(keyword + " ", index + 1, offset - (index + 1), keyword.length() + 1)); + proposals.add(new CompletionProposal(keyword + " ", index + 1, offset - (index + 1), keyword.length() + 1)); //$NON-NLS-1$ } } } else { // propose all keywords for (int i = 0; i < keywords.length; i++) { String keyword = keywords[i]; - proposals.add(new CompletionProposal(keyword + " ", offset, 0, keyword.length() + 1)); + proposals.add(new CompletionProposal(keyword + " ", offset, 0, keyword.length() + 1)); //$NON-NLS-1$ } } if (!proposals.isEmpty()) { diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAEditor.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAEditor.java index 3617cb172..2d7ab812e 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAEditor.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,8 +29,8 @@ public class PDAEditor extends AbstractDecoratedTextEditor { public PDAEditor() { super(); setSourceViewerConfiguration(new PDASourceViewerConfiguration()); - setRulerContextMenuId("pda.editor.rulerMenu"); - setEditorContextMenuId("pda.editor.editorMenu"); + setRulerContextMenuId("pda.editor.rulerMenu"); //$NON-NLS-1$ + setEditorContextMenuId("pda.editor.editorMenu"); //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java index b62d0ba45..2956ada7a 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,8 +29,8 @@ public class PDAScanner extends BufferedRuleBasedScanner { * PDA keywods */ public static final String[] fgKeywords = new String[] { - "add", "branch_not_zero", "call", "dec", "dup", - "halt", "output", "pop", "push", "return", "var" + "add", "branch_not_zero", "call", "dec", "dup", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + "halt", "output", "pop", "push", "return", "var" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ }; /** diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/TextHover.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/TextHover.java index 6b14e4c74..26ca31c0c 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/TextHover.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/TextHover.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -40,7 +40,7 @@ public class TextHover implements ITextHover { } catch (BadLocationException e) { return null; } - if (varName.startsWith("$") && varName.length() > 1) { + if (varName.startsWith("$") && varName.length() > 1) { //$NON-NLS-1$ varName = varName.substring(1); } @@ -72,7 +72,7 @@ public class TextHover implements ITextHover { for (int i = 0; i < variables.length; i++) { IVariable variable = variables[i]; if (variable.getName().equals(varName)) { - return varName + " = " + variable.getValue().getValueString(); + return varName + " = " + variable.getValue().getValueString(); //$NON-NLS-1$ } } } catch (DebugException e) { diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java index ea854dad9..a99f6834d 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -66,7 +66,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab { createVerticalSpacer(comp, 3); Label programLabel = new Label(comp, SWT.NONE); - programLabel.setText("&Program:"); + programLabel.setText("&Program:"); //$NON-NLS-1$ GridData gd = new GridData(GridData.BEGINNING); programLabel.setLayoutData(gd); programLabel.setFont(font); @@ -94,8 +94,8 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab { */ protected void browsePDAFiles() { ResourceListSelectionDialog dialog = new ResourceListSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), IResource.FILE); - dialog.setTitle("PDA Program"); - dialog.setMessage("Select PDA Program"); + dialog.setTitle("PDA Program"); //$NON-NLS-1$ + dialog.setMessage("Select PDA Program"); //$NON-NLS-1$ if (dialog.open() == Window.OK) { Object[] files = dialog.getResult(); IFile file = (IFile) files[0]; @@ -161,7 +161,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab { * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ public String getName() { - return "Main"; + return "Main"; //$NON-NLS-1$ } /* (non-Javadoc) @@ -180,15 +180,15 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab { IPath path = new Path(text); IResource member = ResourcesPlugin.getWorkspace().getRoot().findMember(path); if (member == null) { - setErrorMessage("Specified program does not exist"); + setErrorMessage("Specified program does not exist"); //$NON-NLS-1$ return false; } else { if (member.getType() != IResource.FILE) { - setWarningMessage("Specified program is not a file."); + setWarningMessage("Specified program is not a file."); //$NON-NLS-1$ } } } else { - setMessage("Specify a program"); + setMessage("Specify a program"); //$NON-NLS-1$ } //#endif return true; diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/presentation/PDAModelPresentation.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/presentation/PDAModelPresentation.java index 7d5d3ba91..4f5455edb 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/presentation/PDAModelPresentation.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/presentation/PDAModelPresentation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -66,12 +66,12 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr */ private String getWatchpointText(PDAWatchpoint watchpoint) { try { - String label = watchpoint.getVariableName() + " (" + watchpoint.getFunctionName() + ")"; + String label = watchpoint.getVariableName() + " (" + watchpoint.getFunctionName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ if (watchpoint.isAccess()) { - label += " [read]"; + label += " [read]"; //$NON-NLS-1$ } if (watchpoint.isModification()) { - label += " [write]"; + label += " [write]"; //$NON-NLS-1$ } return label; } catch (CoreException e) { @@ -89,15 +89,15 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr String pgmPath = target.getLaunch().getLaunchConfiguration().getAttribute(DebugCorePlugin.ATTR_PDA_PROGRAM, (String)null); if (pgmPath != null) { IPath path = new Path(pgmPath); - String label = ""; + String label = ""; //$NON-NLS-1$ if (target.isTerminated()) { - label = "<terminated>"; + label = "<terminated>"; //$NON-NLS-1$ } - return label + "PDA [" + path.lastSegment() + "]"; + return label + "PDA [" + path.lastSegment() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } } catch (CoreException e) { } - return "PDA"; + return "PDA"; //$NON-NLS-1$ } @@ -109,7 +109,7 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr */ private String getStackFrameText(PDAStackFrame frame) { try { - return frame.getName() + " (line: " + frame.getLineNumber() + ")"; + return frame.getName() + " (line: " + frame.getLineNumber() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } catch (DebugException e) { } return null; @@ -125,14 +125,14 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr private String getThreadText(PDAThread thread) { String label = thread.getName(); if (thread.isStepping()) { - label += " (stepping)"; + label += " (stepping)"; //$NON-NLS-1$ } else if (thread.isSuspended()) { IBreakpoint[] breakpoints = thread.getBreakpoints(); if (breakpoints.length == 0) { if (thread.getError() == null) { - label += " (suspended)"; + label += " (suspended)"; //$NON-NLS-1$ } else { - label += " (" + thread.getError() + ")"; + label += " (" + thread.getError() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } } else { IBreakpoint breakpoint = breakpoints[0]; // there can only be one in PDA @@ -141,18 +141,18 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr if (pdaBreakpoint instanceof PDAWatchpoint) { try { PDAWatchpoint watchpoint = (PDAWatchpoint)pdaBreakpoint; - label += " (watchpoint: " + watchpoint.getSuspendType() + " " + watchpoint.getVariableName() + ")"; + label += " (watchpoint: " + watchpoint.getSuspendType() + " " + watchpoint.getVariableName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } catch (CoreException e) { } } else if (pdaBreakpoint.isRunToLineBreakpoint()) { - label += " (run to line)"; + label += " (run to line)"; //$NON-NLS-1$ } else { - label += " (suspended at line breakpoint)"; + label += " (suspended at line breakpoint)"; //$NON-NLS-1$ } } } } else if (thread.isTerminated()) { - label = "<terminated> " + label; + label = "<terminated> " + label; //$NON-NLS-1$ } return label; } @@ -161,7 +161,7 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr * @see org.eclipse.debug.ui.IDebugModelPresentation#computeDetail(org.eclipse.debug.core.model.IValue, org.eclipse.debug.ui.IValueDetailListener) */ public void computeDetail(IValue value, IValueDetailListener listener) { - String detail = ""; + String detail = ""; //$NON-NLS-1$ try { detail = value.getValueString(); } catch (DebugException e) { @@ -185,7 +185,7 @@ public class PDAModelPresentation extends LabelProvider implements IDebugModelPr */ public String getEditorId(IEditorInput input, Object element) { if (element instanceof IFile || element instanceof ILineBreakpoint) { - return "pda.editor"; + return "pda.editor"; //$NON-NLS-1$ } return null; } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/AbstractDataStackViewHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/AbstractDataStackViewHandler.java index d9a279f4b..de469e544 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/AbstractDataStackViewHandler.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/AbstractDataStackViewHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.ui.pda.views; @@ -50,7 +51,7 @@ abstract public class AbstractDataStackViewHandler extends AbstractHandler { } } } else { - throw new ExecutionException("Handler must be with DataStackView only"); + throw new ExecutionException("Handler must be with DataStackView only"); //$NON-NLS-1$ } return null; } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CanPushTester.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CanPushTester.java index 10b5acd31..f44bf86da 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CanPushTester.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CanPushTester.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.ui.pda.views; @@ -22,7 +23,7 @@ import org.eclipse.debug.examples.core.pda.model.PDAThread; */ public class CanPushTester extends PropertyTester { - private static final String CAN_PUSH_PROPERTY = "canPush"; + private static final String CAN_PUSH_PROPERTY = "canPush"; //$NON-NLS-1$ public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { if (CAN_PUSH_PROPERTY.equals(property)) { diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CheckboxView.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CheckboxView.java index 13c5cb885..5accdf183 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CheckboxView.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/CheckboxView.java @@ -1,5 +1,5 @@ /***************************************************************** - * Copyright (c) 2009 Texas Instruments and others + * Copyright (c) 2009, 2013 Texas Instruments and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,7 +15,7 @@ import org.eclipse.debug.internal.ui.views.variables.VariablesView; import org.eclipse.swt.SWT; public class CheckboxView extends VariablesView { - public static String ID = "CHECKBOX_VIEW_ID"; + public static String ID = "CHECKBOX_VIEW_ID"; //$NON-NLS-1$ protected int getViewerStyle() { return SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.VIRTUAL | SWT.FULL_SELECTION | SWT.CHECK; diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/DataStackView.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/DataStackView.java index 5e040fdbe..d6ec8a50a 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/DataStackView.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/DataStackView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2010 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * Bjorn Freeman-Benson - initial API and implementation * Wind River - Pawel Piech - replaced actions with handlers (bug 229219) * Pawel Piech (Wind River) - ported PDA Virtual Machine to Java (Bug 261400) -******************************************************************************/ + ******************************************************************************/ package org.eclipse.debug.examples.ui.pda.views; import org.eclipse.core.runtime.IProgressMonitor; @@ -139,7 +139,7 @@ public class DataStackView extends AbstractDebugView implements IDebugContextLis } public void debugContextChanged(final DebugContextEvent event) { - new UIJob(getSite().getShell().getDisplay(), "DataStackView update") { + new UIJob(getSite().getShell().getDisplay(), "DataStackView update") { //$NON-NLS-1$ { setSystem(true); } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PopHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PopHandler.java index 1c0c5bc72..37157162b 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PopHandler.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PopHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.ui.pda.views; @@ -51,7 +52,7 @@ public class PopHandler extends AbstractDataStackViewHandler { thread.pushData(value.getValueString()); } } catch (DebugException e) { - throw new ExecutionException("Failed to execute push command", e); + throw new ExecutionException("Failed to execute push command", e); //$NON-NLS-1$ } viewer.refresh(); } diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PushHandler.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PushHandler.java index 58fbc7c0e..d8fb433cc 100644 --- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PushHandler.java +++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/views/PushHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipse.debug.examples.ui.pda.views; @@ -23,12 +24,12 @@ import org.eclipse.jface.window.Window; public class PushHandler extends AbstractDataStackViewHandler { protected void doExecute(DataStackView view, PDAThread thread, ISelection selection) throws ExecutionException { - InputDialog dialog = new InputDialog(view.getSite().getShell(), "Specify Value", "Enter value to push", null, null); + InputDialog dialog = new InputDialog(view.getSite().getShell(), "Specify Value", "Enter value to push", null, null); //$NON-NLS-1$ //$NON-NLS-2$ if (dialog.open() == Window.OK) { try { thread.pushData(dialog.getValue()); } catch (DebugException e) { - throw new ExecutionException("Failed to execute push command", e); + throw new ExecutionException("Failed to execute push command", e); //$NON-NLS-1$ } } view.getViewer().refresh(); diff --git a/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs index 4ebe0a927..5d7a22fe3 100644 --- a/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.debug.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,123 +1,409 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-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.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
+eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=error +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=warning +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.3 +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_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_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_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +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.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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 +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_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=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_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_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_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.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.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_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 diff --git a/org.eclipse.debug.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.debug.tests/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..13d5dca2c --- /dev/null +++ b/org.eclipse.debug.tests/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,109 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_Platform Debug 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_settings_version=12 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=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 +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +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.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +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 +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=true +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_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/org.eclipse.debug.tests/META-INF/MANIFEST.MF b/org.eclipse.debug.tests/META-INF/MANIFEST.MF index c89704cad..02801facd 100644 --- a/org.eclipse.debug.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.debug.tests;singleton:=true -Bundle-Version: 3.9.0.qualifier +Bundle-Version: 3.9.100.qualifier Bundle-Activator: org.eclipse.debug.tests.TestsPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", diff --git a/org.eclipse.debug.tests/pom.xml b/org.eclipse.debug.tests/pom.xml index 918ffa323..816aba599 100644 --- a/org.eclipse.debug.tests/pom.xml +++ b/org.eclipse.debug.tests/pom.xml @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.debug</groupId> <artifactId>org.eclipse.debug.tests</artifactId> - <version>3.9.0-SNAPSHOT</version> + <version>3.9.100-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project> diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/AcceleratorSubstitutionTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/AcceleratorSubstitutionTests.java index ddf76214e..dfb9a9783 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/AcceleratorSubstitutionTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/AcceleratorSubstitutionTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,26 +34,26 @@ public class AcceleratorSubstitutionTests extends TestCase { * tests a string with "..." */ public void testWithEllipses() { - assertEquals("incorrect DBCS accelerator substitution", - "Open Run Dialog(&R)...", - DebugUIPlugin.adjustDBCSAccelerator("Open Run(&R) Dialog...")); + assertEquals("incorrect DBCS accelerator substitution", //$NON-NLS-1$ + "Open Run Dialog(&R)...", //$NON-NLS-1$ + DebugUIPlugin.adjustDBCSAccelerator("Open Run(&R) Dialog...")); //$NON-NLS-1$ } /** * tests a string without "..." */ public void testWithoutEllipses() { - assertEquals("incorrect DBCS accelerator substitution", - "Open Run Dialog(&R)", - DebugUIPlugin.adjustDBCSAccelerator("Open Run(&R) Dialog")); + assertEquals("incorrect DBCS accelerator substitution", //$NON-NLS-1$ + "Open Run Dialog(&R)", //$NON-NLS-1$ + DebugUIPlugin.adjustDBCSAccelerator("Open Run(&R) Dialog")); //$NON-NLS-1$ } /** * tests a string that should not change (no DBCS style accelerator). */ public void testWithoutDBCSAcclerator() { - assertEquals("incorrect DBCS accelerator substitution", - "Open &Run Dialog...", - DebugUIPlugin.adjustDBCSAccelerator("Open &Run Dialog...")); + assertEquals("incorrect DBCS accelerator substitution", //$NON-NLS-1$ + "Open &Run Dialog...", //$NON-NLS-1$ + DebugUIPlugin.adjustDBCSAccelerator("Open &Run Dialog...")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/ArgumentParsingTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/ArgumentParsingTests.java index b42235869..3330c2872 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/ArgumentParsingTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/ArgumentParsingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. + * Copyright (c) 2012, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -45,7 +45,7 @@ public class ArgumentParsingTests extends TestCase { } private void execute1Arg(String cmdLine, String argParsed, String rendered) throws Exception { - execute("a " + cmdLine + " b", new String[] { "a", argParsed, "b" }, "a " + rendered + " b"); + execute("a " + cmdLine + " b", new String[] { "a", argParsed, "b" }, "a " + rendered + " b"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ } private static void execute(String commandLine, String[] expectedArgs) throws Exception { @@ -54,18 +54,18 @@ public class ArgumentParsingTests extends TestCase { private static void execute(String commandLine, String[] expectedArgs, String expectedRendered) throws Exception { String[] arguments = DebugPlugin.parseArguments(commandLine); - assertEquals("unexpected parseArguments result;", + assertEquals("unexpected parseArguments result;", //$NON-NLS-1$ Arrays.asList(expectedArgs).toString(), Arrays.asList(arguments).toString()); runCommandLine(commandLine, arguments); String rendered = DebugPlugin.renderArguments(arguments, null); - assertEquals("unexpected renderArguments result;", expectedRendered, rendered); + assertEquals("unexpected renderArguments result;", expectedRendered, rendered); //$NON-NLS-1$ if (!commandLine.equals(rendered)) { String[] arguments2 = DebugPlugin.parseArguments(rendered); - assertEquals("parsing rendered command line doesn't yield original arguments;", + assertEquals("parsing rendered command line doesn't yield original arguments;", //$NON-NLS-1$ Arrays.asList(expectedArgs).toString(), Arrays.asList(arguments2).toString()); } @@ -74,7 +74,7 @@ public class ArgumentParsingTests extends TestCase { private static void runCommandLine(String commandLine, String[] arguments) throws IOException, URISyntaxException, CoreException { - URL classPathUrl = FileLocator.find(TestsPlugin.getDefault().getBundle(), new Path("bin/"), null); + URL classPathUrl = FileLocator.find(TestsPlugin.getDefault().getBundle(), new Path("bin/"), null); //$NON-NLS-1$ if (classPathUrl == null) { // not running from the workspace, but from the built bundle classPathUrl = FileLocator.find(TestsPlugin.getDefault().getBundle(), Path.ROOT, null); } @@ -82,22 +82,22 @@ public class ArgumentParsingTests extends TestCase { File classPathFile = URIUtil.toFile(URIUtil.toURI(classPathUrl)); String[] execArgs= new String[arguments.length + 4]; - execArgs[0]= new Path(System.getProperty("java.home")).append("bin/java").toOSString(); - execArgs[1]= "-cp"; + execArgs[0] = new Path(System.getProperty("java.home")).append("bin/java").toOSString(); //$NON-NLS-1$ //$NON-NLS-2$ + execArgs[1] = "-cp"; //$NON-NLS-1$ execArgs[2]= classPathFile.getAbsolutePath(); execArgs[3]= ArgumentsPrinter.class.getName(); System.arraycopy(arguments, 0, execArgs, 4, arguments.length); ArrayList resultArgs = runCommandLine(execArgs); - assertEquals("unexpected exec result;", + assertEquals("unexpected exec result;", //$NON-NLS-1$ Arrays.asList(arguments).toString(), resultArgs.toString()); if (! Platform.getOS().equals(Constants.OS_WIN32)) { - execArgs = new String[] { "sh", "-c", execArgs[0] + " " + execArgs[1] + " " + execArgs[2] + " " + execArgs[3] + " " + commandLine }; + execArgs = new String[] { "sh", "-c", execArgs[0] + " " + execArgs[1] + " " + execArgs[2] + " " + execArgs[3] + " " + commandLine }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ resultArgs = runCommandLine(execArgs); - assertEquals("unexpected sh exec result;", + assertEquals("unexpected sh exec result;", //$NON-NLS-1$ Arrays.asList(arguments).toString(), resultArgs.toString()); } @@ -132,8 +132,9 @@ public class ArgumentParsingTests extends TestCase { private static boolean needsQuoting(String s) { int len = s.length(); - if (len == 0) // empty string has to be quoted + if (len == 0) { return true; + } for (int i = 0; i < len; i++) { switch (s.charAt(i)) { case ' ': case '\t': case '\\': case '"': @@ -144,8 +145,9 @@ public class ArgumentParsingTests extends TestCase { } private static String winQuote(String s) { - if (! needsQuoting(s)) + if (! needsQuoting(s)) { return s; + } s = s.replaceAll("([\\\\]*)\"", "$1$1\\\\\""); //$NON-NLS-1$ //$NON-NLS-2$ s = s.replaceAll("([\\\\]*)\\z", "$1$1"); //$NON-NLS-1$ //$NON-NLS-2$ return "\"" + s + "\""; //$NON-NLS-1$ //$NON-NLS-2$ @@ -154,140 +156,142 @@ public class ArgumentParsingTests extends TestCase { // -- tests: public void testEmpty() throws Exception { - execute("", new String[0]); + execute("", new String[0]); //$NON-NLS-1$ } public void test1arg() throws Exception { - execute("a", new String[] { "a" }); + execute("a", new String[] { "a" }); //$NON-NLS-1$ //$NON-NLS-2$ } public void test2arg() throws Exception { - execute("a b", new String[] { "a", "b" }); + execute("a b", new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public void test100arg() throws Exception { StringBuffer buf = new StringBuffer(); for (int i = 0; i < 100; i++) - buf.append("a "); + { + buf.append("a "); //$NON-NLS-1$ + } String[] args = new String[100]; - Arrays.fill(args, "a"); + Arrays.fill(args, "a"); //$NON-NLS-1$ execute(buf.toString(), args, buf.toString().trim()); } public void testEscape() throws Exception { if (Platform.getOS().equals(Constants.OS_WIN32)) { - execute1Arg("\\1"); + execute1Arg("\\1"); //$NON-NLS-1$ } else { - execute1Arg("\\1", "1", "1"); + execute1Arg("\\1", "1", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } public void testEscapeDoubleQuote1() throws Exception { - execute1Arg("\\\"", "\"", "\\\""); + execute1Arg("\\\"", "\"", "\\\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public void testEscapeDoubleQuote2() throws Exception { - execute1Arg("arg=\\\"bla\\\"", "arg=\"bla\"", "arg=\\\"bla\\\""); + execute1Arg("arg=\\\"bla\\\"", "arg=\"bla\"", "arg=\\\"bla\\\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public void testDoubleQuoted1() throws Exception { - execute1Arg("\"1 2\"", "1 2"); + execute1Arg("\"1 2\"", "1 2"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testDoubleQuoted2() throws Exception { - execute1Arg("\"1\"", "1", "1"); + execute1Arg("\"1\"", "1", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public void testDoubleQuoted3() throws Exception { if (Platform.getOS().equals(Constants.OS_WIN32)) { // execute1Arg("\"\"", "", "\"\""); // would be correct, but ProcessImpl is buggy on Windows JDKs - execute1Arg("\"\""); + execute1Arg("\"\""); //$NON-NLS-1$ } else { - execute1Arg("\"\"", "", "\"\""); + execute1Arg("\"\"", "", "\"\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } public void testDoubleQuoted4() throws Exception { if (Platform.getOS().equals(Constants.OS_WIN32)) { - execute1Arg("\"\"\"\"", "\"", "\\\""); + execute1Arg("\"\"\"\"", "\"", "\\\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { - execute1Arg("\"\"\"\"", "", "\"\""); + execute1Arg("\"\"\"\"", "", "\"\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } public void testDoubleQuoted5() throws Exception { - execute1Arg("ab\"cd\"ef\"gh\"", "abcdefgh", "abcdefgh"); + execute1Arg("ab\"cd\"ef\"gh\"", "abcdefgh", "abcdefgh"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public void testDoubleQuotedWithSpace1() throws Exception { if (Platform.getOS().equals(Constants.OS_WIN32)) { - execute1Arg("\"\"\"1\"\" 2\"", "\"1\" 2", "\"\\\"1\\\" 2\""); + execute1Arg("\"\"\"1\"\" 2\"", "\"1\" 2", "\"\\\"1\\\" 2\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { - execute1Arg("\"\"\"1\"\" 2\"", "1 2", "\"1 2\""); + execute1Arg("\"\"\"1\"\" 2\"", "1 2", "\"1 2\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } public void testDoubleQuotedWithSpace2() throws Exception { - execute1Arg("\"\\\"1\\\" 2\"", "\"1\" 2"); + execute1Arg("\"\\\"1\\\" 2\"", "\"1\" 2"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testSingleQuoted1() throws Exception { if (Platform.getOS().equals(Constants.OS_WIN32)) { - execute("'1 2'", new String[] { "'1", "2'" }); + execute("'1 2'", new String[] { "'1", "2'" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { - execute("'1 2'", new String[] { "1 2" }, "\"1 2\""); + execute("'1 2'", new String[] { "1 2" }, "\"1 2\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } public void testSingleQuoted2() throws Exception { if (Platform.getOS().equals(Constants.OS_WIN32)) { - execute1Arg("'1'", "'1'", "'1'"); + execute1Arg("'1'", "'1'", "'1'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { - execute1Arg("'1'", "1", "1"); + execute1Arg("'1'", "1", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } public void testWindows1() throws Exception { - execute("\"a b c\" d e", new String[] { "a b c", "d", "e" }); + execute("\"a b c\" d e", new String[] { "a b c", "d", "e" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } public void testWindows2() throws Exception { if (Platform.getOS().equals(Constants.OS_WIN32)) { - execute("\"ab\\\"c\" \"\\\\\" d", new String[] { "ab\"c", "\\", "d" }, "ab\\\"c \\ d"); + execute("\"ab\\\"c\" \"\\\\\" d", new String[] { "ab\"c", "\\", "d" }, "ab\\\"c \\ d"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } else { - execute("\"ab\\\"c\" \"\\\\\" d", new String[] { "ab\"c", "\\", "d" }, "ab\\\"c \\\\ d"); + execute("\"ab\\\"c\" \"\\\\\" d", new String[] { "ab\"c", "\\", "d" }, "ab\\\"c \\\\ d"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } } public void testWindows3() throws Exception { if (Platform.getOS().equals(Constants.OS_WIN32)) { - execute("a\\\\\\b d\"e f\"g h", new String[] { "a\\\\\\b", "de fg", "h" }, "a\\\\\\b \"de fg\" h"); + execute("a\\\\\\b d\"e f\"g h", new String[] { "a\\\\\\b", "de fg", "h" }, "a\\\\\\b \"de fg\" h"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } else { - execute("a\\\\\\b d\"e f\"g h", new String[] { "a\\b", "de fg", "h" }, "a\\\\b \"de fg\" h"); + execute("a\\\\\\b d\"e f\"g h", new String[] { "a\\b", "de fg", "h" }, "a\\\\b \"de fg\" h"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } } public void testWindows4() throws Exception { - execute("a\\\\\\\"b c d", new String[] { "a\\\"b", "c", "d" }); + execute("a\\\\\\\"b c d", new String[] { "a\\\"b", "c", "d" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } public void testWindows5() throws Exception { if (Platform.getOS().equals(Constants.OS_WIN32)) { - execute("a\\\\\\\\\"b c\" d e", new String[] { "a\\\\b c", "d", "e" }, "\"a\\\\b c\" d e"); + execute("a\\\\\\\\\"b c\" d e", new String[] { "a\\\\b c", "d", "e" }, "\"a\\\\b c\" d e"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } else { - execute("a\\\\\\\\\"b c\" d e", new String[] { "a\\\\b c", "d", "e" }, "\"a\\\\\\\\b c\" d e"); + execute("a\\\\\\\\\"b c\" d e", new String[] { "a\\\\b c", "d", "e" }, "\"a\\\\\\\\b c\" d e"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } } public void testAllInOne() throws Exception { if (Platform.getOS().equals(Constants.OS_WIN32)) { - execute("1 \"\" 2 \" \" 3 \\\" 4 \"a b\" 5 \\\"bla\\\" 6 \"ab\"cd 7 ef\"gh\" 8 i\"\"j 9 \"x\\\"y\\\\\" 10 z\\\\z 11 \"two-quotes:\"\"\"\"\" 12 \"g\"\"h\" 13 \"\"\"a\"\" b\"", - new String[] { "1", "\"\"", "2", " ", "3", "\"", "4", "a b", "5", "\"bla\"", "6", "abcd", "7", "efgh", "8", "ij", "9", "x\"y\\", "10", "z\\\\z", "11", "two-quotes:\"\"", "12", "g\"h", "13", "\"a\" b" }, - "1 \"\" 2 \" \" 3 \\\" 4 \"a b\" 5 \\\"bla\\\" 6 abcd 7 efgh 8 ij 9 x\\\"y\\ 10 z\\\\z 11 two-quotes:\\\"\\\" 12 g\\\"h 13 \"\\\"a\\\" b\""); + execute("1 \"\" 2 \" \" 3 \\\" 4 \"a b\" 5 \\\"bla\\\" 6 \"ab\"cd 7 ef\"gh\" 8 i\"\"j 9 \"x\\\"y\\\\\" 10 z\\\\z 11 \"two-quotes:\"\"\"\"\" 12 \"g\"\"h\" 13 \"\"\"a\"\" b\"", //$NON-NLS-1$ + new String[] { "1", "\"\"", "2", " ", "3", "\"", "4", "a b", "5", "\"bla\"", "6", "abcd", "7", "efgh", "8", "ij", "9", "x\"y\\", "10", "z\\\\z", "11", "two-quotes:\"\"", "12", "g\"h", "13", "\"a\" b" }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$ //$NON-NLS-16$ //$NON-NLS-17$ //$NON-NLS-18$ //$NON-NLS-19$ //$NON-NLS-20$ //$NON-NLS-21$ //$NON-NLS-22$ //$NON-NLS-23$ //$NON-NLS-24$ //$NON-NLS-25$ //$NON-NLS-26$ + "1 \"\" 2 \" \" 3 \\\" 4 \"a b\" 5 \\\"bla\\\" 6 abcd 7 efgh 8 ij 9 x\\\"y\\ 10 z\\\\z 11 two-quotes:\\\"\\\" 12 g\\\"h 13 \"\\\"a\\\" b\""); //$NON-NLS-1$ } else { - execute("1 \"\" 2 \" \" 3 \\\" 4 \"a b\" 5 \\\"bla\\\" 6 \"ab\"cd 7 ef\"gh\" 8 i\"\"j 9 \"x\\\"y\\\\\" 10 z\\\\z 11 \"two-quotes:\"\"\"\"\" 12 \"g\"\"h\" 13 \"\"\"a\"\" b\"", - new String[] { "1", "", "2", " ", "3", "\"", "4", "a b", "5", "\"bla\"", "6", "abcd", "7", "efgh", "8", "ij", "9", "x\"y\\", "10", "z\\z", "11", "two-quotes:", "12", "gh", "13", "a b" }, - "1 \"\" 2 \" \" 3 \\\" 4 \"a b\" 5 \\\"bla\\\" 6 abcd 7 efgh 8 ij 9 x\\\"y\\\\ 10 z\\\\z 11 two-quotes: 12 gh 13 \"a b\""); + execute("1 \"\" 2 \" \" 3 \\\" 4 \"a b\" 5 \\\"bla\\\" 6 \"ab\"cd 7 ef\"gh\" 8 i\"\"j 9 \"x\\\"y\\\\\" 10 z\\\\z 11 \"two-quotes:\"\"\"\"\" 12 \"g\"\"h\" 13 \"\"\"a\"\" b\"", //$NON-NLS-1$ + new String[] { "1", "", "2", " ", "3", "\"", "4", "a b", "5", "\"bla\"", "6", "abcd", "7", "efgh", "8", "ij", "9", "x\"y\\", "10", "z\\z", "11", "two-quotes:", "12", "gh", "13", "a b" }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$ //$NON-NLS-16$ //$NON-NLS-17$ //$NON-NLS-18$ //$NON-NLS-19$ //$NON-NLS-20$ //$NON-NLS-21$ //$NON-NLS-22$ //$NON-NLS-23$ //$NON-NLS-24$ //$NON-NLS-25$ //$NON-NLS-26$ + "1 \"\" 2 \" \" 3 \\\" 4 \"a b\" 5 \\\"bla\\\" 6 abcd 7 efgh 8 ij 9 x\\\"y\\\\ 10 z\\\\z 11 two-quotes: 12 gh 13 \"a b\""); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/DebugFileStore.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/DebugFileStore.java index dfcab8ff6..283c461fc 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/DebugFileStore.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/DebugFileStore.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -52,7 +52,7 @@ public class DebugFileStore extends FileStore { } - private URI uri; + private final URI uri; public DebugFileStore(URI id) { uri = id; @@ -118,7 +118,7 @@ public class DebugFileStore extends FileStore { if (path.segmentCount() > 0) { return path.lastSegment(); } - return ""; + return ""; //$NON-NLS-1$ } /** @@ -152,8 +152,8 @@ public class DebugFileStore extends FileStore { if (contents != null) { return new ByteArrayInputStream(contents); } - throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.jdt.debug.tests", - "File does not exist: " + toURI())); + throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.jdt.debug.tests", //$NON-NLS-1$ + "File does not exist: " + toURI())); //$NON-NLS-1$ } /* (non-Javadoc) @@ -170,8 +170,8 @@ public class DebugFileStore extends FileStore { IFileInfo info = fetchInfo(); if (info.exists()) { if (!info.isDirectory()) { - throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.jdt.debug.tests", - "mkdir failed - file already exists with name: " + toURI())); + throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.jdt.debug.tests", //$NON-NLS-1$ + "mkdir failed - file already exists with name: " + toURI())); //$NON-NLS-1$ } } else { IFileStore parent = getParent(); @@ -179,8 +179,8 @@ public class DebugFileStore extends FileStore { DebugFileSystem.getDefault().setContents(toURI(), DebugFileSystem.DIRECTORY_BYTES); } else { if ((options & EFS.SHALLOW) > 0) { - throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.jdt.debug.tests", - "mkdir failed - parent does not exist: " + toURI())); + throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.jdt.debug.tests", //$NON-NLS-1$ + "mkdir failed - parent does not exist: " + toURI())); //$NON-NLS-1$ } else { parent.mkdir(EFS.NONE, null); } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/DebugFileSystem.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/DebugFileSystem.java index d0a7183e4..7ec08bf71 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/DebugFileSystem.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/DebugFileSystem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,7 +34,7 @@ public class DebugFileSystem extends FileSystem { /** * Keys URIs to file stores for existing files */ - private Map files = new HashMap(); + private final Map files = new HashMap(); /** * Constructs the singleton @@ -43,7 +43,7 @@ public class DebugFileSystem extends FileSystem { system = this; // create root of the file system try { - setContents(new URI("debug", Path.ROOT.toString(), null), DIRECTORY_BYTES); + setContents(new URI("debug", Path.ROOT.toString(), null), DIRECTORY_BYTES); //$NON-NLS-1$ } catch (URISyntaxException e) {} } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchConfigurationTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchConfigurationTests.java index 02f70c4a3..167667c3e 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchConfigurationTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchConfigurationTests.java @@ -66,7 +66,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau /** * Identifier of test launch configuration type extension */ - public static final String ID_TEST_LAUNCH_TYPE = "org.eclipse.debug.tests.launch.type"; + public static final String ID_TEST_LAUNCH_TYPE = "org.eclipse.debug.tests.launch.type"; //$NON-NLS-1$ /** * The from/to handles during rename operations @@ -93,9 +93,9 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau class Listener implements ILaunchConfigurationListener { - private List addedList = new ArrayList(); - private List removedList = new ArrayList(); - private List changedList = new ArrayList(); + private final List addedList = new ArrayList(); + private final List removedList = new ArrayList(); + private final List changedList = new ArrayList(); /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationAdded(org.eclipse.debug.core.ILaunchConfiguration) @@ -141,12 +141,12 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau public static char[] getInputStreamAsCharArray(InputStream stream) throws IOException { Charset charset = null; try { - charset = Charset.forName("UTF-8"); + charset = Charset.forName("UTF-8"); //$NON-NLS-1$ } catch (IllegalCharsetNameException e) { - System.err.println("Illegal charset name : " + "UTF-8"); //$NON-NLS-1$ + System.err.println("Illegal charset name : " + "UTF-8"); //$NON-NLS-1$ //$NON-NLS-2$ return null; } catch(UnsupportedCharsetException e) { - System.err.println("Unsupported charset : " + "UTF-8"); //$NON-NLS-1$ + System.err.println("Unsupported charset : " + "UTF-8"); //$NON-NLS-1$ //$NON-NLS-2$ return null; } CharsetDecoder charsetDecoder = charset.newDecoder(); @@ -222,7 +222,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @return */ protected IProject getProject() throws CoreException { - return TestsPlugin.createProject("LaunchConfigurationTests"); + return TestsPlugin.createProject("LaunchConfigurationTests"); //$NON-NLS-1$ } /** @@ -253,7 +253,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau protected ILaunchConfigurationWorkingCopy newEmptyConfiguration(IContainer container, String name) throws CoreException { ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(ID_TEST_LAUNCH_TYPE); ILaunchConfigurationWorkingCopy wc = type.newInstance(container, name); - assertEquals("Should have no attributes", 0, wc.getAttributes().size()); + assertEquals("Should have no attributes", 0, wc.getAttributes().size()); //$NON-NLS-1$ return wc; } @@ -309,7 +309,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau assertTrue("Configuration should exist", handle.exists()); //$NON-NLS-1$ // retrieve attributes - assertEquals("Wrong name", handle.getName(), "localName"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + assertEquals("Wrong name", handle.getName(), "localName"); //$NON-NLS-1$ //$NON-NLS-2$ // cleanup handle.delete(); @@ -325,7 +325,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau assertTrue("Configuration should exist", handle.exists()); //$NON-NLS-1$ // retrieve attributes - assertEquals("Wrong name", handle.getName(), "sharedName"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + assertEquals("Wrong name", handle.getName(), "sharedName"); //$NON-NLS-1$ //$NON-NLS-2$ // cleanup handle.delete(); @@ -960,12 +960,12 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @throws URISyntaxException */ public void testCreateDeleteEFS() throws CoreException, URISyntaxException { - IFileSystem fileSystem = EFS.getFileSystem("debug"); - assertNotNull("Missing debug EFS", fileSystem); + IFileSystem fileSystem = EFS.getFileSystem("debug"); //$NON-NLS-1$ + assertNotNull("Missing debug EFS", fileSystem); //$NON-NLS-1$ // create folder in EFS - IFolder folder = getProject().getFolder("efs"); - folder.createLink(new URI("debug", Path.ROOT.toString(), null), 0, null); + IFolder folder = getProject().getFolder("efs"); //$NON-NLS-1$ + folder.createLink(new URI("debug", Path.ROOT.toString(), null), 0, null); //$NON-NLS-1$ // create configuration ILaunchConfigurationWorkingCopy wc = newConfiguration(folder, "efsConfig"); //$NON-NLS-1$ @@ -994,12 +994,12 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @throws URISyntaxException */ public void testCreateDeleteEFSLink() throws CoreException, URISyntaxException { - IFileSystem fileSystem = EFS.getFileSystem("debug"); - assertNotNull("Missing debug EFS", fileSystem); + IFileSystem fileSystem = EFS.getFileSystem("debug"); //$NON-NLS-1$ + assertNotNull("Missing debug EFS", fileSystem); //$NON-NLS-1$ // create folder in EFS - IFolder folder = getProject().getFolder("efs2"); - folder.createLink(new URI("debug", Path.ROOT.toString(), null), 0, null); + IFolder folder = getProject().getFolder("efs2"); //$NON-NLS-1$ + folder.createLink(new URI("debug", Path.ROOT.toString(), null), 0, null); //$NON-NLS-1$ // create configuration ILaunchConfigurationWorkingCopy wc = newConfiguration(folder, "efsConfig"); //$NON-NLS-1$ @@ -1025,19 +1025,19 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau */ public void testEFSProjectRename() throws Exception { // create test project - IProject pro = ResourcesPlugin.getWorkspace().getRoot().getProject("RenameEFS"); + IProject pro = ResourcesPlugin.getWorkspace().getRoot().getProject("RenameEFS"); //$NON-NLS-1$ if (pro.exists()) { pro.delete(true, true, null); } // create project - IProject project = TestsPlugin.createProject("RenameEFS"); + IProject project = TestsPlugin.createProject("RenameEFS"); //$NON-NLS-1$ - IFileSystem fileSystem = EFS.getFileSystem("debug"); - assertNotNull("Missing debug EFS", fileSystem); + IFileSystem fileSystem = EFS.getFileSystem("debug"); //$NON-NLS-1$ + assertNotNull("Missing debug EFS", fileSystem); //$NON-NLS-1$ // create folder in EFS - IFolder folder = project.getFolder("efs2"); - folder.createLink(new URI("debug", Path.ROOT.toString(), null), 0, null); + IFolder folder = project.getFolder("efs2"); //$NON-NLS-1$ + folder.createLink(new URI("debug", Path.ROOT.toString(), null), 0, null); //$NON-NLS-1$ // create configuration ILaunchConfigurationWorkingCopy wc = newConfiguration(folder, "efsConfig"); //$NON-NLS-1$ @@ -1052,19 +1052,19 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau // rename project IProjectDescription description = project.getDescription(); - description.setName("SFEemaneR"); // reverse name + description.setName("SFEemaneR"); // reverse name //$NON-NLS-1$ project.move(description, IResource.SHALLOW, null); // original configuration should no longer exist - handle out of date assertTrue("Configuration should not exist", !handle.exists()); //$NON-NLS-1$ // get the new handle - project = ResourcesPlugin.getWorkspace().getRoot().getProject("SFEemaneR"); - assertTrue("Project should exist", project.exists()); - IFile file = project.getFile(new Path("efs2/efsConfig.launch")); - assertTrue("launch config file should exist", file.exists()); + project = ResourcesPlugin.getWorkspace().getRoot().getProject("SFEemaneR"); //$NON-NLS-1$ + assertTrue("Project should exist", project.exists()); //$NON-NLS-1$ + IFile file = project.getFile(new Path("efs2/efsConfig.launch")); //$NON-NLS-1$ + assertTrue("launch config file should exist", file.exists()); //$NON-NLS-1$ handle = getLaunchManager().getLaunchConfiguration(file); - assertTrue("launch config should exist", handle.exists()); + assertTrue("launch config should exist", handle.exists()); //$NON-NLS-1$ // retrieve attributes assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ @@ -1073,7 +1073,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true)); //$NON-NLS-1$ //$NON-NLS-2$ // validate shared location - assertEquals("Shared location should be updated", file, handle.getFile()); + assertEquals("Shared location should be updated", file, handle.getFile()); //$NON-NLS-1$ // cleanup project.delete(IResource.NONE, null); @@ -1092,8 +1092,8 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau ILaunchConfiguration handle = wc.doSave(); assertTrue("Configuration should exist", handle.exists()); //$NON-NLS-1$ - File dir = TestsPlugin.getDefault().getFileInPlugin(new Path("test-import")); - assertTrue("Import directory does not exist", dir.exists()); + File dir = TestsPlugin.getDefault().getFileInPlugin(new Path("test-import")); //$NON-NLS-1$ + assertTrue("Import directory does not exist", dir.exists()); //$NON-NLS-1$ LaunchManager manager = (LaunchManager) getLaunchManager(); Listener listener = new Listener(); @@ -1112,28 +1112,28 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau // should be one removed List removed = listener.getRemoved(); - assertEquals("Should be one removed config", 1, removed.size()); - assertTrue("Import4 should be removed", removed.contains(handle)); + assertEquals("Should be one removed config", 1, removed.size()); //$NON-NLS-1$ + assertTrue("Import4 should be removed", removed.contains(handle)); //$NON-NLS-1$ // should be 5 added List added = listener.getAdded(); - assertEquals("Should be 5 added configs", 5, added.size()); + assertEquals("Should be 5 added configs", 5, added.size()); //$NON-NLS-1$ Set names = new HashSet(); Iterator iterator = added.iterator(); while (iterator.hasNext()) { ILaunchConfiguration lc = (ILaunchConfiguration) iterator.next(); names.add(lc.getName()); } - assertTrue("Missing Name", names.contains("Import1")); - assertTrue("Missing Name", names.contains("Import2")); - assertTrue("Missing Name", names.contains("Import3")); - assertTrue("Missing Name", names.contains("Import4")); - assertTrue("Missing Name", names.contains("Import5")); + assertTrue("Missing Name", names.contains("Import1")); //$NON-NLS-1$ //$NON-NLS-2$ + assertTrue("Missing Name", names.contains("Import2")); //$NON-NLS-1$ //$NON-NLS-2$ + assertTrue("Missing Name", names.contains("Import3")); //$NON-NLS-1$ //$NON-NLS-2$ + assertTrue("Missing Name", names.contains("Import4")); //$NON-NLS-1$ //$NON-NLS-2$ + assertTrue("Missing Name", names.contains("Import5")); //$NON-NLS-1$ //$NON-NLS-2$ // should be one changed List changed = listener.getChanged(); - assertEquals("Should be 1 changed config", 1, changed.size()); - assertEquals("Wrong changed config", "Import4", ((ILaunchConfiguration)changed.get(0)).getName()); + assertEquals("Should be 1 changed config", 1, changed.size()); //$NON-NLS-1$ + assertEquals("Wrong changed config", "Import4", ((ILaunchConfiguration) changed.get(0)).getName()); //$NON-NLS-1$ //$NON-NLS-2$ } finally { manager.removeLaunchConfigurationListener(listener); } @@ -1146,20 +1146,20 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @throws CoreException */ public void testWorkingCopyGetLocation() throws CoreException { - ILaunchConfigurationWorkingCopy workingCopy = newConfiguration(null, "test-get-location"); + ILaunchConfigurationWorkingCopy workingCopy = newConfiguration(null, "test-get-location"); //$NON-NLS-1$ IPath location = workingCopy.getLocation(); - assertEquals("Wrong path for local working copy", LaunchManager.LOCAL_LAUNCH_CONFIGURATION_CONTAINER_PATH.append("test-get-location.launch"), location); + assertEquals("Wrong path for local working copy", LaunchManager.LOCAL_LAUNCH_CONFIGURATION_CONTAINER_PATH.append("test-get-location.launch"), location); //$NON-NLS-1$ //$NON-NLS-2$ } /** * Tests that the framework adds time stamps to launch objects. */ public void testLaunchTimeStamp() throws CoreException { - ILaunchConfigurationWorkingCopy workingCopy = newConfiguration(null, "test-time-stamp"); + ILaunchConfigurationWorkingCopy workingCopy = newConfiguration(null, "test-time-stamp"); //$NON-NLS-1$ ILaunch launch = workingCopy.launch(ILaunchManager.DEBUG_MODE, null); try { String stamp = launch.getAttribute(DebugPlugin.ATTR_LAUNCH_TIMESTAMP); - assertNotNull("missing time stamp", stamp); + assertNotNull("missing time stamp", stamp); //$NON-NLS-1$ Long.parseLong(stamp); // should be a long - will throw NumberFormatException if not } finally { if (launch != null) { @@ -1174,74 +1174,74 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @throws CoreException */ public void testMapAttributePersistence() throws CoreException, IOException { - ILaunchConfigurationWorkingCopy c1 = newEmptyConfiguration(getProject(), "testMapAttributes1"); + ILaunchConfigurationWorkingCopy c1 = newEmptyConfiguration(getProject(), "testMapAttributes1"); //$NON-NLS-1$ HashMap map = new HashMap(); - map.put("Z", "z-value"); - map.put("Y", "y-value"); - map.put("X", "x-value"); - map.put("W", "w-value"); - map.put("V", "v-value"); - map.put("U", "u-value"); - map.put("T", "t-value"); - map.put("S", "s-value"); - map.put("R", "r-value"); - map.put("Q", "q-value"); - map.put("P", "p-value"); - map.put("O", "o-value"); - map.put("N", "n-value"); - map.put("M", "m-value"); - map.put("L", "l-value"); - map.put("K", "k-value"); - map.put("J", "j-value"); - map.put("I", "i-value"); - map.put("H", "h-value"); - map.put("G", "g-value"); - map.put("F", "f-value"); - map.put("E", "e-value"); - map.put("D", "d-value"); - map.put("C", "c-value"); - map.put("B", "b-value"); - map.put("A", "a-value"); - c1.setAttribute("Map-Attribute", map); + map.put("Z", "z-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("Y", "y-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("X", "x-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("W", "w-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("V", "v-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("U", "u-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("T", "t-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("S", "s-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("R", "r-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("Q", "q-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("P", "p-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("O", "o-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("N", "n-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("M", "m-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("L", "l-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("K", "k-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("J", "j-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("I", "i-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("H", "h-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("G", "g-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("F", "f-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("E", "e-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("D", "d-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("C", "c-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("B", "b-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("A", "a-value"); //$NON-NLS-1$ //$NON-NLS-2$ + c1.setAttribute("Map-Attribute", map); //$NON-NLS-1$ c1.doSave(); - ILaunchConfigurationWorkingCopy c2 = newEmptyConfiguration(getProject(), "testMapAttributes2"); + ILaunchConfigurationWorkingCopy c2 = newEmptyConfiguration(getProject(), "testMapAttributes2"); //$NON-NLS-1$ map = new HashMap(); - map.put("A", "a-value"); - map.put("Z", "z-value"); - map.put("B", "b-value"); - map.put("Y", "y-value"); - map.put("C", "c-value"); - map.put("X", "x-value"); - map.put("D", "d-value"); - map.put("W", "w-value"); - map.put("E", "e-value"); - map.put("V", "v-value"); - map.put("F", "f-value"); - map.put("U", "u-value"); - map.put("G", "g-value"); - map.put("T", "t-value"); - map.put("H", "h-value"); - map.put("S", "s-value"); - map.put("I", "i-value"); - map.put("R", "r-value"); - map.put("J", "j-value"); - map.put("Q", "q-value"); - map.put("K", "k-value"); - map.put("P", "p-value"); - map.put("L", "l-value"); - map.put("M", "m-value"); - map.put("O", "o-value"); - map.put("N", "n-value"); - c2.setAttribute("Map-Attribute", map); + map.put("A", "a-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("Z", "z-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("B", "b-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("Y", "y-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("C", "c-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("X", "x-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("D", "d-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("W", "w-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("E", "e-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("V", "v-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("F", "f-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("U", "u-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("G", "g-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("T", "t-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("H", "h-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("S", "s-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("I", "i-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("R", "r-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("J", "j-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("Q", "q-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("K", "k-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("P", "p-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("L", "l-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("M", "m-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("O", "o-value"); //$NON-NLS-1$ //$NON-NLS-2$ + map.put("N", "n-value"); //$NON-NLS-1$ //$NON-NLS-2$ + c2.setAttribute("Map-Attribute", map); //$NON-NLS-1$ c2.doSave(); // file contents should be the same char[] chars1 = getInputStreamAsCharArray(c1.getFile().getContents()); char[] chars2 = getInputStreamAsCharArray(c2.getFile().getContents()); - assertEquals("Should be the same characters", chars1.length, chars2.length); + assertEquals("Should be the same characters", chars1.length, chars2.length); //$NON-NLS-1$ for (int i = 0; i < chars2.length; i++) { - assertEquals("Should be the same character", chars1[i], chars2[i]); + assertEquals("Should be the same character", chars1[i], chars2[i]); //$NON-NLS-1$ } } @@ -1252,74 +1252,74 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @throws CoreException */ public void testSetAttributePersistence() throws CoreException, IOException { - ILaunchConfigurationWorkingCopy c1 = newEmptyConfiguration(getProject(), "testSetAttributes1"); + ILaunchConfigurationWorkingCopy c1 = newEmptyConfiguration(getProject(), "testSetAttributes1"); //$NON-NLS-1$ Set set = new HashSet(); - set.add("z-value"); - set.add("y-value"); - set.add("x-value"); - set.add("w-value"); - set.add("v-value"); - set.add("u-value"); - set.add("t-value"); - set.add("s-value"); - set.add("r-value"); - set.add("q-value"); - set.add("p-value"); - set.add("o-value"); - set.add("n-value"); - set.add("m-value"); - set.add("l-value"); - set.add("k-value"); - set.add("j-value"); - set.add("i-value"); - set.add("h-value"); - set.add("g-value"); - set.add("f-value"); - set.add("e-value"); - set.add("d-value"); - set.add("c-value"); - set.add("b-value"); - set.add("a-value"); - c1.setAttribute("Set-Attribute", set); + set.add("z-value"); //$NON-NLS-1$ + set.add("y-value"); //$NON-NLS-1$ + set.add("x-value"); //$NON-NLS-1$ + set.add("w-value"); //$NON-NLS-1$ + set.add("v-value"); //$NON-NLS-1$ + set.add("u-value"); //$NON-NLS-1$ + set.add("t-value"); //$NON-NLS-1$ + set.add("s-value"); //$NON-NLS-1$ + set.add("r-value"); //$NON-NLS-1$ + set.add("q-value"); //$NON-NLS-1$ + set.add("p-value"); //$NON-NLS-1$ + set.add("o-value"); //$NON-NLS-1$ + set.add("n-value"); //$NON-NLS-1$ + set.add("m-value"); //$NON-NLS-1$ + set.add("l-value"); //$NON-NLS-1$ + set.add("k-value"); //$NON-NLS-1$ + set.add("j-value"); //$NON-NLS-1$ + set.add("i-value"); //$NON-NLS-1$ + set.add("h-value"); //$NON-NLS-1$ + set.add("g-value"); //$NON-NLS-1$ + set.add("f-value"); //$NON-NLS-1$ + set.add("e-value"); //$NON-NLS-1$ + set.add("d-value"); //$NON-NLS-1$ + set.add("c-value"); //$NON-NLS-1$ + set.add("b-value"); //$NON-NLS-1$ + set.add("a-value"); //$NON-NLS-1$ + c1.setAttribute("Set-Attribute", set); //$NON-NLS-1$ c1.doSave(); - ILaunchConfigurationWorkingCopy c2 = newEmptyConfiguration(getProject(), "testSetAttributes2"); + ILaunchConfigurationWorkingCopy c2 = newEmptyConfiguration(getProject(), "testSetAttributes2"); //$NON-NLS-1$ set = new HashSet(); - set.add("a-value"); - set.add("z-value"); - set.add("b-value"); - set.add("y-value"); - set.add("c-value"); - set.add("x-value"); - set.add("d-value"); - set.add("w-value"); - set.add("e-value"); - set.add("v-value"); - set.add("f-value"); - set.add("u-value"); - set.add("g-value"); - set.add("t-value"); - set.add("h-value"); - set.add("s-value"); - set.add("i-value"); - set.add("r-value"); - set.add("j-value"); - set.add("q-value"); - set.add("k-value"); - set.add("p-value"); - set.add("l-value"); - set.add("m-value"); - set.add("o-value"); - set.add("n-value"); - c2.setAttribute("Set-Attribute", set); + set.add("a-value"); //$NON-NLS-1$ + set.add("z-value"); //$NON-NLS-1$ + set.add("b-value"); //$NON-NLS-1$ + set.add("y-value"); //$NON-NLS-1$ + set.add("c-value"); //$NON-NLS-1$ + set.add("x-value"); //$NON-NLS-1$ + set.add("d-value"); //$NON-NLS-1$ + set.add("w-value"); //$NON-NLS-1$ + set.add("e-value"); //$NON-NLS-1$ + set.add("v-value"); //$NON-NLS-1$ + set.add("f-value"); //$NON-NLS-1$ + set.add("u-value"); //$NON-NLS-1$ + set.add("g-value"); //$NON-NLS-1$ + set.add("t-value"); //$NON-NLS-1$ + set.add("h-value"); //$NON-NLS-1$ + set.add("s-value"); //$NON-NLS-1$ + set.add("i-value"); //$NON-NLS-1$ + set.add("r-value"); //$NON-NLS-1$ + set.add("j-value"); //$NON-NLS-1$ + set.add("q-value"); //$NON-NLS-1$ + set.add("k-value"); //$NON-NLS-1$ + set.add("p-value"); //$NON-NLS-1$ + set.add("l-value"); //$NON-NLS-1$ + set.add("m-value"); //$NON-NLS-1$ + set.add("o-value"); //$NON-NLS-1$ + set.add("n-value"); //$NON-NLS-1$ + c2.setAttribute("Set-Attribute", set); //$NON-NLS-1$ c2.doSave(); // file contents should be the same char[] chars1 = getInputStreamAsCharArray(c1.getFile().getContents()); char[] chars2 = getInputStreamAsCharArray(c2.getFile().getContents()); - assertEquals("Should be the same characters", chars1.length, chars2.length); + assertEquals("Should be the same characters", chars1.length, chars2.length); //$NON-NLS-1$ for (int i = 0; i < chars2.length; i++) { - assertEquals("Should be the same character", chars1[i], chars2[i]); + assertEquals("Should be the same character", chars1[i], chars2[i]); //$NON-NLS-1$ } } @@ -1332,12 +1332,12 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau */ public void testIllegalFileSepCharName() { try { - newConfiguration(null, new Path("some").append("nested").append("config").toOSString()); + newConfiguration(null, new Path("some").append("nested").append("config").toOSString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } catch (CoreException e) { // i.e. expected code path return; } - assertTrue("Should be an illegal argument - cannot nest local configurations", false); + assertTrue("Should be an illegal argument - cannot nest local configurations", false); //$NON-NLS-1$ } /** @@ -1349,9 +1349,9 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau */ public void testLegalFileSepCharName() { try { - newConfiguration(getProject(), new Path("some").append("nested").append("config").toOSString()); + newConfiguration(getProject(), new Path("some").append("nested").append("config").toOSString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } catch (CoreException e) { - assertTrue("Should *not* be an illegal argument - can nest shared cofigurations", false); + assertTrue("Should *not* be an illegal argument - can nest shared cofigurations", false); //$NON-NLS-1$ } } @@ -1362,12 +1362,12 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau */ public void testIllegalCharName() { try { - newConfiguration(getProject(), "<config>"); + newConfiguration(getProject(), "<config>"); //$NON-NLS-1$ } catch (CoreException e) { // expected code path return; } - assertTrue("Should be an illegal argument - illegal character used in name", false); + assertTrue("Should be an illegal argument - illegal character used in name", false); //$NON-NLS-1$ } /** @@ -1377,20 +1377,20 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau */ public void testRenameAndMoveShared() throws CoreException { IProject project = getProject(); - IFolder f1 = project.getFolder("f1"); - IFolder f2 = project.getFolder("f2"); + IFolder f1 = project.getFolder("f1"); //$NON-NLS-1$ + IFolder f2 = project.getFolder("f2"); //$NON-NLS-1$ f1.create(false, true, null); f2.create(false, true, null); - ILaunchConfigurationWorkingCopy wc = newConfiguration(f1, "start-here"); + ILaunchConfigurationWorkingCopy wc = newConfiguration(f1, "start-here"); //$NON-NLS-1$ ILaunchConfiguration orig = wc.doSave(); wc = orig.getWorkingCopy(); wc.setContainer(f2); - wc.rename("end-here"); + wc.rename("end-here"); //$NON-NLS-1$ ILaunchConfiguration next = wc.doSave(); - assertFalse("Original should not exist", orig.exists()); - assertTrue("Renamed and moved config should exist", next.exists()); + assertFalse("Original should not exist", orig.exists()); //$NON-NLS-1$ + assertTrue("Renamed and moved config should exist", next.exists()); //$NON-NLS-1$ } @@ -1401,9 +1401,9 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @throws Exception */ public void testGetTypeImageFromURI() throws Exception { - ImageDescriptor descriptor = DebugUITools.getImageDescriptor("org.eclipse.debug.tests.launch.type1"); - assertNotNull("The image descriptior type.image.1 must exist", descriptor); - assertNotSame("The image descriptor is not type.image.1", ImageDescriptor.getMissingImageDescriptor(), descriptor); + ImageDescriptor descriptor = DebugUITools.getImageDescriptor("org.eclipse.debug.tests.launch.type1"); //$NON-NLS-1$ + assertNotNull("The image descriptior type.image.1 must exist", descriptor); //$NON-NLS-1$ + assertNotSame("The image descriptor is not type.image.1", ImageDescriptor.getMissingImageDescriptor(), descriptor); //$NON-NLS-1$ } /** @@ -1411,9 +1411,9 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @throws Exception */ public void testGetTyeImage() throws Exception { - ImageDescriptor descriptor = DebugUITools.getImageDescriptor("org.eclipse.debug.tests.launch.type"); - assertNotNull("The image descriptior type.image.2 must exist", descriptor); - assertNotSame("The image descriptor is not type.image.2", ImageDescriptor.getMissingImageDescriptor(), descriptor); + ImageDescriptor descriptor = DebugUITools.getImageDescriptor("org.eclipse.debug.tests.launch.type"); //$NON-NLS-1$ + assertNotNull("The image descriptior type.image.2 must exist", descriptor); //$NON-NLS-1$ + assertNotSame("The image descriptor is not type.image.2", ImageDescriptor.getMissingImageDescriptor(), descriptor); //$NON-NLS-1$ } /** @@ -1424,14 +1424,14 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @since 3.9.0 */ public void testGetProjectMappedResource1() throws Exception { - ILaunchConfiguration lc = newConfiguration(null, "test.project.resource.mapping"); + ILaunchConfiguration lc = newConfiguration(null, "test.project.resource.mapping"); //$NON-NLS-1$ try { ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy(); - assertNotNull("Should have a working copy of the testig launch configuration", wc); - setResourceMappings(wc, new ResourceItem[] {new ResourceItem("test.project", new Integer(IResource.PROJECT))}); + assertNotNull("Should have a working copy of the testig launch configuration", wc); //$NON-NLS-1$ + setResourceMappings(wc, new ResourceItem[] { new ResourceItem("test.project", new Integer(IResource.PROJECT)) }); //$NON-NLS-1$ IResource[] res = wc.getMappedResources(); - assertNotNull("There should be mapped resources", res); - assertTrue("There should be one project", res.length == 1); + assertNotNull("There should be mapped resources", res); //$NON-NLS-1$ + assertTrue("There should be one project", res.length == 1); //$NON-NLS-1$ } finally { lc.delete(); @@ -1446,13 +1446,13 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @since 3.9.0 */ public void testGetProjectMappedResource2() throws Exception { - ILaunchConfiguration lc = newConfiguration(null,"test.project.resource.mapping"); + ILaunchConfiguration lc = newConfiguration(null, "test.project.resource.mapping"); //$NON-NLS-1$ try { ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy(); - assertNotNull("Should have a working copy of the testig launch configuration", wc); - setResourceMappings(wc, new ResourceItem[] {new ResourceItem("test/project", new Integer(IResource.PROJECT))}); + assertNotNull("Should have a working copy of the testig launch configuration", wc); //$NON-NLS-1$ + setResourceMappings(wc, new ResourceItem[] { new ResourceItem("test/project", new Integer(IResource.PROJECT)) }); //$NON-NLS-1$ IResource[] res = wc.getMappedResources(); - assertNull("There should be no mapped resources", res); + assertNull("There should be no mapped resources", res); //$NON-NLS-1$ } finally { lc.delete(); @@ -1467,17 +1467,17 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @since 3.9.0 */ public void testGetProjectMappedResource3() throws Exception { - ILaunchConfiguration lc = newConfiguration(null,"test.project.resource.mapping"); + ILaunchConfiguration lc = newConfiguration(null, "test.project.resource.mapping"); //$NON-NLS-1$ try { ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy(); - assertNotNull("Should have a working copy of the testig launch configuration", wc); - setResourceMappings(wc, new ResourceItem[] {new ResourceItem("test\\project", new Integer(IResource.PROJECT))}); + assertNotNull("Should have a working copy of the testig launch configuration", wc); //$NON-NLS-1$ + setResourceMappings(wc, new ResourceItem[] { new ResourceItem("test\\project", new Integer(IResource.PROJECT)) }); //$NON-NLS-1$ IResource[] res = wc.getMappedResources(); if(Platform.OS_WIN32.equals(Platform.getOS())) { - assertNull("There should be no mapped resources", res); + assertNull("There should be no mapped resources", res); //$NON-NLS-1$ } else { - assertNotNull("There should be mapped resources", res); + assertNotNull("There should be mapped resources", res); //$NON-NLS-1$ } } finally { @@ -1493,13 +1493,13 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau * @since 3.9.0 */ public void testGetProjectMappedResource4() throws Exception { - ILaunchConfiguration lc = newConfiguration(null,"test.project.resource.mapping"); + ILaunchConfiguration lc = newConfiguration(null, "test.project.resource.mapping"); //$NON-NLS-1$ try { ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy(); - assertNotNull("Should have a working copy of the testig launch configuration", wc); - setResourceMappings(wc, new ResourceItem[] {new ResourceItem("/project", new Integer(IResource.PROJECT))}); + assertNotNull("Should have a working copy of the testig launch configuration", wc); //$NON-NLS-1$ + setResourceMappings(wc, new ResourceItem[] { new ResourceItem("/project", new Integer(IResource.PROJECT)) }); //$NON-NLS-1$ IResource[] res = wc.getMappedResources(); - assertNotNull("There should be mapped resources", res); + assertNotNull("There should be mapped resources", res); //$NON-NLS-1$ } finally { lc.delete(); diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchFavoriteTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchFavoriteTests.java index 1e5a7827e..485e8dec4 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchFavoriteTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchFavoriteTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -154,9 +154,9 @@ public class LaunchFavoriteTests extends AbstractLaunchTest { */ private boolean containsFavorite(LaunchHistory history, ILaunchConfiguration configuration, int size) { ILaunchConfiguration[] favorites = history.getFavorites(); - assertNotNull("No favorites", favorites); + assertNotNull("No favorites", favorites); //$NON-NLS-1$ if (size != -1) { - assertEquals("Favorites wrong size", size, favorites.length); + assertEquals("Favorites wrong size", size, favorites.length); //$NON-NLS-1$ } for (int i = 0; i < favorites.length; i++) { if (configuration.equals(favorites[i])) { @@ -175,8 +175,8 @@ public class LaunchFavoriteTests extends AbstractLaunchTest { ILaunchConfigurationWorkingCopy wc = addFavorite(getLaunchConfiguration(), IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP); addFavorite(wc, IDebugUIConstants.ID_RUN_LAUNCH_GROUP); ILaunchConfiguration saved = wc.doSave(); - assertTrue("Missing from debug favorites", containsFavorite(getDebugLaunchHistory(), saved, 1)); - assertTrue("Missing from run favorites", containsFavorite(getRunLaunchHistory(), saved, 1)); + assertTrue("Missing from debug favorites", containsFavorite(getDebugLaunchHistory(), saved, 1)); //$NON-NLS-1$ + assertTrue("Missing from run favorites", containsFavorite(getRunLaunchHistory(), saved, 1)); //$NON-NLS-1$ } /** @@ -189,8 +189,8 @@ public class LaunchFavoriteTests extends AbstractLaunchTest { ILaunchConfigurationWorkingCopy wc = removeFavorite(getLaunchConfiguration(), IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP); removeFavorite(wc, IDebugUIConstants.ID_RUN_LAUNCH_GROUP); ILaunchConfiguration saved = wc.doSave(); - assertFalse("Should not be a debug favorite", containsFavorite(getDebugLaunchHistory(), saved, 0)); - assertFalse("Should not be a run favorite", containsFavorite(getRunLaunchHistory(), saved, 0)); + assertFalse("Should not be a debug favorite", containsFavorite(getDebugLaunchHistory(), saved, 0)); //$NON-NLS-1$ + assertFalse("Should not be a run favorite", containsFavorite(getRunLaunchHistory(), saved, 0)); //$NON-NLS-1$ } /** @@ -202,8 +202,8 @@ public class LaunchFavoriteTests extends AbstractLaunchTest { testBecomeFavorite(); // create a favorite in two histories ILaunchConfiguration configuration = getLaunchConfiguration(); configuration.delete(); - assertFalse("Should not be a debug favorite", containsFavorite(getDebugLaunchHistory(), configuration, 0)); - assertFalse("Should not be a run favorite", containsFavorite(getRunLaunchHistory(), configuration, 0)); + assertFalse("Should not be a debug favorite", containsFavorite(getDebugLaunchHistory(), configuration, 0)); //$NON-NLS-1$ + assertFalse("Should not be a run favorite", containsFavorite(getRunLaunchHistory(), configuration, 0)); //$NON-NLS-1$ } /** @@ -215,10 +215,10 @@ public class LaunchFavoriteTests extends AbstractLaunchTest { testBecomeFavorite(); ILaunchConfiguration original = getLaunchConfiguration(); ILaunchConfigurationWorkingCopy copy = original.getWorkingCopy(); - copy.rename("rename"+original.getName()); + copy.rename("rename" + original.getName()); //$NON-NLS-1$ ILaunchConfiguration saved = copy.doSave(); - assertTrue("Missing from debug favorites", containsFavorite(getDebugLaunchHistory(), saved, 1)); - assertTrue("Missing from run favorites", containsFavorite(getRunLaunchHistory(), saved, 1)); + assertTrue("Missing from debug favorites", containsFavorite(getDebugLaunchHistory(), saved, 1)); //$NON-NLS-1$ + assertTrue("Missing from run favorites", containsFavorite(getRunLaunchHistory(), saved, 1)); //$NON-NLS-1$ saved.delete(); } @@ -230,12 +230,12 @@ public class LaunchFavoriteTests extends AbstractLaunchTest { public void testRenameBecomeFavorite() throws CoreException { ILaunchConfiguration original = getLaunchConfiguration(); ILaunchConfigurationWorkingCopy copy = original.getWorkingCopy(); - copy.rename("rename"+original.getName()); + copy.rename("rename" + original.getName()); //$NON-NLS-1$ addFavorite(copy, IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP); addFavorite(copy, IDebugUIConstants.ID_RUN_LAUNCH_GROUP); ILaunchConfiguration saved = copy.doSave(); - assertTrue("Missing from debug favorites", containsFavorite(getDebugLaunchHistory(), saved, 1)); - assertTrue("Missing from run favorites", containsFavorite(getRunLaunchHistory(), saved, 1)); + assertTrue("Missing from debug favorites", containsFavorite(getDebugLaunchHistory(), saved, 1)); //$NON-NLS-1$ + assertTrue("Missing from run favorites", containsFavorite(getRunLaunchHistory(), saved, 1)); //$NON-NLS-1$ saved.delete(); } @@ -248,12 +248,12 @@ public class LaunchFavoriteTests extends AbstractLaunchTest { testBecomeFavorite(); ILaunchConfiguration original = getLaunchConfiguration(); ILaunchConfigurationWorkingCopy copy = original.getWorkingCopy(); - copy.rename("rename"+original.getName()); + copy.rename("rename" + original.getName()); //$NON-NLS-1$ removeFavorite(copy, IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP); removeFavorite(copy, IDebugUIConstants.ID_RUN_LAUNCH_GROUP); ILaunchConfiguration saved = copy.doSave(); - assertFalse("Should not be a debug favorite", containsFavorite(getDebugLaunchHistory(), saved, 0)); - assertFalse("Should not be a run favorite", containsFavorite(getRunLaunchHistory(), saved, 0)); + assertFalse("Should not be a debug favorite", containsFavorite(getDebugLaunchHistory(), saved, 0)); //$NON-NLS-1$ + assertFalse("Should not be a run favorite", containsFavorite(getRunLaunchHistory(), saved, 0)); //$NON-NLS-1$ saved.delete(); } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchManagerTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchManagerTests.java index ab5922203..e841160b3 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchManagerTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/LaunchManagerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 IBM Corporation and others. + * Copyright (c) 2009, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,9 +34,9 @@ public class LaunchManagerTests extends AbstractLaunchTest { * Tests generating a valid launch configuration name */ public void testGenereateConfigName() { - String configname = "launch_configuration"; + String configname = "launch_configuration"; //$NON-NLS-1$ String name = getLaunchManager().generateLaunchConfigurationName(configname); - assertTrue("the name nust be '"+configname+"'", name.equals(configname)); + assertTrue("the name nust be '" + configname + "'", name.equals(configname)); //$NON-NLS-1$ //$NON-NLS-2$ } /** @@ -44,18 +44,18 @@ public class LaunchManagerTests extends AbstractLaunchTest { * the deprecated method */ public void testGenereateConfigNameBadChar() { - String configname = "config:name"; + String configname = "config:name"; //$NON-NLS-1$ String name = getLaunchManager().generateUniqueLaunchConfigurationNameFrom(configname); - assertEquals("config name should be '"+configname+"'", configname, name); + assertEquals("config name should be '" + configname + "'", configname, name); //$NON-NLS-1$ //$NON-NLS-2$ } /** * Tests that a valid name is accepted as is. */ public void testGenerateValidName() { - String configname = "thisisavalidname"; + String configname = "thisisavalidname"; //$NON-NLS-1$ String name = getLaunchManager().generateLaunchConfigurationName(configname); - assertEquals("Should be the same as the seed", configname, name); + assertEquals("Should be the same as the seed", configname, name); //$NON-NLS-1$ } /** @@ -64,9 +64,9 @@ public class LaunchManagerTests extends AbstractLaunchTest { */ public void testGenerateConfigNameReservedName() { if(Platform.OS_WIN32.equals(Platform.getOS())) { - String configname = "aux"; + String configname = "aux"; //$NON-NLS-1$ String name = getLaunchManager().generateUniqueLaunchConfigurationNameFrom(configname); - assertEquals("config name should be 'aux'", configname, name); + assertEquals("config name should be 'aux'", configname, name); //$NON-NLS-1$ } } @@ -74,9 +74,9 @@ public class LaunchManagerTests extends AbstractLaunchTest { * Tests generating a configuration name that contains an invalid character */ public void testGenerateBadConfigName() { - String configname = "config:name"; + String configname = "config:name"; //$NON-NLS-1$ String name = getLaunchManager().generateLaunchConfigurationName(configname); - assertEquals("config name should be 'config_name'", "config_name", name); + assertEquals("config name should be 'config_name'", "config_name", name); //$NON-NLS-1$ //$NON-NLS-2$ } /** @@ -85,9 +85,9 @@ public class LaunchManagerTests extends AbstractLaunchTest { */ public void testGenerateConflictingName() { if(Platform.OS_WIN32.equals(Platform.getOS())) { - String configname = "aux"; + String configname = "aux"; //$NON-NLS-1$ String name = getLaunchManager().generateLaunchConfigurationName(configname); - assertEquals("config name should be 'launch_configuration'", "launch_configuration", name); + assertEquals("config name should be 'launch_configuration'", "launch_configuration", name); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -96,13 +96,13 @@ public class LaunchManagerTests extends AbstractLaunchTest { * is another config with the replaced name already */ public void testGenerateBadCharConflict() throws Exception { - String configname = "config:name"; + String configname = "config:name"; //$NON-NLS-1$ String name = getLaunchManager().generateLaunchConfigurationName(configname); - assertEquals("config name should be 'config_name'", "config_name", name); + assertEquals("config name should be 'config_name'", "config_name", name); //$NON-NLS-1$ //$NON-NLS-2$ getLaunchConfiguration(name); name = getLaunchManager().generateLaunchConfigurationName(configname); - assertEquals("config name should be 'config_name (1)'", "config_name (1)", name); - ILaunchConfiguration config = getLaunchConfiguration("config_name"); + assertEquals("config name should be 'config_name (1)'", "config_name (1)", name); //$NON-NLS-1$ //$NON-NLS-2$ + ILaunchConfiguration config = getLaunchConfiguration("config_name"); //$NON-NLS-1$ config.delete(); } @@ -113,13 +113,13 @@ public class LaunchManagerTests extends AbstractLaunchTest { */ public void testGenerateBadNameConflict() throws Exception { if(Platform.OS_WIN32.equals(Platform.getOS())) { - String configname = "com2"; + String configname = "com2"; //$NON-NLS-1$ String name = getLaunchManager().generateLaunchConfigurationName(configname); - assertEquals("config name should be 'launch_configuration'", "launch_configuration", name); + assertEquals("config name should be 'launch_configuration'", "launch_configuration", name); //$NON-NLS-1$ //$NON-NLS-2$ getLaunchConfiguration(name); name = getLaunchManager().generateLaunchConfigurationName(configname); - assertEquals("config name should be 'launch_configuration (1)'", "launch_configuration (1)", name); - ILaunchConfiguration config = getLaunchConfiguration("launch_configuration"); + assertEquals("config name should be 'launch_configuration (1)'", "launch_configuration (1)", name); //$NON-NLS-1$ //$NON-NLS-2$ + ILaunchConfiguration config = getLaunchConfiguration("launch_configuration"); //$NON-NLS-1$ config.delete(); } } @@ -128,12 +128,12 @@ public class LaunchManagerTests extends AbstractLaunchTest { * Tests the {@link org.eclipse.debug.core.ILaunchManager#isValidLaunchConfigurationName(String)} method for correctness */ public void testValidateConfigGoodName() { - String configname = "configname"; + String configname = "configname"; //$NON-NLS-1$ try { getLaunchManager().isValidLaunchConfigurationName(configname); } catch(IllegalArgumentException iae) { - fail("the config name should not have thrown an exception during validation"); + fail("the config name should not have thrown an exception during validation"); //$NON-NLS-1$ } } @@ -141,14 +141,14 @@ public class LaunchManagerTests extends AbstractLaunchTest { * Tests the {@link org.eclipse.debug.core.ILaunchManager#isValidLaunchConfigurationName(String)} method for correctness */ public void testValidateConfigBadCharName() { - String configname = "config:name"; + String configname = "config:name"; //$NON-NLS-1$ try { getLaunchManager().isValidLaunchConfigurationName(configname); } catch(IllegalArgumentException iae) { return; } - fail("the config name should have thrown an exception during validation"); + fail("the config name should have thrown an exception during validation"); //$NON-NLS-1$ } /** @@ -156,14 +156,14 @@ public class LaunchManagerTests extends AbstractLaunchTest { */ public void testValidateConfigBadName() { if(Platform.OS_WIN32.equals(Platform.getOS())) { - String configname = "com1"; + String configname = "com1"; //$NON-NLS-1$ try { getLaunchManager().isValidLaunchConfigurationName(configname); } catch(IllegalArgumentException iae) { return; } - fail("the config name should have thrown an exception during validation"); + fail("the config name should have thrown an exception during validation"); //$NON-NLS-1$ } } @@ -172,18 +172,18 @@ public class LaunchManagerTests extends AbstractLaunchTest { * already properly updates a '(N)' counter at the end */ public void testGenerateNameExistingConfig() throws Exception { - String configname = "x.y.z.configname"; + String configname = "x.y.z.configname"; //$NON-NLS-1$ getLaunchConfiguration(configname); String name = getLaunchManager().generateLaunchConfigurationName(configname); - assertEquals("the configuration name should have been "+configname+" (1)", configname+" (1)", name); + assertEquals("the configuration name should have been " + configname + " (1)", configname + " (1)", name); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ getLaunchConfiguration(name); name = getLaunchManager().generateLaunchConfigurationName(name); - assertEquals("the configuration name should have been "+configname+" (2)", configname+" (2)", name); + assertEquals("the configuration name should have been " + configname + " (2)", configname + " (2)", name); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ILaunchConfiguration config = getLaunchConfiguration(configname); if(config != null) { config.delete(); } - config = getLaunchConfiguration(configname +" (1)"); + config = getLaunchConfiguration(configname + " (1)"); //$NON-NLS-1$ if(config != null) { config.delete(); } @@ -193,11 +193,11 @@ public class LaunchManagerTests extends AbstractLaunchTest { * Tests that removing an accelerator properly removes it without affecting the base string (readable) value */ public void testRemoveAcc() { - String text = "&Remove"; + String text = "&Remove"; //$NON-NLS-1$ String label = LaunchManager.removeAccelerators(text); - assertEquals("the label should be 'Remove'", "Remove", label); - text = "Remo&ve"; + assertEquals("the label should be 'Remove'", "Remove", label); //$NON-NLS-1$ //$NON-NLS-2$ + text = "Remo&ve"; //$NON-NLS-1$ label = LaunchManager.removeAccelerators(text); - assertEquals("the label should be 'Remove'", "Remove", label); + assertEquals("the label should be 'Remove'", "Remove", label); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/RefreshTabTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/RefreshTabTests.java index 900e4d066..d56adac1d 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/RefreshTabTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/launching/RefreshTabTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -51,17 +51,17 @@ public class RefreshTabTests extends AbstractLaunchTest { */ protected void setSelection(IResource resource) { IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); - assertNotNull("The active workbench page should not be null", page); + assertNotNull("The active workbench page should not be null", page); //$NON-NLS-1$ IViewPart part; try { - part = page.showView("org.eclipse.ui.views.ResourceNavigator"); + part = page.showView("org.eclipse.ui.views.ResourceNavigator"); //$NON-NLS-1$ IWorkbenchPartSite site = part.getSite(); - assertNotNull("The part site for org.eclipse.ui.views.ResourceNavigator should not be null ", site); + assertNotNull("The part site for org.eclipse.ui.views.ResourceNavigator should not be null ", site); //$NON-NLS-1$ ISelectionProvider provider = site.getSelectionProvider(); - assertNotNull("the selection provider should not be null for org.eclipse.ui.views.ResourceNavigator", provider); + assertNotNull("the selection provider should not be null for org.eclipse.ui.views.ResourceNavigator", provider); //$NON-NLS-1$ provider.setSelection(new StructuredSelection(resource)); } catch (PartInitException e) { - assertNotNull("Failed to open navigator view", null); + assertNotNull("Failed to open navigator view", null); //$NON-NLS-1$ } } @@ -70,8 +70,8 @@ public class RefreshTabTests extends AbstractLaunchTest { * @throws CoreException */ public void testSelectedResource() throws CoreException { - String scope = "${resource}"; - IResource resource = getProject().getFolder("src"); + String scope = "${resource}"; //$NON-NLS-1$ + IResource resource = getProject().getFolder("src"); //$NON-NLS-1$ setSelection(resource); IResource[] result = RefreshTab.getRefreshResources(scope); assertNotNull(result); @@ -84,8 +84,8 @@ public class RefreshTabTests extends AbstractLaunchTest { * @throws CoreException */ public void testSelectionsFolder() throws CoreException { - String scope = "${container}"; - IResource resource = getProject().getFolder("src"); + String scope = "${container}"; //$NON-NLS-1$ + IResource resource = getProject().getFolder("src"); //$NON-NLS-1$ setSelection(resource); IResource[] result = RefreshTab.getRefreshResources(scope); assertNotNull(result); @@ -98,8 +98,8 @@ public class RefreshTabTests extends AbstractLaunchTest { * @throws CoreException */ public void testSelectionsProject() throws CoreException { - String scope = "${project}"; - IResource resource = getProject().getFolder("src"); + String scope = "${project}"; //$NON-NLS-1$ + IResource resource = getProject().getFolder("src"); //$NON-NLS-1$ setSelection(resource); IResource[] result = RefreshTab.getRefreshResources(scope); assertNotNull(result); @@ -112,7 +112,7 @@ public class RefreshTabTests extends AbstractLaunchTest { * @throws CoreException */ public void testWorkspaceScope() throws CoreException { - String scope = "${workspace}"; + String scope = "${workspace}"; //$NON-NLS-1$ IResource[] result = RefreshTab.getRefreshResources(scope); assertNotNull(result); assertEquals(1, result.length); @@ -124,8 +124,8 @@ public class RefreshTabTests extends AbstractLaunchTest { * @throws CoreException */ public void testSpecificResource() throws CoreException { - String scope = "${resource:/RefreshTabTests/some.file}"; - IResource resource = getProject().getFile("some.file"); + String scope = "${resource:/RefreshTabTests/some.file}"; //$NON-NLS-1$ + IResource resource = getProject().getFile("some.file"); //$NON-NLS-1$ IResource[] result = RefreshTab.getRefreshResources(scope); assertNotNull(result); assertEquals(1, result.length); @@ -138,7 +138,7 @@ public class RefreshTabTests extends AbstractLaunchTest { */ public void testWorkingSet() throws CoreException { String scope= "${working_set:<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<launchConfigurationWorkingSet factoryID=\"org.eclipse.ui.internal.WorkingSetFactory\" name=\"workingSet\" editPageId=\"org.eclipse.ui.resourceWorkingSetPage\">\n<item factoryID=\"org.eclipse.ui.internal.model.ResourceFactory\" path=\"/RefreshTabTests/some.file\" type=\"1\"/>\n</launchConfigurationWorkingSet>}"; //$NON-NLS-1$ - IResource resource = getProject().getFile("some.file"); + IResource resource = getProject().getFile("some.file"); //$NON-NLS-1$ IResource[] result = RefreshTab.getRefreshResources(scope); assertNotNull(result); assertEquals(1, result.length); @@ -152,13 +152,13 @@ public class RefreshTabTests extends AbstractLaunchTest { */ protected IProject getProject() throws CoreException { IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot(); - IProject project= root.getProject("RefreshTabTests"); + IProject project = root.getProject("RefreshTabTests"); //$NON-NLS-1$ if (!project.exists()) { - project = TestsPlugin.createProject("RefreshTabTests"); - IFolder folder = project.getFolder("src"); + project = TestsPlugin.createProject("RefreshTabTests"); //$NON-NLS-1$ + IFolder folder = project.getFolder("src"); //$NON-NLS-1$ folder.create(false, true, null); - IFile file = project.getFile("some.file"); - file.create(new ByteArrayInputStream("test file".getBytes()), false, null); + IFile file = project.getFile("some.file"); //$NON-NLS-1$ + file.create(new ByteArrayInputStream("test file".getBytes()), false, null); //$NON-NLS-1$ } return project; } @@ -171,8 +171,8 @@ public class RefreshTabTests extends AbstractLaunchTest { */ public void testRefreshScopeComparator() throws CoreException { String oldStyle = "${working_set:<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<launchConfigurationWorkingSet factoryID=\"org.eclipse.ui.internal.WorkingSetFactory\" name=\"workingSet\" editPageId=\"org.eclipse.ui.resourceWorkingSetPage\">\n<item factoryID=\"org.eclipse.ui.internal.model.ResourceFactory\" path=\"/RefreshTabTests/some.file\" type=\"1\"/>\n</launchConfigurationWorkingSet>}"; //$NON-NLS-1$ - String newStyle = "${working_set:<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<resources>\n<item path=\"/RefreshTabTests/some.file\" type=\"1\"/>\n</resources>}"; - assertEquals("Comparator should return 0", 0, new RefreshScopeComparator().compare(oldStyle, newStyle)); + String newStyle = "${working_set:<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<resources>\n<item path=\"/RefreshTabTests/some.file\" type=\"1\"/>\n</resources>}"; //$NON-NLS-1$ + assertEquals("Comparator should return 0", 0, new RefreshScopeComparator().compare(oldStyle, newStyle)); //$NON-NLS-1$ } /** @@ -181,7 +181,7 @@ public class RefreshTabTests extends AbstractLaunchTest { * @throws CoreException */ public void testResourceMemento() throws CoreException { - IResource[] resources = new IResource[]{getProject(), getProject().getFile("not.exist"), getProject().getFile("some.file")}; + IResource[] resources = new IResource[] { getProject(), getProject().getFile("not.exist"), getProject().getFile("some.file") }; //$NON-NLS-1$ //$NON-NLS-2$ String memento = RefreshUtil.toMemento(resources); IResource[] restore = RefreshUtil.toResources(memento); assertEquals(resources.length, restore.length); @@ -199,6 +199,6 @@ public class RefreshTabTests extends AbstractLaunchTest { String memento = RefreshUtil.toMemento(new IResource[]{}); IResource[] resources = RefreshUtil.toResources(memento); assertNotNull(resources); - assertEquals("Should be empty", 0, resources.length); + assertEquals("Should be empty", 0, resources.length); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/DynamicRenderingBindings.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/DynamicRenderingBindings.java index 0bf6f5c5e..648b97674 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/DynamicRenderingBindings.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/DynamicRenderingBindings.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -25,7 +25,7 @@ public class DynamicRenderingBindings extends AbstractMemoryRenderingBindingsPro private static DynamicRenderingBindings fgSingleton = null; // id of rendering type bound by this provider - private String fId = "rendering_type_1"; + private String fId = "rendering_type_1"; //$NON-NLS-1$ /** * Constructor diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/MemoryBlock.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/MemoryBlock.java index d9705418f..994f4a158 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/MemoryBlock.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/MemoryBlock.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -65,7 +65,7 @@ public class MemoryBlock implements IMemoryBlock { * @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier() */ public String getModelIdentifier() { - return "no.debugger"; + return "no.debugger"; //$NON-NLS-1$ } /** diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/MemoryRenderingTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/MemoryRenderingTests.java index 6850d134a..8c7a9f2ca 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/MemoryRenderingTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/view/memory/MemoryRenderingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -30,89 +30,89 @@ public class MemoryRenderingTests extends TestCase { public void testRenderingTypes() { IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager(); IMemoryRenderingType[] types = manager.getRenderingTypes(); - assertTrue("Wrong number of rendering types contributed", types.length > 6); - assertTrue("Missing type 1", indexOf(manager.getRenderingType("rendering_type_1"), types) >= 0); - assertTrue("Missing type 2", indexOf(manager.getRenderingType("rendering_type_2"), types) >= 0); - assertTrue("Missing type 3", indexOf(manager.getRenderingType("rendering_type_3"), types) >= 0); - assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.raw_memory"), types) >= 0); - assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.ascii"), types) >= 0); - assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.signedint"), types) >= 0); - assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.unsignedint"), types) >= 0); + assertTrue("Wrong number of rendering types contributed", types.length > 6); //$NON-NLS-1$ + assertTrue("Missing type 1", indexOf(manager.getRenderingType("rendering_type_1"), types) >= 0); //$NON-NLS-1$ //$NON-NLS-2$ + assertTrue("Missing type 2", indexOf(manager.getRenderingType("rendering_type_2"), types) >= 0); //$NON-NLS-1$ //$NON-NLS-2$ + assertTrue("Missing type 3", indexOf(manager.getRenderingType("rendering_type_3"), types) >= 0); //$NON-NLS-1$ //$NON-NLS-2$ + assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.raw_memory"), types) >= 0); //$NON-NLS-1$ //$NON-NLS-2$ + assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.ascii"), types) >= 0); //$NON-NLS-1$ //$NON-NLS-2$ + assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.signedint"), types) >= 0); //$NON-NLS-1$ //$NON-NLS-2$ + assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.unsignedint"), types) >= 0); //$NON-NLS-1$ //$NON-NLS-2$ } public void testRenderingTypeNames() { IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager(); - IMemoryRenderingType type = manager.getRenderingType("rendering_type_1"); - assertEquals("Wrong name", "Rendering One", type.getLabel()); - type = manager.getRenderingType("rendering_type_2"); - assertEquals("Wrong name", "Rendering Two", type.getLabel()); + IMemoryRenderingType type = manager.getRenderingType("rendering_type_1"); //$NON-NLS-1$ + assertEquals("Wrong name", "Rendering One", type.getLabel()); //$NON-NLS-1$ //$NON-NLS-2$ + type = manager.getRenderingType("rendering_type_2"); //$NON-NLS-1$ + assertEquals("Wrong name", "Rendering Two", type.getLabel()); //$NON-NLS-1$ //$NON-NLS-2$ } public void testSingleBinding() { IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager(); IMemoryBlock block = new MemoryBlockOne(); IMemoryRenderingType[] types = manager.getRenderingTypes(block); - assertEquals("Wrong number of bindings", 1, types.length); - assertEquals("Wrong binding", "rendering_type_1", types[0].getId()); + assertEquals("Wrong number of bindings", 1, types.length); //$NON-NLS-1$ + assertEquals("Wrong binding", "rendering_type_1", types[0].getId()); //$NON-NLS-1$ //$NON-NLS-2$ } public void testDoubleBinding() { IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager(); IMemoryBlock block = new MemoryBlockTwo(); IMemoryRenderingType[] types = manager.getRenderingTypes(block); - assertEquals("Wrong number of bindings", 2, types.length); - assertTrue("Missing binding", indexOf(manager.getRenderingType("rendering_type_1"), types) >= 0); - assertTrue("Missing binding", indexOf(manager.getRenderingType("rendering_type_2"), types) >= 0); + assertEquals("Wrong number of bindings", 2, types.length); //$NON-NLS-1$ + assertTrue("Missing binding", indexOf(manager.getRenderingType("rendering_type_1"), types) >= 0); //$NON-NLS-1$ //$NON-NLS-2$ + assertTrue("Missing binding", indexOf(manager.getRenderingType("rendering_type_2"), types) >= 0); //$NON-NLS-1$ //$NON-NLS-2$ } public void testDefaultBinding() { IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager(); IMemoryBlock block = new MemoryBlockOne(); IMemoryRenderingType[] types = manager.getDefaultRenderingTypes(block); - assertEquals("Wrong number of bindings", 1, types.length); - assertEquals("Wrong binding", "rendering_type_1", types[0].getId()); + assertEquals("Wrong number of bindings", 1, types.length); //$NON-NLS-1$ + assertEquals("Wrong binding", "rendering_type_1", types[0].getId()); //$NON-NLS-1$ //$NON-NLS-2$ } public void testNoDefaultBinding() { IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager(); IMemoryBlock block = new MemoryBlockTwo(); IMemoryRenderingType[] types = manager.getDefaultRenderingTypes(block); - assertEquals("Wrong number of bindings", 0, types.length); + assertEquals("Wrong number of bindings", 0, types.length); //$NON-NLS-1$ } public void testPrimaryBinding() { IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager(); IMemoryBlock block = new MemoryBlockOne(); IMemoryRenderingType type = manager.getPrimaryRenderingType(block); - assertEquals("Wrong binding", "rendering_type_1", type.getId()); + assertEquals("Wrong binding", "rendering_type_1", type.getId()); //$NON-NLS-1$ //$NON-NLS-2$ } public void testNoPrimaryBinding() { IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager(); IMemoryBlock block = new MemoryBlockTwo(); IMemoryRenderingType type = manager.getPrimaryRenderingType(block); - assertNull("Wrong binding", type); + assertNull("Wrong binding", type); //$NON-NLS-1$ } public void testDefaultWithoutPrimaryBinding() { IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager(); IMemoryBlock block = new MemoryBlockThree(); IMemoryRenderingType[] types = manager.getDefaultRenderingTypes(block); - assertEquals("Wrong number of bindings", 1, types.length); - assertEquals("Wrong binding", "rendering_type_3", types[0].getId()); + assertEquals("Wrong number of bindings", 1, types.length); //$NON-NLS-1$ + assertEquals("Wrong binding", "rendering_type_3", types[0].getId()); //$NON-NLS-1$ //$NON-NLS-2$ } public void testDynamicBinding() { IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager(); IMemoryBlock block = new MemoryBlockDynamic(); IMemoryRenderingType[] types = manager.getRenderingTypes(block); - assertEquals("Wrong number of bindings", 1, types.length); - assertEquals("Wrong binding", "rendering_type_1", types[0].getId()); + assertEquals("Wrong number of bindings", 1, types.length); //$NON-NLS-1$ + assertEquals("Wrong binding", "rendering_type_1", types[0].getId()); //$NON-NLS-1$ //$NON-NLS-2$ types = manager.getDefaultRenderingTypes(block); - assertEquals("Wrong number of bindings", 1, types.length); - assertEquals("Wrong binding", "rendering_type_1", types[0].getId()); + assertEquals("Wrong number of bindings", 1, types.length); //$NON-NLS-1$ + assertEquals("Wrong binding", "rendering_type_1", types[0].getId()); //$NON-NLS-1$ //$NON-NLS-2$ IMemoryRenderingType type = manager.getPrimaryRenderingType(block); - assertEquals("Wrong bindings", manager.getRenderingType("rendering_type_1"), type); + assertEquals("Wrong bindings", manager.getRenderingType("rendering_type_1"), type); //$NON-NLS-1$ //$NON-NLS-2$ } public void testBindingChangeNotification() { @@ -131,15 +131,15 @@ public class MemoryRenderingTests extends TestCase { try { manager.addListener(listener); - assertFalse("Renderings should not have changed yet", changed[0]); - DynamicRenderingBindings.setBinding("rendering_type_2"); - assertTrue("Renderings should have changed", changed[0]); + assertFalse("Renderings should not have changed yet", changed[0]); //$NON-NLS-1$ + DynamicRenderingBindings.setBinding("rendering_type_2"); //$NON-NLS-1$ + assertTrue("Renderings should have changed", changed[0]); //$NON-NLS-1$ types = manager.getRenderingTypes(block); - assertEquals("Wrong number of bindings", 1, types.length); - assertEquals("Wrong binding", "rendering_type_2", types[0].getId()); + assertEquals("Wrong number of bindings", 1, types.length); //$NON-NLS-1$ + assertEquals("Wrong binding", "rendering_type_2", types[0].getId()); //$NON-NLS-1$ //$NON-NLS-2$ } finally { // restore original bindings - DynamicRenderingBindings.setBinding("rendering_type_1"); + DynamicRenderingBindings.setBinding("rendering_type_1"); //$NON-NLS-1$ manager.removeListener(listener); } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java index 435827411..9cc09fec0 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/CheckTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -68,14 +69,18 @@ abstract public class CheckTests extends TestCase { // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } protected void runTest() throws Throwable { try { super.runTest(); } catch (Throwable t) { - throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); + throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -96,7 +101,11 @@ abstract public class CheckTests extends TestCase { fViewer.setInput(model.getRootElement()); // Wait for the updates to complete. - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -111,7 +120,11 @@ abstract public class CheckTests extends TestCase { fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -157,7 +170,11 @@ abstract public class CheckTests extends TestCase { // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Update the model @@ -168,8 +185,11 @@ abstract public class CheckTests extends TestCase { fListener.reset(elementPath, element, -1, true, false); model.postDelta(delta); - while (!fListener.isFinished(ITestModelUpdatesListenerConstants.LABEL_COMPLETE | ITestModelUpdatesListenerConstants.MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ITestModelUpdatesListenerConstants.LABEL_COMPLETE | ITestModelUpdatesListenerConstants.MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ChildrenUpdateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ChildrenUpdateTests.java index 64be95af6..9c85204e0 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ChildrenUpdateTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ChildrenUpdateTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,8 @@ import junit.framework.TestCase; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.viewers.model.ChildrenUpdate; -import org.eclipse.debug.internal.ui.viewers.model.ILabelUpdateListener; import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer; +import org.eclipse.debug.internal.ui.viewers.model.ILabelUpdateListener; import org.eclipse.debug.internal.ui.viewers.model.TreeModelContentProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelChangedListener; import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta; @@ -193,23 +193,23 @@ public class ChildrenUpdateTests extends TestCase { TreeModelContentProvider cp = getContentProvider(); ChildrenUpdate update1 = new ChildrenUpdate(cp, element, TreePath.EMPTY, element, 1, null); ChildrenUpdate update2 = new ChildrenUpdate(cp, element, TreePath.EMPTY, element, 2, null); - assertTrue("Should coalesce", update1.coalesce(update2)); - assertEquals("Wrong offset", 1, update1.getOffset()); - assertEquals("Wrong length", 2, update1.getLength()); + assertTrue("Should coalesce", update1.coalesce(update2)); //$NON-NLS-1$ + assertEquals("Wrong offset", 1, update1.getOffset()); //$NON-NLS-1$ + assertEquals("Wrong length", 2, update1.getLength()); //$NON-NLS-1$ update2 = new ChildrenUpdate(cp, element, TreePath.EMPTY, element, 3, null); - assertTrue("Should coalesce", update1.coalesce(update2)); - assertEquals("Wrong offset", 1, update1.getOffset()); - assertEquals("Wrong length", 3, update1.getLength()); + assertTrue("Should coalesce", update1.coalesce(update2)); //$NON-NLS-1$ + assertEquals("Wrong offset", 1, update1.getOffset()); //$NON-NLS-1$ + assertEquals("Wrong length", 3, update1.getLength()); //$NON-NLS-1$ update2 = new ChildrenUpdate(cp, element, TreePath.EMPTY, element, 2, null); - assertTrue("Should coalesce", update1.coalesce(update2)); - assertEquals("Wrong offset", 1, update1.getOffset()); - assertEquals("Wrong length", 3, update1.getLength()); + assertTrue("Should coalesce", update1.coalesce(update2)); //$NON-NLS-1$ + assertEquals("Wrong offset", 1, update1.getOffset()); //$NON-NLS-1$ + assertEquals("Wrong length", 3, update1.getLength()); //$NON-NLS-1$ update2 = new ChildrenUpdate(cp, element, TreePath.EMPTY, element, 5, null); - assertFalse("Should not coalesce", update1.coalesce(update2)); - assertEquals("Wrong offset", 1, update1.getOffset()); - assertEquals("Wrong length", 3, update1.getLength()); + assertFalse("Should not coalesce", update1.coalesce(update2)); //$NON-NLS-1$ + assertEquals("Wrong offset", 1, update1.getOffset()); //$NON-NLS-1$ + assertEquals("Wrong length", 3, update1.getLength()); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java index c45e888d7..b8f406e75 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ColumnPresentationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -67,7 +68,7 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat fShell = new Shell(fDisplay); fShell.setSize(800, 600); fShell.setLayout(new FillLayout()); - fViewer = new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); + fViewer = new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); //$NON-NLS-1$ fViewer.getTree().addControlListener(new ControlListener() { public void controlResized(ControlEvent e) { fResized = true; @@ -108,7 +109,7 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat static String[] makeDefaultColumnIds() { String[] columnIds = new String[5]; for (int i = 0; i < columnIds.length; i++) { - columnIds[i] = "ColumnId_" + i; + columnIds[i] = "ColumnId_" + i; //$NON-NLS-1$ } return columnIds; } @@ -149,7 +150,7 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat } public String getId() { - return "MyColumnPresentationID"; + return "MyColumnPresentationID"; //$NON-NLS-1$ } public boolean isOptional() { @@ -164,7 +165,7 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat MyColumnPresentation2() { super(); for (int i = 0; i < columnIds.length; i++) { - columnIds[i] += "_2"; + columnIds[i] += "_2"; //$NON-NLS-1$ } repliedWidths = new int[columnIds.length]; Arrays.fill(repliedWidths, -2); @@ -194,7 +195,7 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat } public String getId() { - return "MyColumnPresentation2ID"; + return "MyColumnPresentation2ID"; //$NON-NLS-1$ } } @@ -225,13 +226,13 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat private TestModel makeModel(MyColumnPresentation cp, String rootSufffix) throws InterruptedException { MyModel model = new MyModel(cp); - model.setRoot(new TestElement(model, "root" + rootSufffix, new TestElement[] { - new TestElement(model, "1", true, true, new TestElement[0]), - new TestElement(model, "2", true, false, new TestElement[0]), - new TestElement(model, "3", false, true, new TestElement[0]), - new TestElement(model, "4", false, false, new TestElement[0]), - new TestElement(model, "5", new TestElement[0]), - new TestElement(model, "6", new TestElement[0]) })); + model.setRoot(new TestElement(model, "root" + rootSufffix, new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "1", true, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2", true, false, new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3", false, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "4", false, false, new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "5", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "6", new TestElement[0]) })); //$NON-NLS-1$ fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, true, false); fViewer.setInput(model.getRootElement()); while (!fListener.isFinished()) { @@ -253,11 +254,13 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat */ public void testInitialColumnAverageWidth() throws InterruptedException { // Try to wait for the shell painting to settle - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } fResized = false; MyColumnPresentation colPre = new MyColumnPresentation(); - makeModel(colPre, "m1"); + makeModel(colPre, "m1"); //$NON-NLS-1$ Tree tree = fViewer.getTree(); TreeColumn[] columns = tree.getColumns(); int treeWidth = tree.getSize().x; @@ -284,11 +287,13 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat */ public void testInitialColumnWidth() throws InterruptedException { // Try to wait for the shell painting to settle - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } fResized = false; MyColumnPresentation2 colPre = new MyColumnPresentation2(); - makeModel(colPre, "m2"); + makeModel(colPre, "m2"); //$NON-NLS-1$ Tree tree = fViewer.getTree(); TreeColumn[] columns = tree.getColumns(); @@ -313,7 +318,7 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat */ public void testRespectUserSettings() throws InterruptedException { MyColumnPresentation2 colPre = new MyColumnPresentation2(); - makeModel(colPre, "m2"); + makeModel(colPre, "m2"); //$NON-NLS-1$ TreeColumn[] columns = fViewer.getTree().getColumns(); // simulate user resizing each column width int[] newWidths = new int[columns.length]; @@ -327,8 +332,8 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat // get InternalTreeModelViewer to rebuild columns due to change of // model and presentation - first set to another model and column // presentation, then switch to a model with original presentation. - makeModel(new MyColumnPresentation(), "m1"); - makeModel(colPre, "m3"); + makeModel(new MyColumnPresentation(), "m1"); //$NON-NLS-1$ + makeModel(colPre, "m3"); //$NON-NLS-1$ // verify user resized widths are used instead of the initial widths from IColumnPresentation2 columns = fViewer.getTree().getColumns(); for (int i = 0; i < columns.length; i++) { @@ -363,7 +368,7 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat */ public void testRespectMemento() throws InterruptedException { MyColumnPresentation2 colPre = new MyColumnPresentation2(); - makeModel(colPre, "m2"); + makeModel(colPre, "m2"); //$NON-NLS-1$ TreeColumn[] columns = fViewer.getTree().getColumns(); // simulate user resizing each column width int[] newWidths = new int[columns.length]; @@ -375,7 +380,7 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat assertEquals(newWidths[i], columns[i].getWidth()); } // save memento - final XMLMemento memento = XMLMemento.createWriteRoot("TEST"); + final XMLMemento memento = XMLMemento.createWriteRoot("TEST"); //$NON-NLS-1$ fViewer.saveState(memento); // throw away any settings inside the viewer and create a new viewer // with memento settings, this is the same effect resulted from closing @@ -383,7 +388,7 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat recreateViewer(); fViewer.initState(memento); // get InternalTreeModelViewer to rebuild columns - makeModel(colPre, "m2"); + makeModel(colPre, "m2"); //$NON-NLS-1$ // verify widths from memento are used instead of the initial widths from IColumnPresentation2 columns = fViewer.getTree().getColumns(); for (int i = 0; i < columns.length; i++) { @@ -398,7 +403,7 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat public void testChangedColumnIds() throws InterruptedException { MyColumnPresentation colPre = new MyColumnPresentation(); - makeModel(colPre, "m1"); + makeModel(colPre, "m1"); //$NON-NLS-1$ TreeColumn[] columns = fViewer.getTree().getColumns(); // Select visible columns fViewer.setVisibleColumns(new String[] { colPre.columnIds[0] }); @@ -411,13 +416,13 @@ public class ColumnPresentationTests extends TestCase implements ITestModelUpdat // get InternalTreeModelViewer to rebuild columns due to change of // model and presentation - first set to another model and column // presentation, then switch to a model with original presentation. - makeModel(new MyColumnPresentation2(), "m2"); + makeModel(new MyColumnPresentation2(), "m2"); //$NON-NLS-1$ String[] newColumnIds = MyColumnPresentation.makeDefaultColumnIds(); - newColumnIds[0] = "new_column_id"; + newColumnIds[0] = "new_column_id"; //$NON-NLS-1$ colPre = new MyColumnPresentation(newColumnIds); - makeModel(colPre, "m3"); + makeModel(colPre, "m3"); //$NON-NLS-1$ // verify user resized widths are used instead of the initial widths from IColumnPresentation2 columns = fViewer.getTree().getColumns(); diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java index 98b884064..d2dff371a 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/ContentTests.java @@ -76,14 +76,18 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } protected void runTest() throws Throwable { try { super.runTest(); } catch (Throwable t) { - throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); + throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -104,7 +108,11 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates fViewer.setInput(model.getRootElement()); // Wait for the updates to complete. - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); @@ -121,7 +129,11 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); @@ -183,27 +195,31 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates TestModelWithCapturedUpdates model = new TestModelWithCapturedUpdates(); model.fCaptureLabelUpdates = true; - model.setRoot( new TestElement(model, "root", new TestElement[] { - new TestElement(model, "1", new TestElement[0]), - new TestElement(model, "2", new TestElement[0]), + model.setRoot(new TestElement(model, "root", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2", new TestElement[0]), //$NON-NLS-1$ }) ); // Set input into the view to update it, but block children updates. // Wait for view to start retrieving content. fViewer.setInput(model.getRootElement()); while (model.fCapturedUpdates.size() < model.getRootElement().fChildren.length) { - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } } List firstUpdates = model.fCapturedUpdates; model.fCapturedUpdates = new ArrayList(2); // // Change the model and run another update set. - model.getElement(model.findElement("1")).setLabelAppendix(" - changed"); - model.getElement(model.findElement("2")).setLabelAppendix(" - changed"); + model.getElement(model.findElement("1")).setLabelAppendix(" - changed"); //$NON-NLS-1$ //$NON-NLS-2$ + model.getElement(model.findElement("2")).setLabelAppendix(" - changed"); //$NON-NLS-1$ //$NON-NLS-2$ fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, false, false); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); while (model.fCapturedUpdates.size() < model.getRootElement().fChildren.length) { - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } } // Complete the second set of children updates @@ -218,7 +234,11 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates capturedUpdate.done(); } - while (!fListener.isFinished(CHILDREN_UPDATES)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CHILDREN_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Check viewer data model.validateData(fViewer, TreePath.EMPTY); @@ -236,29 +256,33 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates TestModelWithCapturedUpdates model = new TestModelWithCapturedUpdates(); model.fCaptureLabelUpdates = true; - model.setRoot( new TestElement(model, "root", new TestElement[] { - new TestElement(model, "1", new TestElement[0]), - new TestElement(model, "2", new TestElement[0]), + model.setRoot(new TestElement(model, "root", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2", new TestElement[0]), //$NON-NLS-1$ }) ); // Set input into the view to update it, but block children updates. // Wait for view to start retrieving content. fViewer.setInput(model.getRootElement()); while (model.fCapturedUpdates.size() < model.getRootElement().fChildren.length) { - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } } List firstUpdates = model.fCapturedUpdates; model.fCapturedUpdates = new ArrayList(2); // Change the model and run another update set. - model.setElementChildren(TreePath.EMPTY, new TestElement[] { - new TestElement(model, "1-new", new TestElement[0]), - new TestElement(model, "2-new", new TestElement[0]), + model.setElementChildren(TreePath.EMPTY, new TestElement[] { + new TestElement(model, "1-new", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2-new", new TestElement[0]), //$NON-NLS-1$ }); fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, false, false); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); while (model.fCapturedUpdates.size() < model.getRootElement().fChildren.length) { - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } } // Complete the second set of children updates @@ -273,7 +297,11 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates capturedUpdate.done(); } - while (!fListener.isFinished(CHILDREN_UPDATES)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CHILDREN_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Check viewer data model.validateData(fViewer, TreePath.EMPTY); @@ -292,29 +320,33 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates TestModelWithCapturedUpdates model = new TestModelWithCapturedUpdates(); model.fCaptureChildrenUpdates = true; - model.setRoot( new TestElement(model, "root", new TestElement[] { - new TestElement(model, "1", new TestElement[0]), - new TestElement(model, "2", new TestElement[0]), + model.setRoot(new TestElement(model, "root", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2", new TestElement[0]), //$NON-NLS-1$ }) ); // Set input into the view to update it, but block children updates. // Wait for view to start retrieving content. fViewer.setInput(model.getRootElement()); while (!areCapturedChildrenUpdatesComplete(model.fCapturedUpdates, model.getRootElement().fChildren.length)) { - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } } IChildrenUpdate[] firstUpdates = (IChildrenUpdate[])model.fCapturedUpdates.toArray(new IChildrenUpdate[0]); model.fCapturedUpdates.clear(); // Change the model and run another update set. model.setElementChildren(TreePath.EMPTY, new TestElement[] { - new TestElement(model, "1-new", new TestElement[0]), - new TestElement(model, "2-new", new TestElement[0]), + new TestElement(model, "1-new", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2-new", new TestElement[0]), //$NON-NLS-1$ }); fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, false, false); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); while (!areCapturedChildrenUpdatesComplete(model.fCapturedUpdates, model.getRootElement().fChildren.length)) { - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } } // Complete the second set of children updates @@ -327,7 +359,11 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates firstUpdates[i].done(); } - while (!fListener.isFinished(CHILDREN_UPDATES)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CHILDREN_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Check viewer data model.validateData(fViewer, TreePath.EMPTY); diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java index 86b86ab44..93fac0a2c 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/DeltaTests.java @@ -72,14 +72,18 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } protected void runTest() throws Throwable { try { super.runTest(); } catch (Throwable t) { - throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); + throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -94,18 +98,25 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Update the model TestElement element = model.getRootElement().getChildren()[0]; TreePath elementPath = new TreePath(new Object[] { element }); - ModelDelta delta = model.appendElementLabel(elementPath, "-modified"); + ModelDelta delta = model.appendElementLabel(elementPath, "-modified"); //$NON-NLS-1$ fListener.reset(elementPath, element, -1, true, false); model.postDelta(delta); - while (!fListener.isFinished(LABEL_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(LABEL_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -120,22 +131,30 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Update the model TestElement element = model.getRootElement().getChildren()[0]; TreePath elementPath = new TreePath(new Object[] { element }); TestElement[] newChildren = new TestElement[] { - new TestElement(model, "1.1 - new", new TestElement[0]), - new TestElement(model, "1.2 - new", new TestElement[0]), - new TestElement(model, "1.3 - new", new TestElement[0]), + new TestElement(model, "1.1 - new", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "1.2 - new", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "1.3 - new", new TestElement[0]), //$NON-NLS-1$ }; ModelDelta delta = model.setElementChildren(elementPath, newChildren); fListener.reset(elementPath, element, -1, true, false); model.postDelta(delta); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -150,32 +169,36 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); - String prefix = "new - "; + String prefix = "new - "; //$NON-NLS-1$ model.setElementChildren(TreePath.EMPTY, new TestElement[] { - new TestElement(model, prefix + "1", new TestElement[0]), - new TestElement(model, prefix + "2", true, false, new TestElement[] { - new TestElement(model, prefix + "2.1", true, true, new TestElement[0]), - new TestElement(model, prefix + "2.2", false, true, new TestElement[0]), - new TestElement(model, prefix + "2.3", true, false, new TestElement[0]), + new TestElement(model, prefix + "1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, prefix + "2", true, false, new TestElement[] { //$NON-NLS-1$ + new TestElement(model, prefix + "2.1", true, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, prefix + "2.2", false, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, prefix + "2.3", true, false, new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, prefix + "3", new TestElement[] { - new TestElement(model, prefix + "3.1", new TestElement[] { - new TestElement(model, prefix + "3.1.1", new TestElement[0]), - new TestElement(model, prefix + "3.1.2", new TestElement[0]), - new TestElement(model, prefix + "3.1.3", new TestElement[0]), + new TestElement(model, prefix + "3", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, prefix + "3.1", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, prefix + "3.1.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, prefix + "3.1.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, prefix + "3.1.3", new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, prefix + "3.2", new TestElement[] { - new TestElement(model, prefix + "3.2.1", new TestElement[0]), - new TestElement(model, prefix + "3.2.2", new TestElement[0]), - new TestElement(model, prefix + "3.2.3", new TestElement[0]), + new TestElement(model, prefix + "3.2", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, prefix + "3.2.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, prefix + "3.2.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, prefix + "3.2.3", new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, prefix + "3.3", new TestElement[] { - new TestElement(model, prefix + "3.3.1", new TestElement[0]), - new TestElement(model, prefix + "3.3.2", new TestElement[0]), - new TestElement(model, prefix + "3.3.3", new TestElement[0]), + new TestElement(model, prefix + "3.3", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, prefix + "3.3.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, prefix + "3.3.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, prefix + "3.3.3", new TestElement[0]), //$NON-NLS-1$ }), }) }); @@ -184,8 +207,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi fListener.reset(TreePath.EMPTY, element, -1, false, false); model.postDelta(new ModelDelta(element, IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -198,7 +224,7 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi for (int i = 0; i < rootChildren.length; i++) { model.setElementChildren( new TreePath(new Object[] { rootChildren[i]} ), - new TestElement[] { new TestElement(model, i + ".1", new TestElement[0]) }); + new TestElement[] { new TestElement(model, i + ".1", new TestElement[0]) }); //$NON-NLS-1$ } fViewer.setAutoExpandLevel(-1); @@ -208,13 +234,20 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, false, false); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); assertTrue( fListener.checkCoalesced(TreePath.EMPTY, 0, 6) ); @@ -233,11 +266,15 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Update the model - TestElement element = new TestElement(model, "7", new TestElement[0]); + TestElement element = new TestElement(model, "7", new TestElement[0]); //$NON-NLS-1$ TreePath elementPath = new TreePath(new Object[] { element }); ModelDelta delta = model.insertElementChild(TreePath.EMPTY, 6, element); @@ -251,8 +288,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // TODO: redundant label updates on insert! fListener.setFailOnRedundantUpdates(false); model.postDelta(delta); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -272,15 +312,18 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Update the model // Insert two new elements at once - TestElement element0 = new TestElement(model, "00", new TestElement[] {}); - TestElement element1 = new TestElement(model, "01", new TestElement[] {}); + TestElement element0 = new TestElement(model, "00", new TestElement[] {}); //$NON-NLS-1$ + TestElement element1 = new TestElement(model, "01", new TestElement[] {}); //$NON-NLS-1$ TreePath elementPath0 = new TreePath(new Object[] { element0 }); TreePath elementPath1 = new TreePath(new Object[] { element1 }); ModelDelta rootDelta = model.insertElementChild(TreePath.EMPTY, 0, element0); @@ -300,8 +343,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi fListener.setFailOnRedundantUpdates(false); model.postDelta(rootDelta); - while (!fListener.isFinished()) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -318,8 +364,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, true, false); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); @@ -328,7 +377,7 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi IModelDelta removeDelta = model.removeElementChild(TreePath.EMPTY, 3).getChildDeltas()[0]; // Insert new elements at once - TestElement element = new TestElement(model, "00", new TestElement[] {}); + TestElement element = new TestElement(model, "00", new TestElement[] {}); //$NON-NLS-1$ TreePath elementPath = new TreePath(new Object[] { element }); IModelDelta insertDelta = model.insertElementChild(TreePath.EMPTY, 1, element).getChildDeltas()[0]; @@ -346,8 +395,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi fListener.setFailOnRedundantUpdates(false); model.postDelta(combinedDelta); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -364,11 +416,15 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Update the model - TestElement element = new TestElement(model, "7", new TestElement[0]); + TestElement element = new TestElement(model, "7", new TestElement[0]); //$NON-NLS-1$ TreePath elementPath = new TreePath(new Object[] { element }); ModelDelta delta = model.addElementChild(TreePath.EMPTY, null, 6, element); @@ -378,8 +434,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // TODO: redundant updates on add! fListener.setFailOnRedundantUpdates(false); model.postDelta(delta); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -397,40 +456,53 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Update the model - TreePath parentPath = model.findElement("1"); - ModelDelta rootDelta = model.addElementChild(parentPath, null, 0, new TestElement(model, "1.1", new TestElement[0])); - model.addElementChild(parentPath, rootDelta, 1, new TestElement(model, "1.2", new TestElement[0])); - model.addElementChild(parentPath, rootDelta, 2, new TestElement(model, "1.3", new TestElement[0])); - model.addElementChild(parentPath, rootDelta, 3, new TestElement(model, "1.4", new TestElement[0])); + TreePath parentPath = model.findElement("1"); //$NON-NLS-1$ + ModelDelta rootDelta = model.addElementChild(parentPath, null, 0, new TestElement(model, "1.1", new TestElement[0])); //$NON-NLS-1$ + model.addElementChild(parentPath, rootDelta, 1, new TestElement(model, "1.2", new TestElement[0])); //$NON-NLS-1$ + model.addElementChild(parentPath, rootDelta, 2, new TestElement(model, "1.3", new TestElement[0])); //$NON-NLS-1$ + model.addElementChild(parentPath, rootDelta, 3, new TestElement(model, "1.4", new TestElement[0])); //$NON-NLS-1$ // Add causes the update of parent child count and element's children. fListener.reset(); fListener.setFailOnRedundantUpdates(false); model.postDelta(rootDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_SEQUENCE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Update the elements that were added. fListener.reset(); fListener.addUpdates((IInternalTreeModelViewer)fViewer, TreePath.EMPTY, model.getRootElement(), -1, ALL_UPDATES_COMPLETE); rootDelta = new ModelDelta(model.getRootElement(), IModelDelta.CONTENT); - model.getElementDelta(rootDelta, model.findElement("1.1"), true).setFlags(IModelDelta.CONTENT); - model.getElementDelta(rootDelta, model.findElement("1.2"), true).setFlags(IModelDelta.CONTENT); - model.getElementDelta(rootDelta, model.findElement("1.3"), true).setFlags(IModelDelta.CONTENT); - model.getElementDelta(rootDelta, model.findElement("1.4"), true).setFlags(IModelDelta.CONTENT); + model.getElementDelta(rootDelta, model.findElement("1.1"), true).setFlags(IModelDelta.CONTENT); //$NON-NLS-1$ + model.getElementDelta(rootDelta, model.findElement("1.2"), true).setFlags(IModelDelta.CONTENT); //$NON-NLS-1$ + model.getElementDelta(rootDelta, model.findElement("1.3"), true).setFlags(IModelDelta.CONTENT); //$NON-NLS-1$ + model.getElementDelta(rootDelta, model.findElement("1.4"), true).setFlags(IModelDelta.CONTENT); //$NON-NLS-1$ model.postDelta(rootDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | ALL_UPDATES_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } fListener.reset(parentPath, model.getElement(parentPath), 1, false, true); ((IInternalTreeModelViewer)fViewer).expandToLevel(parentPath, 1); - while (fListener.isFinished(CONTENT_SEQUENCE_STARTED) && !fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (fListener.isFinished(CONTENT_SEQUENCE_STARTED) && !fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, parentPath); } @@ -448,15 +520,22 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Expand elment "2" - TreePath parentPath = model.findElement("2"); + TreePath parentPath = model.findElement("2"); //$NON-NLS-1$ fListener.reset(parentPath, model.getElement(parentPath), 1, false, true); ((IInternalTreeModelViewer)fViewer).expandToLevel(parentPath, 1); - while (fListener.isFinished(CONTENT_SEQUENCE_STARTED) && !fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (fListener.isFinished(CONTENT_SEQUENCE_STARTED) && !fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Collapse back element "2" ((IInternalTreeModelViewer)fViewer).setExpandedState(parentPath, false); @@ -465,20 +544,26 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi fListener.reset(); fListener.addUpdates((IInternalTreeModelViewer)fViewer, TreePath.EMPTY, model.getRootElement(), -1, ALL_UPDATES_COMPLETE); ModelDelta rootDelta = new ModelDelta(model.getRootElement(), IModelDelta.CONTENT); - model.getElementDelta(rootDelta, model.findElement("2.1"), true).setFlags(IModelDelta.CONTENT); - model.getElementDelta(rootDelta, model.findElement("2.2"), true).setFlags(IModelDelta.CONTENT); - model.getElementDelta(rootDelta, model.findElement("2.3"), true).setFlags(IModelDelta.CONTENT); + model.getElementDelta(rootDelta, model.findElement("2.1"), true).setFlags(IModelDelta.CONTENT); //$NON-NLS-1$ + model.getElementDelta(rootDelta, model.findElement("2.2"), true).setFlags(IModelDelta.CONTENT); //$NON-NLS-1$ + model.getElementDelta(rootDelta, model.findElement("2.3"), true).setFlags(IModelDelta.CONTENT); //$NON-NLS-1$ model.postDelta(rootDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | ALL_UPDATES_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Expand back element "2" fListener.reset(parentPath, model.getElement(parentPath), 1, false, true); ((IInternalTreeModelViewer)fViewer).expandToLevel(parentPath, 1); - while (fListener.isFinished(CONTENT_SEQUENCE_STARTED) && !fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (fListener.isFinished(CONTENT_SEQUENCE_STARTED) && !fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, parentPath, true); } @@ -495,7 +580,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Update the model @@ -505,8 +594,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // be processed. fListener.reset(); model.postDelta(delta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -518,7 +610,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Create the delta @@ -571,8 +667,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi assertFalse(contentProviderViewer.getExpandedState(path_root_3_2_2)); model.postDelta(deltaRoot); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Validate the expansion state AFTER posting the delta. @@ -586,7 +685,7 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi List selectionPathsList = Arrays.asList( ((ITreeSelection)selection).getPaths() ); assertTrue(selectionPathsList.contains(path_root_3_2_2)); } else { - fail("Not a tree selection"); + fail("Not a tree selection"); //$NON-NLS-1$ } } @@ -601,7 +700,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Create the delta @@ -630,7 +733,9 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi break; } } - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } } model.validateData(fViewer, TreePath.EMPTY, true); @@ -643,7 +748,7 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi List selectionPathsList = Arrays.asList( ((ITreeSelection)selection).getPaths() ); assertTrue(selectionPathsList.contains(path_root_3)); } else { - fail("Not a tree selection"); + fail("Not a tree selection"); //$NON-NLS-1$ } } @@ -659,24 +764,32 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Update the model - TreePath m4_2_1Path = model.findElement("m4.2.1"); + TreePath m4_2_1Path = model.findElement("m4.2.1"); //$NON-NLS-1$ TestElement m4_2_1 = model.getElement(m4_2_1Path); TestModel m4 = m4_2_1.getModel(); TestElement[] newChildren = new TestElement[] { - new TestElement(m4, "4.2.1.new-1", new TestElement[0]), - new TestElement(m4, "4.2.1.new-2", new TestElement[0]), - new TestElement(m4, "4.2.1.new-3", new TestElement[0]), + new TestElement(m4, "4.2.1.new-1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(m4, "4.2.1.new-2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(m4, "4.2.1.new-3", new TestElement[0]), //$NON-NLS-1$ }; ModelDelta delta = m4.setElementChildren(m4_2_1Path, newChildren); fListener.reset(m4_2_1Path, m4_2_1, -1, true, false); model.postDelta(delta); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -690,13 +803,17 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); - TreePath m3_1Path = model.findElement("m3.1"); + TreePath m3_1Path = model.findElement("m3.1"); //$NON-NLS-1$ TestElement m3_1 = model.getElement(m3_1Path); TestModel m3 = m3_1.getModel(); - TestElement m3_1_new = new TestElement(m3, "m3.1-new", new TestElement[0]); + TestElement m3_1_new = new TestElement(m3, "m3.1-new", new TestElement[0]); //$NON-NLS-1$ TreePath m3_1_newPath = m3_1Path.createChildPath(m3_1_new); ModelDelta delta = m3.addElementChild(m3_1Path, null, 0, m3_1_new); @@ -705,8 +822,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi fListener.setFailOnRedundantUpdates(false); m3.postDelta(delta); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -718,12 +838,16 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Update the model: remove one child of an un-expanded element, then // make sure that the number of children is correct. - TreePath parentPath = model.findElement("2"); + TreePath parentPath = model.findElement("2"); //$NON-NLS-1$ TestElement parentElement = model.getElement(parentPath); ModelDelta delta = model.removeElementChild(parentPath, 0); @@ -731,8 +855,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi fListener.reset(parentPath, parentElement, 0, false, false); //fListener.addChildreCountUpdate(parentPath); model.postDelta(delta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate the viewer data. model.validateData(fViewer, TreePath.EMPTY, true); @@ -744,8 +871,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Update the viewer fListener.reset(parentPath, parentElement, 0, false, false); model.postDelta(delta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate the viewer data. model.validateData(fViewer, TreePath.EMPTY, true); @@ -757,8 +887,11 @@ abstract public class DeltaTests extends TestCase implements ITestModelUpdatesLi // Update the viewer fListener.reset(parentPath, parentElement, 0, false, false); model.postDelta(delta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate the viewer data. model.validateData(fViewer, TreePath.EMPTY, true); diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/FilterTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/FilterTests.java index 7c6d8d45a..52308e2d1 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/FilterTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/FilterTests.java @@ -76,14 +76,18 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } protected void runTest() throws Throwable { try { super.runTest(); } catch (Throwable t) { - throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); + throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -138,32 +142,32 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL public void testSimpleSingleLevel() throws InterruptedException { TestModel model = TestModel.simpleSingleLevel(); - doTestSimpleLevel(model, new ViewerFilter[] { new TestViewerFilter("2") }); + doTestSimpleLevel(model, new ViewerFilter[] { new TestViewerFilter("2") }); //$NON-NLS-1$ } public void testSimpleSingleLevelWithTMVFilter() throws InterruptedException { TestModel model = TestModel.simpleSingleLevel(); - doTestSimpleLevel(model, new ViewerFilter[] { new TestTMVFilter("2", model.getRootElement()) }); + doTestSimpleLevel(model, new ViewerFilter[] { new TestTMVFilter("2", model.getRootElement()) }); //$NON-NLS-1$ } public void testSimpleSingleLevelWithMixedFilters() throws InterruptedException { TestModel model = TestModel.simpleSingleLevel(); - doTestSimpleLevel(model, new ViewerFilter[] { new TestTMVFilter("2", model.getRootElement()), new TestViewerFilter("1") }); + doTestSimpleLevel(model, new ViewerFilter[] { new TestTMVFilter("2", model.getRootElement()), new TestViewerFilter("1") }); //$NON-NLS-1$ //$NON-NLS-2$ } public void testSimpleMultiLevel() throws InterruptedException { TestModel model = TestModel.simpleMultiLevel(); - doTestSimpleLevel(model, new ViewerFilter[] { new TestViewerFilter(".1"), new TestViewerFilter(".2") }); + doTestSimpleLevel(model, new ViewerFilter[] { new TestViewerFilter(".1"), new TestViewerFilter(".2") }); //$NON-NLS-1$ //$NON-NLS-2$ } public void testSimpleMultiLevelWithTMVFilter() throws InterruptedException { TestModel model = TestModel.simpleMultiLevel(); - doTestSimpleLevel(model, new ViewerFilter[] { new TestTMVFilter(".1", null), new TestTMVFilter(".2", null) }); + doTestSimpleLevel(model, new ViewerFilter[] { new TestTMVFilter(".1", null), new TestTMVFilter(".2", null) }); //$NON-NLS-1$ //$NON-NLS-2$ } public void testSimpleMultiLevelWithMixedFilters() throws InterruptedException { TestModel model = TestModel.simpleMultiLevel(); - doTestSimpleLevel(model, new ViewerFilter[] { new TestViewerFilter(".1"), new TestTMVFilter(".2", null) }); + doTestSimpleLevel(model, new ViewerFilter[] { new TestViewerFilter(".1"), new TestTMVFilter(".2", null) }); //$NON-NLS-1$ //$NON-NLS-2$ } private void doTestSimpleLevel(TestModel model, ViewerFilter[] filters) throws InterruptedException { @@ -181,23 +185,27 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL fViewer.setInput(model.getRootElement()); // Wait for the updates to complete. - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, false, filters); } public void testLargeSingleLevel() throws InterruptedException { - doTestLargeSingleLevel(new ViewerFilter[] { new TestViewerFilter("2") }); + doTestLargeSingleLevel(new ViewerFilter[] { new TestViewerFilter("2") }); //$NON-NLS-1$ } public void testLargeSingleLevelWithTMVFilter() throws InterruptedException { - doTestLargeSingleLevel(new ViewerFilter[] { new TestTMVFilter("2", null) }); + doTestLargeSingleLevel(new ViewerFilter[] { new TestTMVFilter("2", null) }); //$NON-NLS-1$ } private void doTestLargeSingleLevel(ViewerFilter[] filters) throws InterruptedException { TestModel model = new TestModel(); - model.setRoot( new TestElement(model, "root", new TestElement[0] ) ); - model.setElementChildren(TreePath.EMPTY, TestModel.makeSingleLevelModelElements(model, 3000, "model.")); + model.setRoot(new TestElement(model, "root", new TestElement[0])); //$NON-NLS-1$ + model.setElementChildren(TreePath.EMPTY, TestModel.makeSingleLevelModelElements(model, 3000, "model.")); //$NON-NLS-1$ // Set filters fViewer.setFilters(filters); @@ -208,7 +216,11 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } @@ -217,7 +229,7 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL * Fire REPLACE delta. */ public void testReplacedUnrealizedFilteredElement() throws InterruptedException { - doTestReplacedUnrealizedFilteredElement(new ViewerFilter[] { new TestViewerFilter("2") }); + doTestReplacedUnrealizedFilteredElement(new ViewerFilter[] { new TestViewerFilter("2") }); //$NON-NLS-1$ } @@ -226,15 +238,15 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL * Fire REPLACE delta. */ public void testReplacedUnrealizedFilteredElementWithTMVFilter() throws InterruptedException { - doTestReplacedUnrealizedFilteredElement(new ViewerFilter[] { new TestTMVFilter("2", null) }); + doTestReplacedUnrealizedFilteredElement(new ViewerFilter[] { new TestTMVFilter("2", null) }); //$NON-NLS-1$ } private void doTestReplacedUnrealizedFilteredElement(ViewerFilter[] filters) throws InterruptedException { // Populate a view with a large model (only first 100 elements will be visible in virtual viewer). TestModel model = new TestModel(); - model.setRoot( new TestElement(model, "root", new TestElement[0] ) ); - model.setElementChildren(TreePath.EMPTY, TestModel.makeSingleLevelModelElements(model, 300, "model.")); + model.setRoot(new TestElement(model, "root", new TestElement[0])); //$NON-NLS-1$ + model.setElementChildren(TreePath.EMPTY, TestModel.makeSingleLevelModelElements(model, 300, "model.")); //$NON-NLS-1$ fViewer.setFilters(filters); @@ -244,20 +256,32 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL // Populate the view (all elements containing a "2" will be filtered out. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Switch out element "201" which is filtered out, with a "replaced element" which should NOT be // filtered out. - TestElement replacedElement = new TestElement(model, "replaced element", new TestElement[0]); + TestElement replacedElement = new TestElement(model, "replaced element", new TestElement[0]); //$NON-NLS-1$ IModelDelta replaceDelta = model.replaceElementChild(TreePath.EMPTY, 200, replacedElement); fListener.reset(); model.postDelta(replaceDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Reposition the viewer to make element 100 the top element, making the replaced element visible. fListener.reset(); ((IInternalTreeModelViewer) fViewer).reveal(TreePath.EMPTY, 150); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Verify that the replaced element is in viewer now (i.e. it's not filtered out. TreePath[] replacedElementPaths = fViewer.getElementPaths(replacedElement); @@ -266,11 +290,11 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL public void testRefreshUnrealizedFilteredElement() throws InterruptedException { - doTestRefreshUnrealizedFilteredElement(new ViewerFilter[] { new TestViewerFilter("2") }); + doTestRefreshUnrealizedFilteredElement(new ViewerFilter[] { new TestViewerFilter("2") }); //$NON-NLS-1$ } public void testRefreshUnrealizedFilteredElementWithTMVFilter() throws InterruptedException { - doTestRefreshUnrealizedFilteredElement(new ViewerFilter[] { new TestTMVFilter("2", null) }); + doTestRefreshUnrealizedFilteredElement(new ViewerFilter[] { new TestTMVFilter("2", null) }); //$NON-NLS-1$ } /** @@ -280,8 +304,8 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL private void doTestRefreshUnrealizedFilteredElement(ViewerFilter[] filters) throws InterruptedException { // Populate a view with a large model (only first 100 elements will be visible in virtual viewer). TestModel model = new TestModel(); - model.setRoot( new TestElement(model, "root", new TestElement[0] ) ); - model.setElementChildren(TreePath.EMPTY, TestModel.makeSingleLevelModelElements(model, 300, "model.")); + model.setRoot(new TestElement(model, "root", new TestElement[0])); //$NON-NLS-1$ + model.setElementChildren(TreePath.EMPTY, TestModel.makeSingleLevelModelElements(model, 300, "model.")); //$NON-NLS-1$ fViewer.setFilters(filters); @@ -291,20 +315,32 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL // Populate the view (all elements containing a "2" will be filtered out. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Switch out element "201" which is filtered out, with a "replaced element" which should NOT be // filtered out. - TestElement replacedElement = new TestElement(model, "replaced element", new TestElement[0]); + TestElement replacedElement = new TestElement(model, "replaced element", new TestElement[0]); //$NON-NLS-1$ model.replaceElementChild(TreePath.EMPTY, 200, replacedElement); fListener.reset(); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Reposition the viewer to make element 100 the top element, making the replaced element visible. fListener.reset(); ((IInternalTreeModelViewer) fViewer).reveal(TreePath.EMPTY, 150); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Verify that the replaced element is in viewer now (i.e. it's not filtered out. TreePath[] replacedElementPaths = fViewer.getElementPaths(replacedElement); @@ -312,15 +348,15 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL } public void testRefreshToUnfilterElements() throws InterruptedException { - doTestRefreshToUnfilterElements(new ViewerFilter[] { new TestViewerFilter(".1"), new TestViewerFilter(".2") }); + doTestRefreshToUnfilterElements(new ViewerFilter[] { new TestViewerFilter(".1"), new TestViewerFilter(".2") }); //$NON-NLS-1$ //$NON-NLS-2$ } public void testRefreshToUnfilterElementsWithTMVFilter() throws InterruptedException { - doTestRefreshToUnfilterElements(new ViewerFilter[] { new TestTMVFilter(".1", null), new TestTMVFilter(".2", null) }); + doTestRefreshToUnfilterElements(new ViewerFilter[] { new TestTMVFilter(".1", null), new TestTMVFilter(".2", null) }); //$NON-NLS-1$ //$NON-NLS-2$ } public void testRefreshToUnfilterElementsWithMixedFilters() throws InterruptedException { - doTestRefreshToUnfilterElements(new ViewerFilter[] { new TestViewerFilter(".1"), new TestTMVFilter(".2", null) }); + doTestRefreshToUnfilterElements(new ViewerFilter[] { new TestViewerFilter(".1"), new TestTMVFilter(".2", null) }); //$NON-NLS-1$ //$NON-NLS-2$ } /** @@ -342,14 +378,22 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL // Populate the view (all elements containing a "2" will be filtered out. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Turn off filters and refresh. filters = new ViewerFilter[0]; fViewer.setFilters(filters); fListener.reset(); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, false, filters); } @@ -365,7 +409,11 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); StateTests.expandAlternateElements(fListener, model, true); @@ -373,12 +421,12 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL // Set a selection in view // Set a selection in view TreeSelection originalSelection = new TreeSelection( - new TreePath[] { model.findElement("5"), model.findElement("5.1"), model.findElement("6") }); +new TreePath[] { model.findElement("5"), model.findElement("5.1"), model.findElement("6") }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ fViewer.setSelection(originalSelection); assertTrue( StateTests.areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); // Set a filter to remove element "1" - ViewerFilter[] filters = new ViewerFilter[] { new TestViewerFilter("^1$") }; + ViewerFilter[] filters = new ViewerFilter[] { new TestViewerFilter("^1$") }; //$NON-NLS-1$ fViewer.setFilters(filters); // Note: Re-expanding nodes causes redundant updates. @@ -387,18 +435,21 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL // Post the refresh delta model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data model.validateData(fViewer, TreePath.EMPTY, true, filters); - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); //$NON-NLS-1$ assertTrue( StateTests.areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); // Note: in past it was observed sub-optimal coalescing in this test due @@ -413,18 +464,21 @@ abstract public class FilterTests extends TestCase implements ITestModelUpdatesL fListener.reset(); fListener.addUpdates(getInternalViewer(), TreePath.EMPTY, model.getRootElement(), filters, -1, ALL_UPDATES_COMPLETE); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data model.validateData(fViewer, TreePath.EMPTY, true, filters); - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); //$NON-NLS-1$ assertTrue( StateTests.areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/FilterTransformTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/FilterTransformTests.java index b18ff6f50..afe51e13c 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/FilterTransformTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/FilterTransformTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -77,61 +77,61 @@ public class FilterTransformTests extends TestCase { } public void testRemoveMiddleElementFromFilters() { - assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 3)); + assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 3)); //$NON-NLS-1$ transform.removeElementFromFilters(TreePath.EMPTY, element3); - assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 3)); - assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[]{0, 2, 5, 6})); + assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 3)); //$NON-NLS-1$ + assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[] { 0, 2, 5, 6 })); //$NON-NLS-1$ } public void testRemoveFirstElementFromFilters() { - assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 0)); + assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 0)); //$NON-NLS-1$ transform.removeElementFromFilters(TreePath.EMPTY, element0); - assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 0)); - assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[]{1, 2, 5, 6})); + assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 0)); //$NON-NLS-1$ + assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[] { 1, 2, 5, 6 })); //$NON-NLS-1$ } public void testRemoveLastFromFilters() { - assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 7)); + assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 7)); //$NON-NLS-1$ transform.removeElementFromFilters(TreePath.EMPTY, element7); - assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 7)); - assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[]{0, 2, 3, 6})); + assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 7)); //$NON-NLS-1$ + assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[] { 0, 2, 3, 6 })); //$NON-NLS-1$ } public void testClearMiddleElementFromFilters() { - assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 3)); + assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 3)); //$NON-NLS-1$ transform.clear(TreePath.EMPTY, 3); - assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 3)); - assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[]{0, 2, 6, 7})); + assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 3)); //$NON-NLS-1$ + assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[] { 0, 2, 6, 7 })); //$NON-NLS-1$ } public void testClearFirstElementFromFilters() { - assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 0)); + assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 0)); //$NON-NLS-1$ transform.clear(TreePath.EMPTY, 0); - assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 0)); - assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[]{2, 3, 6, 7})); + assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 0)); //$NON-NLS-1$ + assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[] { 2, 3, 6, 7 })); //$NON-NLS-1$ } public void testClearLastFromFilters() { - assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 7)); + assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 7)); //$NON-NLS-1$ transform.clear(TreePath.EMPTY, 7); - assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 7)); - assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[]{0, 2, 3, 6})); + assertFalse("Element should be unfiltered", transform.isFiltered(TreePath.EMPTY, 7)); //$NON-NLS-1$ + assertTrue("Wrong filter state", equals(transform.getFilteredChildren(TreePath.EMPTY), new int[] { 0, 2, 3, 6 })); //$NON-NLS-1$ } public void testViewToModelCount() { - assertEquals("Wrong model count", 8, transform.viewToModelCount(TreePath.EMPTY, 3)); + assertEquals("Wrong model count", 8, transform.viewToModelCount(TreePath.EMPTY, 3)); //$NON-NLS-1$ } public void testViewToModelIndex() { - assertEquals("Wrong model index", 1, transform.viewToModelIndex(TreePath.EMPTY, 0)); - assertEquals("Wrong model index", 4, transform.viewToModelIndex(TreePath.EMPTY, 1)); - assertEquals("Wrong model index", 5, transform.viewToModelIndex(TreePath.EMPTY, 2)); + assertEquals("Wrong model index", 1, transform.viewToModelIndex(TreePath.EMPTY, 0)); //$NON-NLS-1$ + assertEquals("Wrong model index", 4, transform.viewToModelIndex(TreePath.EMPTY, 1)); //$NON-NLS-1$ + assertEquals("Wrong model index", 5, transform.viewToModelIndex(TreePath.EMPTY, 2)); //$NON-NLS-1$ } public void testAddAlreadyFiltered() { - assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 0)); + assertTrue("Element should be filtered", transform.isFiltered(TreePath.EMPTY, 0)); //$NON-NLS-1$ boolean added = transform.addFilteredIndex(TreePath.EMPTY, 0, element0); - assertFalse("Filter should not be added - should already have been there", added); + assertFalse("Filter should not be added - should already have been there", added); //$NON-NLS-1$ } @@ -144,9 +144,9 @@ public class FilterTransformTests extends TestCase { try { transform.addFilteredIndex(TreePath.EMPTY, 3, new Object()); } catch (ArrayIndexOutOfBoundsException e) { - fail("AIOOBE Exception should not be thrown here, " + - "setModelChildCount should leave " + - "FilterTransform$Node in a consistent state"); + fail("AIOOBE Exception should not be thrown here, " + //$NON-NLS-1$ + "setModelChildCount should leave " + //$NON-NLS-1$ + "FilterTransform$Node in a consistent state"); //$NON-NLS-1$ } } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerCheckTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerCheckTests.java index 004fde021..b2f3db69a 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerCheckTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerCheckTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -27,6 +28,6 @@ public class JFaceViewerCheckTests extends CheckTests { } protected IInternalTreeModelViewer createViewer(Display display, Shell shell) { - return new TreeModelViewer(fShell, SWT.VIRTUAL | SWT.CHECK, new PresentationContext("TestViewer")); + return new TreeModelViewer(fShell, SWT.VIRTUAL | SWT.CHECK, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerContentTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerContentTests.java index 2cfae9e6e..68e860470 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerContentTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerContentTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -27,6 +28,6 @@ public class JFaceViewerContentTests extends ContentTests { } protected IInternalTreeModelViewer createViewer(Display display, Shell shell) { - return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); + return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerDeltaTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerDeltaTests.java index d43cc73d1..8853315a0 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerDeltaTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerDeltaTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -27,7 +28,7 @@ public class JFaceViewerDeltaTests extends DeltaTests { } protected IInternalTreeModelViewer createViewer(Display display, Shell shell) { - return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); + return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); //$NON-NLS-1$ } /** diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerFilterTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerFilterTests.java index 853d2e7c1..654d97b9f 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerFilterTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerFilterTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -27,6 +28,6 @@ public class JFaceViewerFilterTests extends FilterTests { } protected IInternalTreeModelViewer createViewer(Display display, Shell shell) { - return new TreeModelViewer(fShell, SWT.VIRTUAL | SWT.MULTI, new PresentationContext("TestViewer")); + return new TreeModelViewer(fShell, SWT.VIRTUAL | SWT.MULTI, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerLazyTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerLazyTests.java index d71000262..b511a32d3 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerLazyTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerLazyTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,6 +27,6 @@ public class JFaceViewerLazyTests extends LazyTests { } protected IInternalTreeModelViewer createViewer(Display display, Shell shell) { - return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); + return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPerformanceTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPerformanceTests.java index 6bd1e922f..e046751c9 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPerformanceTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPerformanceTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,7 +27,7 @@ public class JFaceViewerPerformanceTests extends PerformanceTests { } protected IInternalTreeModelViewer createViewer(Display display, Shell shell) { - return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); + return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); //$NON-NLS-1$ } protected int getTestModelDepth() { diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPopupTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPopupTests.java index 7e41bac5b..8c4b923a6 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPopupTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerPopupTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -27,6 +28,6 @@ public class JFaceViewerPopupTests extends PopupTests { } protected ITreeModelViewer createViewer(Display display, Shell shell, int style) { - return new TreeModelViewer(fShell, SWT.VIRTUAL | style, new PresentationContext("TestViewer")); + return new TreeModelViewer(fShell, SWT.VIRTUAL | style, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerSelectionTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerSelectionTests.java index 4a27de8b0..94009bb2c 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerSelectionTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerSelectionTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -27,6 +28,6 @@ public class JFaceViewerSelectionTests extends SelectionTests { } protected ITreeModelViewer createViewer(Display display, Shell shell) { - return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); + return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerStateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerStateTests.java index 801c75d8c..a20055571 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerStateTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerStateTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -27,6 +28,6 @@ public class JFaceViewerStateTests extends StateTests { } protected ITreeModelViewer createViewer(Display display, Shell shell) { - return new TreeModelViewer(fShell, SWT.VIRTUAL | SWT.MULTI, new PresentationContext("TestViewer")); + return new TreeModelViewer(fShell, SWT.VIRTUAL | SWT.MULTI, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java index f1c57adc3..b51a4247b 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerTopIndexTests.java @@ -69,14 +69,18 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } protected void runTest() throws Throwable { try { super.runTest(); } catch (Throwable t) { - throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); + throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -90,7 +94,7 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda * @return the new viewer */ protected TreeModelViewer createViewer(Display display, Shell shell) { - return new TreeModelViewer(fShell, SWT.VIRTUAL | SWT.MULTI, new PresentationContext("TestViewer")); + return new TreeModelViewer(fShell, SWT.VIRTUAL | SWT.MULTI, new PresentationContext("TestViewer")); //$NON-NLS-1$ } /** @@ -110,7 +114,7 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda new TestElement(model, text, new TestElement[0] ); } - model.setRoot(new TestElement(model, "root", elements)); + model.setRoot(new TestElement(model, "root", elements)); //$NON-NLS-1$ // Create the listener, only check the first level fListener.reset(TreePath.EMPTY, model.getRootElement(), 1, false, false); @@ -118,7 +122,11 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Stop forcing view updates. @@ -129,7 +137,7 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda getCTargetViewer().reveal(TreePath.EMPTY, indexRevealElem); while(fDisplay.readAndDispatch()) {} final TreePath originalTopPath = getCTargetViewer().getTopElementPath(); - assertNotNull("Top item should not be null!", originalTopPath); + assertNotNull("Top item should not be null!", originalTopPath); //$NON-NLS-1$ // Bug 116105: On a Mac the reveal call is not reliable. Use the viewer returned path instead. // assertEquals(elements[indexRevealElem], originalTopPath.getLastSegment()); @@ -142,18 +150,25 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda fListener.addStateUpdates(getCTargetViewer(), originalState, IModelDelta.EXPAND | IModelDelta.SELECT | IModelDelta.REVEAL); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Set the viewer input back to the model to trigger RESTORE operation. fListener.reset(false, false); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } while (fDisplay.readAndDispatch ()) {} // check if REVEAL was restored OK final TreePath topPath = getCTargetViewer().getTopElementPath(); - assertNotNull("Top item should not be null!", topPath); + assertNotNull("Top item should not be null!", topPath); //$NON-NLS-1$ TreePathWrapper.assertEqual(originalTopPath, topPath); } @@ -175,8 +190,8 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda if (i == 0) { elements[i] = new TestElement(model, text, new TestElement[] { - new TestElement(model, text + ".1", new TestElement[0] ), - new TestElement(model, text + ".2", new TestElement[0] ) + new TestElement(model, text + ".1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, text + ".2", new TestElement[0]) //$NON-NLS-1$ }); } else { // rest of elements don't have children @@ -185,7 +200,7 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda } } - model.setRoot(new TestElement(model, "root", elements)); + model.setRoot(new TestElement(model, "root", elements)); //$NON-NLS-1$ // Create the listener, only check the first level fListener.reset(TreePath.EMPTY, model.getRootElement(), 1, false, false); @@ -193,7 +208,11 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Expand first element @@ -211,8 +230,11 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda model.postDelta(rootDelta); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate that the first node is expanded assertTrue(getCTargetViewer().getExpandedState(firstElemPath) == true); @@ -224,7 +246,7 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda getCTargetViewer().reveal(TreePath.EMPTY, 1); while(fDisplay.readAndDispatch()) {} final TreePath originalTopPath = getCTargetViewer().getTopElementPath(); - assertNotNull("Top item should not be null!", originalTopPath); + assertNotNull("Top item should not be null!", originalTopPath); //$NON-NLS-1$ // Bug 116105: On a Mac the reveal call is not reliable. Use the viewer returned path instead. //assertEquals(elements[1], originalTopPath.getLastSegment()); @@ -236,17 +258,25 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda fListener.reset(true, false); fListener.addStateUpdates(getCTargetViewer(), originalState, IModelDelta.EXPAND | IModelDelta.SELECT | IModelDelta.REVEAL); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Set the viewer input back to the model fListener.reset(false, false); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } while (fDisplay.readAndDispatch ()) {} // check if REVEAL was restored OK final TreePath topPath = getCTargetViewer().getTopElementPath(); - assertNotNull("Top item should not be null!", topPath); + assertNotNull("Top item should not be null!", topPath); //$NON-NLS-1$ TreePathWrapper.assertEqual(originalTopPath, topPath); } @@ -268,8 +298,8 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda if (i == elements.length - 1) { elements[i] = new TestElement(model, text, new TestElement[] { - new TestElement(model, text + ".1", new TestElement[0] ), - new TestElement(model, text + ".2", new TestElement[0] ) + new TestElement(model, text + ".1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, text + ".2", new TestElement[0]) //$NON-NLS-1$ }); } else { // rest of elements don't have children @@ -280,7 +310,7 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda } fViewer.setAutoExpandLevel(-1); - model.setRoot(new TestElement(model, "root", elements)); + model.setRoot(new TestElement(model, "root", elements)); //$NON-NLS-1$ // Create the listener, only check the first level fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, false, false); @@ -288,7 +318,11 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); int indexLastElem = elements.length-1; @@ -306,7 +340,7 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda getCTargetViewer().reveal(TreePath.EMPTY, indexLastElem-1); while(fDisplay.readAndDispatch()) {} final TreePath originalTopPath = getCTargetViewer().getTopElementPath(); - assertNotNull("Top item should not be null!", originalTopPath); + assertNotNull("Top item should not be null!", originalTopPath); //$NON-NLS-1$ // Extract the original state from viewer ModelDelta originalState = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); @@ -317,18 +351,25 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda fListener.addStateUpdates(getCTargetViewer(), originalState, IModelDelta.EXPAND | IModelDelta.SELECT | IModelDelta.REVEAL); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Set the viewer input back to the model. fListener.reset(false, false); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } while (fDisplay.readAndDispatch ()) {} // check if REVEAL was restored OK final TreePath topPath = getCTargetViewer().getTopElementPath(); - assertNotNull("Top item should not be null!", topPath); + assertNotNull("Top item should not be null!", topPath); //$NON-NLS-1$ TreePathWrapper.assertEqual(originalTopPath, topPath); } @@ -349,7 +390,11 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Stop autopopulating the view. @@ -362,35 +407,48 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda // Trigger save of state. fListener.reset(); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE)) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE)) { + Thread.sleep(0); + } // Set input back to root element. // Note: Wait only for the processing of the delta and the start of state restore, not for all updates fListener.reset(); - TreePath elementPath = model.findElement("3"); + TreePath elementPath = model.findElement("3"); //$NON-NLS-1$ fListener.addUpdates(fViewer, elementPath, model.getElement(elementPath), 1, STATE_UPDATES); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | STATE_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | STATE_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Update the viewer with new selection delta to something new in the view - ModelDelta revealDelta = model.makeElementDelta(model.findElement("2.1"), IModelDelta.REVEAL); + ModelDelta revealDelta = model.makeElementDelta(model.findElement("2.1"), IModelDelta.REVEAL); //$NON-NLS-1$ // Wait for the second model delta to process fListener.reset(); model.postDelta(revealDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_SEQUENCE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Clear view then reset it again. fListener.reset(); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE)) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE)) { + Thread.sleep(0); + } autopopulateAgent = new TreeModelViewerAutopopulateAgent(fViewer); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } autopopulateAgent.dispose(); } @@ -415,7 +473,11 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Stop auto-populating and auto-expanding the view. @@ -429,21 +491,26 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda // Trigger save of state. fListener.reset(); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE)) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE)) { + Thread.sleep(0); + } // Set input back to root element. // Note: Wait only for the processing of the delta and the start of state restore, not for all updates fListener.reset(); - TreePath elementPath = model.findElement("2"); + TreePath elementPath = model.findElement("2"); //$NON-NLS-1$ fListener.addUpdates(fViewer, elementPath, model.getElement(elementPath), 1, STATE_UPDATES | CHILDREN_UPDATES | LABEL_UPDATES); - elementPath = model.findElement("3"); + elementPath = model.findElement("3"); //$NON-NLS-1$ fListener.addUpdates(fViewer, elementPath, model.getElement(elementPath), 0, STATE_UPDATES); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(STATE_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Update the viewer with new selection delta to something new in the view - TreePath pathToBeRevealed = model.findElement("2.1"); + TreePath pathToBeRevealed = model.findElement("2.1"); //$NON-NLS-1$ ModelDelta revealDelta = model.makeElementDelta(pathToBeRevealed, IModelDelta.REVEAL); revealDelta.accept(new IModelDeltaVisitor() { @@ -455,13 +522,16 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda // Wait for the second model delta to process model.postDelta(revealDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILDREN_UPDATES | LABEL_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILDREN_UPDATES | LABEL_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // check if REVEAL was triggered by the delta and not by the // state restore operation TreePath topPath = getCTargetViewer().getTopElementPath(); - assertNotNull("Top item should not be null!", topPath); + assertNotNull("Top item should not be null!", topPath); //$NON-NLS-1$ TreePathWrapper.assertEqual(pathToBeRevealed, topPath); } @@ -486,17 +556,21 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Stop forcing view updates. autopopulateAgent.dispose(); // Scroll down to the last part of the tree. - getCTargetViewer().reveal(model.findElement("3.6.3.16.16.16.16.16"), 1); + getCTargetViewer().reveal(model.findElement("3.6.3.16.16.16.16.16"), 1); //$NON-NLS-1$ while(fDisplay.readAndDispatch()) {} final TreePath originalTopPath = getCTargetViewer().getTopElementPath(); - assertNotNull("Top item should not be null!", originalTopPath); + assertNotNull("Top item should not be null!", originalTopPath); //$NON-NLS-1$ // Extract the original state from viewer ModelDelta originalState = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); @@ -506,18 +580,26 @@ public class JFaceViewerTopIndexTests extends TestCase implements ITestModelUpda fListener.reset(true, false); fListener.addStateUpdates(getCTargetViewer(), originalState, IModelDelta.EXPAND | IModelDelta.SELECT | IModelDelta.REVEAL); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Set the viewer input back to the model fListener.reset(false, false); fListener.addUpdates(getCTargetViewer(), originalTopPath, (TestElement)originalTopPath.getLastSegment(), 0, STATE_UPDATES); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(STATE_UPDATES | CONTENT_SEQUENCE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_UPDATES | CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } while (fDisplay.readAndDispatch ()) {} // check if REVEAL was restored OK final TreePath topPath = getCTargetViewer().getTopElementPath(); - assertNotNull("Top item should not be null!", topPath); + assertNotNull("Top item should not be null!", topPath); //$NON-NLS-1$ TreePathWrapper.assertEqual(originalTopPath, topPath); } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerUpdateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerUpdateTests.java index 9c6b5c555..4ebd01ad7 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerUpdateTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/JFaceViewerUpdateTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -27,6 +28,6 @@ public class JFaceViewerUpdateTests extends UpdateTests { } protected ITreeModelViewer createViewer(Display display, Shell shell) { - return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); + return new TreeModelViewer(fShell, SWT.VIRTUAL, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java index c47cb0ad6..7dacab8ef 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/LazyTests.java @@ -69,14 +69,18 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } protected void runTest() throws Throwable { try { super.runTest(); } catch (Throwable t) { - throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); + throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -95,10 +99,10 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis TestModel model = new TestModel(); TestElement[] children = new TestElement[size]; for (int i = 0; i < size; i++) { - children[i] = new TestElement(model, "1." + i, new TestElement[0]); + children[i] = new TestElement(model, "1." + i, new TestElement[0]); //$NON-NLS-1$ } - TestElement element = new TestElement(model, "1", children); - model.setRoot(new TestElement(model, "root", new TestElement[] { element })); + TestElement element = new TestElement(model, "1", children); //$NON-NLS-1$ + model.setRoot(new TestElement(model, "root", new TestElement[] { element })); //$NON-NLS-1$ return model; } @@ -117,7 +121,11 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis // Populate initial view content fListener.reset(TreePath.EMPTY, model.getRootElement(), 1, true, true); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Create delta to expand the "1" element. TestElement rootElement = model.getRootElement(); @@ -129,7 +137,7 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis // Add first 250 elements as acceptable to materialize fListener.reset(); fListener.setFailOnRedundantUpdates(true); - TreePath expandElementPath = model.findElement("1"); + TreePath expandElementPath = model.findElement("1"); //$NON-NLS-1$ fListener.addChildreCountUpdate(expandElementPath); fListener.addLabelUpdate(expandElementPath); // TODO: not sure why label is updated upon expand? for (int i = 0; i < 250; i++) { @@ -140,8 +148,11 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis } model.postDelta(rootDelta); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | MODEL_CHANGED_COMPLETE | LABEL_SEQUENCE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | MODEL_CHANGED_COMPLETE | LABEL_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } /** @@ -164,11 +175,15 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis fListener.setFailOnMultipleModelUpdateSequences(true); fListener.setFailOnRedundantUpdates(false); fViewer.setInput(model.getRootElement()); - fListener.addLabelUpdate(model.findElement("1.0")); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | LABEL_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + fListener.addLabelUpdate(model.findElement("1.0")); //$NON-NLS-1$ + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | LABEL_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Set selection so that the initial selection is not empty - fViewer.setSelection(new TreeSelection(new TreePath[] { model.findElement("1.0")} )); + fViewer.setSelection(new TreeSelection(new TreePath[] { model.findElement("1.0") })); //$NON-NLS-1$ // Create delta to select the "1" element. TestElement rootElement = model.getRootElement(); @@ -178,20 +193,23 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis ModelDelta _1Delta = baseDelta.addNode(_1Element, 0, IModelDelta.NO_CHANGE, _1Element.getChildren().length); // Add the delta to select the "1.1" element. - TestElement _1_0_newElement = new TestElement(model, "1.0 - new", new TestElement[0]); - TreePath _1ElementPath = model.findElement("1"); + TestElement _1_0_newElement = new TestElement(model, "1.0 - new", new TestElement[0]); //$NON-NLS-1$ + TreePath _1ElementPath = model.findElement("1"); //$NON-NLS-1$ model.replaceElementChild(_1ElementPath, 0, _1_0_newElement); _1Delta.addNode(_1_0_newElement, 0, IModelDelta.SELECT); // Add element label update and post the delta fListener.reset(); fListener.setFailOnRedundantUpdates(true); - TreePath _1_0_newElementPath = model.findElement("1.0 - new"); + TreePath _1_0_newElementPath = model.findElement("1.0 - new"); //$NON-NLS-1$ fListener.addLabelUpdate(_1_0_newElementPath); model.postDelta(rootDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | LABEL_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | LABEL_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } assertEquals(((IStructuredSelection)fViewer.getSelection()).getFirstElement(), _1_0_newElement); @@ -209,7 +227,11 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis // Populate initial view content fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, true, true); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | LABEL_SEQUENCE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | LABEL_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Turn off autoexpand fViewer.setAutoExpandLevel(0); @@ -217,8 +239,12 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis // Reposition the viewer to middle of list fListener.reset(); fListener.setFailOnRedundantUpdates(false); - fViewer.reveal(model.findElement("1"), 500); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + fViewer.reveal(model.findElement("1"), 500); //$NON-NLS-1$ + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Create delta to refresh the "1" element. TestElement rootElement = model.getRootElement(); @@ -233,7 +259,7 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis // Add first 250 elements (after element 500) as acceptable to materialize fListener.reset(); fListener.setFailOnRedundantUpdates(true); - TreePath refreshElementPath = model.findElement("1"); + TreePath refreshElementPath = model.findElement("1"); //$NON-NLS-1$ fListener.addRedundantExceptionChildCount(refreshElementPath); fListener.addRedundantExceptionLabel(refreshElementPath); fListener.addChildreUpdate(TreePath.EMPTY, 0); @@ -248,8 +274,11 @@ abstract public class LazyTests extends TestCase implements ITestModelUpdatesLis } model.postDelta(rootDelta); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java index b074971df..0caaf4593 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PerformanceTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -70,14 +71,18 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } protected void runTest() throws Throwable { try { super.runTest(); } catch (Throwable t) { - throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); + throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -92,8 +97,8 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd public void testRefreshStruct() throws InterruptedException { TestModel model = new TestModel(); - model.setRoot( new TestElement(model, "root", new TestElement[0] ) ); - model.setElementChildren(TreePath.EMPTY, TestModel.makeMultiLevelElements(model, getTestModelDepth(), "model.")); + model.setRoot(new TestElement(model, "root", new TestElement[0])); //$NON-NLS-1$ + model.setElementChildren(TreePath.EMPTY, TestModel.makeMultiLevelElements(model, getTestModelDepth(), "model.")); //$NON-NLS-1$ fViewer.setAutoExpandLevel(-1); @@ -102,7 +107,11 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); Performance perf = Performance.getDefault(); @@ -110,15 +119,18 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd try { for (int i = 0; i < 10; i++) { // Update the model - model.setAllAppendix(" - pass " + i); + model.setAllAppendix(" - pass " + i); //$NON-NLS-1$ TestElement element = model.getRootElement(); fListener.reset(TreePath.EMPTY, element, -1, false, false); meter.start(); model.postDelta(new ModelDelta(element, IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } meter.stop(); System.gc(); } @@ -132,8 +144,8 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd public void testRefreshStruct2() throws InterruptedException { TestModel model = new TestModel(); - model.setRoot( new TestElement(model, "root", new TestElement[0] ) ); - model.setElementChildren(TreePath.EMPTY, TestModel.makeMultiLevelElements2(model, new int[] { 2, 3000, 1}, "model.")); + model.setRoot(new TestElement(model, "root", new TestElement[0])); //$NON-NLS-1$ + model.setElementChildren(TreePath.EMPTY, TestModel.makeMultiLevelElements2(model, new int[] { 2, 3000, 1 }, "model.")); //$NON-NLS-1$ fViewer.setAutoExpandLevel(2); // Create the listener @@ -142,8 +154,14 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); - //model.validateData(fViewer, TreePath.EMPTY); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) + { + if (!fDisplay.readAndDispatch ()) + { + Thread.sleep(0); + //model.validateData(fViewer, TreePath.EMPTY); + } + } fVirtualItemValidator.setVisibleRange(0, 50); @@ -152,7 +170,7 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd try { for (int i = 0; i < 100; i++) { // Update the model - model.setAllAppendix(" - pass " + i); + model.setAllAppendix(" - pass " + i); //$NON-NLS-1$ TestElement element = model.getRootElement(); //fListener.reset(TreePath.EMPTY, element, -1, false, false); @@ -160,11 +178,17 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd meter.start(); model.postDelta(new ModelDelta(element, IModelDelta.CONTENT)); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.postDelta(new ModelDelta(element, IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } meter.stop(); System.gc(); } @@ -179,8 +203,8 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd public void testRefreshStructReplaceElements() throws InterruptedException { TestModel model = new TestModel(); - model.setRoot( new TestElement(model, "root", new TestElement[0] ) ); - model.setElementChildren(TreePath.EMPTY, TestModel.makeMultiLevelElements(model, getTestModelDepth(), "model.")); + model.setRoot(new TestElement(model, "root", new TestElement[0])); //$NON-NLS-1$ + model.setElementChildren(TreePath.EMPTY, TestModel.makeMultiLevelElements(model, getTestModelDepth(), "model.")); //$NON-NLS-1$ fViewer.setAutoExpandLevel(-1); @@ -189,7 +213,11 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); Performance perf = Performance.getDefault(); @@ -197,15 +225,18 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd try { for (int i = 0; i < 100; i++) { // Update the model - model.setElementChildren(TreePath.EMPTY, TestModel.makeMultiLevelElements(model, getTestModelDepth(), "pass " + i + ".")); + model.setElementChildren(TreePath.EMPTY, TestModel.makeMultiLevelElements(model, getTestModelDepth(), "pass " + i + ".")); //$NON-NLS-1$ //$NON-NLS-2$ TestElement element = model.getRootElement(); fListener.reset(TreePath.EMPTY, element, -1, false, false); meter.start(); model.postDelta(new ModelDelta(element, IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } meter.stop(); System.gc(); } @@ -220,9 +251,9 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd public void testRefreshList() throws InterruptedException { TestModel model = new TestModel(); - model.setRoot( new TestElement(model, "root", new TestElement[0] ) ); + model.setRoot(new TestElement(model, "root", new TestElement[0])); //$NON-NLS-1$ int numElements = (int)Math.pow(2, getTestModelDepth()); - model.setElementChildren(TreePath.EMPTY, TestModel.makeSingleLevelModelElements(model, numElements, "model.")); + model.setElementChildren(TreePath.EMPTY, TestModel.makeSingleLevelModelElements(model, numElements, "model.")); //$NON-NLS-1$ fViewer.setAutoExpandLevel(-1); @@ -231,7 +262,11 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); Performance perf = Performance.getDefault(); @@ -239,15 +274,18 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd try { for (int i = 0; i < 100; i++) { // Update the model - model.setAllAppendix(" - pass " + i); + model.setAllAppendix(" - pass " + i); //$NON-NLS-1$ TestElement element = model.getRootElement(); fListener.reset(TreePath.EMPTY, element, -1, false, false); meter.start(); model.postDelta(new ModelDelta(element, IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } meter.stop(); System.gc(); } @@ -271,11 +309,15 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Set a selection in view - fViewer.setSelection(new TreeSelection(model.findElement("3.2.3"))); + fViewer.setSelection(new TreeSelection(model.findElement("3.2.3"))); //$NON-NLS-1$ // Turn off the auto-expand now since we want to text the auto-expand logic fViewer.setAutoExpandLevel(-1); @@ -285,14 +327,18 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd try { for (int i = 0; i < 100; i++) { // Update the model - model.setAllAppendix(" - pass " + i); + model.setAllAppendix(" - pass " + i); //$NON-NLS-1$ // Set the viewer input to null. This will trigger the view to save the viewer state. fListener.reset(true, false); meter.start(); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Set the viewer input back to the model. When view updates are complete // the viewer @@ -300,7 +346,11 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd fListener.reset(TreePath.EMPTY, model.getRootElement(), 1, false, false); // TODO: add state updates somehow? fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } meter.stop(); System.gc(); } @@ -315,9 +365,9 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd public void testRefreshListFiltered() throws InterruptedException { TestModel model = new TestModel(); - model.setRoot( new TestElement(model, "root", new TestElement[0] ) ); + model.setRoot(new TestElement(model, "root", new TestElement[0])); //$NON-NLS-1$ int numElements = (int)Math.pow(2, getTestModelDepth()); - model.setElementChildren(TreePath.EMPTY, TestModel.makeSingleLevelModelElements(model, numElements, "model.")); + model.setElementChildren(TreePath.EMPTY, TestModel.makeSingleLevelModelElements(model, numElements, "model.")); //$NON-NLS-1$ fViewer.setAutoExpandLevel(-1); @@ -328,8 +378,8 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof TestElement) { String id = ((TestElement)element).getID(); - if (id.startsWith("model.")) { - id = id.substring("model.".length()); + if (id.startsWith("model.")) { //$NON-NLS-1$ + id = id.substring("model.".length()); //$NON-NLS-1$ } if (id.length() >= 2 && (id.charAt(1) == '1' || id.charAt(1) == '3' || id.charAt(1) == '5' || id.charAt(1) == '7' || id.charAt(1) == '9')) { return false; @@ -341,7 +391,11 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); Performance perf = Performance.getDefault(); @@ -349,15 +403,18 @@ abstract public class PerformanceTests extends TestCase implements ITestModelUpd try { for (int i = 0; i < 100; i++) { // Update the model - model.setAllAppendix(" - pass " + i); + model.setAllAppendix(" - pass " + i); //$NON-NLS-1$ TestElement element = model.getRootElement(); fListener.reset(TreePath.EMPTY, element, -1, false, false); meter.start(); model.postDelta(new ModelDelta(element, IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } meter.stop(); System.gc(); } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java index e50a3fa23..d99c149ae 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PopupTests.java @@ -81,7 +81,11 @@ abstract public class PopupTests extends TestCase implements ITestModelUpdatesLi // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } /** @@ -98,22 +102,30 @@ abstract public class PopupTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Update the model TestElement element = model.getRootElement().getChildren()[0]; TreePath elementPath = new TreePath(new Object[] { element }); TestElement[] newChildren = new TestElement[] { - new TestElement(model, "1.1 - new", new TestElement[0]), - new TestElement(model, "1.2 - new", new TestElement[0]), - new TestElement(model, "1.3 - new", new TestElement[0]), + new TestElement(model, "1.1 - new", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "1.2 - new", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "1.3 - new", new TestElement[0]), //$NON-NLS-1$ }; ModelDelta delta = model.setElementChildren(elementPath, newChildren); fListener.reset(elementPath, element, -1, true, false); model.postDelta(delta); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -128,7 +140,11 @@ abstract public class PopupTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Create the delta @@ -161,7 +177,9 @@ abstract public class PopupTests extends TestCase implements ITestModelUpdatesLi break; } } - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } } model.validateData(fViewer, TreePath.EMPTY, true); @@ -174,7 +192,7 @@ abstract public class PopupTests extends TestCase implements ITestModelUpdatesLi List selectionPathsList = Arrays.asList( ((ITreeSelection)selection).getPaths() ); assertFalse(selectionPathsList.contains(path_root_3)); } else { - fail("Not a tree selection"); + fail("Not a tree selection"); //$NON-NLS-1$ } } @@ -192,21 +210,25 @@ abstract public class PopupTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Turn off auto-expansion fViewer.setAutoExpandLevel(0); // Set a selection in view - TreeSelection originalSelection = new TreeSelection(model.findElement("3.3.1")); + TreeSelection originalSelection = new TreeSelection(model.findElement("3.3.1")); //$NON-NLS-1$ fViewer.setSelection(originalSelection); // Update the model - model.addElementChild(model.findElement("3"), null, 0, new TestElement(model, "3.0 - new", new TestElement[0])); + model.addElementChild(model.findElement("3"), null, 0, new TestElement(model, "3.0 - new", new TestElement[0])); //$NON-NLS-1$ //$NON-NLS-2$ // Create the delta for element "3" with content update. - TreePath elementPath = model.findElement("3"); + TreePath elementPath = model.findElement("3"); //$NON-NLS-1$ ModelDelta rootDelta = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); ModelDelta elementDelta = model.getElementDelta(rootDelta, elementPath, true); elementDelta.setFlags(IModelDelta.CONTENT); @@ -217,17 +239,20 @@ abstract public class PopupTests extends TestCase implements ITestModelUpdatesLi // Post the sub-tree update model.postDelta(rootDelta); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data model.validateData(fViewer, TreePath.EMPTY, true); - assertTrue(getCTargetViewer().getExpandedState(model.findElement("3")) == true); + assertTrue(getCTargetViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ // On windows, getExpandedState() may return true for an element with no children: // assertTrue(getCTargetViewer().getExpandedState(model.findElement("3.0 - new")) == false); - assertTrue(getCTargetViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getCTargetViewer().getExpandedState(model.findElement("3.2")) == true); - assertTrue(getCTargetViewer().getExpandedState(model.findElement("3.3")) == true); + assertTrue(getCTargetViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getCTargetViewer().getExpandedState(model.findElement("3.2")) == true); //$NON-NLS-1$ + assertTrue(getCTargetViewer().getExpandedState(model.findElement("3.3")) == true); //$NON-NLS-1$ assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PresentationContextTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PresentationContextTests.java index 7e4d2d280..654f8074d 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PresentationContextTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/PresentationContextTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems and others. + * Copyright (c) 2008, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -33,21 +33,21 @@ public class PresentationContextTests extends TestCase { * Tests saving and restoring presentation context properties. */ public void testSaveRestore () { - PresentationContext context = new PresentationContext("test"); - context.setProperty("string", "string"); - context.setProperty("integer", new Integer(1)); - context.setProperty("boolean", new Boolean(true)); - context.setProperty("persistable", ResourcesPlugin.getWorkspace().getRoot().getAdapter(IPersistableElement.class)); + PresentationContext context = new PresentationContext("test"); //$NON-NLS-1$ + context.setProperty("string", "string"); //$NON-NLS-1$ //$NON-NLS-2$ + context.setProperty("integer", new Integer(1)); //$NON-NLS-1$ + context.setProperty("boolean", new Boolean(true)); //$NON-NLS-1$ + context.setProperty("persistable", ResourcesPlugin.getWorkspace().getRoot().getAdapter(IPersistableElement.class)); //$NON-NLS-1$ - final XMLMemento memento = XMLMemento.createWriteRoot("TEST"); + final XMLMemento memento = XMLMemento.createWriteRoot("TEST"); //$NON-NLS-1$ context.saveProperites(memento); - context = new PresentationContext("test"); + context = new PresentationContext("test"); //$NON-NLS-1$ context.initProperties(memento); - assertEquals("Wrong value restored", "string", context.getProperty("string")); - assertEquals("Wrong value restored", new Integer(1), context.getProperty("integer")); - assertEquals("Wrong value restored", new Boolean(true), context.getProperty("boolean")); - assertEquals("Wrong value restored", ResourcesPlugin.getWorkspace().getRoot(), context.getProperty("persistable")); + assertEquals("Wrong value restored", "string", context.getProperty("string")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + assertEquals("Wrong value restored", new Integer(1), context.getProperty("integer")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("Wrong value restored", new Boolean(true), context.getProperty("boolean")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("Wrong value restored", ResourcesPlugin.getWorkspace().getRoot(), context.getProperty("persistable")); //$NON-NLS-1$ //$NON-NLS-2$ context.dispose(); } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java index 3deb65e5d..8f51de89c 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/SelectionTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -70,11 +71,15 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } private static class SelectionListener implements ISelectionChangedListener { - private List fEvents = new ArrayList(1); + private final List fEvents = new ArrayList(1); public void selectionChanged(SelectionChangedEvent event) { fEvents.add(event); @@ -86,7 +91,11 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat fViewer.setAutoExpandLevel(-1); fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, true, false); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); return model; } @@ -106,7 +115,7 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat fViewer.addSelectionChangedListener(listener); // Set the selection and verify that the listener is called. - TreeSelection selection = new TreeSelection(model.findElement("3.3.3")); + TreeSelection selection = new TreeSelection(model.findElement("3.3.3")); //$NON-NLS-1$ fViewer.setSelection(selection, true, false); assertTrue(listener.fEvents.size() == 1); @@ -125,7 +134,7 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat final TestModel model = makeMultiLevelModel(); // Set the selection and verify it. - TreeSelection selection_3_3_3 = new TreeSelection(model.findElement("3.3.3")); + TreeSelection selection_3_3_3 = new TreeSelection(model.findElement("3.3.3")); //$NON-NLS-1$ fViewer.setSelection(selection_3_3_3, true, false); assertEquals(selection_3_3_3, fViewer.getSelection()); @@ -149,7 +158,7 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat }); // Attempt to change selection and verify that old selection is still valid. - TreeSelection selection_3_3_1 = new TreeSelection(model.findElement("3.3.1")); + TreeSelection selection_3_3_1 = new TreeSelection(model.findElement("3.3.1")); //$NON-NLS-1$ fViewer.setSelection(selection_3_3_1, true, false); assertEquals(selection_3_3_3, fViewer.getSelection()); @@ -159,21 +168,27 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat // Create the an update delta to attempt to change selection back to // 3.3.3 and verify that selection did not get overriden. - TreePath path_3_3_3 = model.findElement("3.3.3"); + TreePath path_3_3_3 = model.findElement("3.3.3"); //$NON-NLS-1$ ModelDelta baseDelta = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); ModelDelta delta_3_3_3 = model.getElementDelta(baseDelta, path_3_3_3, false); delta_3_3_3.setFlags(IModelDelta.SELECT); fViewer.updateViewer(baseDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } assertEquals(selection_3_3_1, fViewer.getSelection()); // Add the *force* flag to the selection delta and update viewer again. // Verify that selection did change. delta_3_3_3.setFlags(IModelDelta.SELECT | IModelDelta.FORCE); fViewer.updateViewer(baseDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } assertEquals(selection_3_3_3, fViewer.getSelection()); } @@ -192,14 +207,14 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat TestModel model = makeMultiLevelModel(); // Create a selection object to the deepest part of the tree. - TreePath elementPath = model.findElement("3.3.3"); + TreePath elementPath = model.findElement("3.3.3"); //$NON-NLS-1$ TreeSelection selection = new TreeSelection(elementPath); // Set the selection. fViewer.setSelection(selection, true, false); // Remove the element - TreePath removePath = model.findElement("3"); + TreePath removePath = model.findElement("3"); //$NON-NLS-1$ TreePath parentPath = removePath.getParentPath(); int removeIndex = model.getElement(parentPath).indexOf( model.getElement(removePath) ); ModelDelta delta = model.removeElementChild(removePath.getParentPath(), removeIndex); @@ -212,8 +227,11 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat // delta only wait for the delta to be processed. fListener.reset(); model.postDelta(delta); - while (!fListener.isFinished(ITestModelUpdatesListenerConstants.MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ITestModelUpdatesListenerConstants.MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Check to make sure the selection was made //assertTrue(listener.fEvents.size() == 1); @@ -238,14 +256,14 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat TestModel model = makeMultiLevelModel(); // Create a selection object to the deepest part of the tree. - TreePath elementPath = model.findElement("3.3.3"); + TreePath elementPath = model.findElement("3.3.3"); //$NON-NLS-1$ TreeSelection selection = new TreeSelection(elementPath); // Set the selection. fViewer.setSelection(selection, true, false); // Remove the element - TreePath removePath = model.findElement("3"); + TreePath removePath = model.findElement("3"); //$NON-NLS-1$ TreePath parentPath = removePath.getParentPath(); int removeIndex = model.getElement(parentPath).indexOf( model.getElement(removePath) ); model.removeElementChild(removePath.getParentPath(), removeIndex); @@ -260,8 +278,11 @@ abstract public class SelectionTests extends TestCase implements ITestModelUpdat // Refresh the viewer model.postDelta( new ModelDelta(model.getRootElement(), IModelDelta.CONTENT) ); - while (!fListener.isFinished(ITestModelUpdatesListenerConstants.ALL_UPDATES_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ITestModelUpdatesListenerConstants.ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Check to make sure the selection was made // Commented out until JFace bug 219887 is fixed. diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java index bef7245cb..ee5206699 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java @@ -75,14 +75,18 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } protected void runTest() throws Throwable { try { super.runTest(); } catch (Throwable t) { - throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); + throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -103,7 +107,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Create the update delta @@ -138,15 +146,18 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi fListener.addLabelUpdate(path3); fViewer.updateViewer(updateDelta); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | LABEL_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE | LABEL_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Extract the new state from viewer ModelDelta savedDelta = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); fViewer.saveElementState(path0, savedDelta, IModelDelta.EXPAND | IModelDelta.SELECT); if (!deltaMatches(updateDelta, savedDelta) ) { - fail("Expected:\n" + updateDelta.toString() + "\nGot:\n" + savedDelta); + fail("Expected:\n" + updateDelta.toString() + "\nGot:\n" + savedDelta); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -197,12 +208,12 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi String text = Integer.toString(i + 1); elements[i] = new TestElement(model, text, new TestElement[] { - new TestElement(model, text + ".1", new TestElement[] { - new TestElement(model, text + ".1.1", new TestElement[0]) + new TestElement(model, text + ".1", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, text + ".1.1", new TestElement[0]) //$NON-NLS-1$ }) }); } - model.setRoot(new TestElement(model, "root", elements)); + model.setRoot(new TestElement(model, "root", elements)); //$NON-NLS-1$ return model; } @@ -247,8 +258,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi } model.postDelta(rootDelta); - while (!listener.isFinished(CONTENT_SEQUENCE_COMPLETE | MODEL_CHANGED_COMPLETE)) - if (!Display.getDefault().readAndDispatch ()) Thread.sleep(0); + while (!listener.isFinished(CONTENT_SEQUENCE_COMPLETE | MODEL_CHANGED_COMPLETE)) { + if (!Display.getDefault().readAndDispatch ()) { + Thread.sleep(0); + } + } } public void testPreserveExpandedOnRemove() throws InterruptedException { @@ -262,13 +276,17 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); expandAlternateElements(fListener, model, true); // Set a selection in view - TreeSelection originalSelection = new TreeSelection(model.findElement("5.1")); + TreeSelection originalSelection = new TreeSelection(model.findElement("5.1")); //$NON-NLS-1$ fViewer.setSelection(originalSelection); // Update the model @@ -277,18 +295,21 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Remove delta should not generate any new updates fListener.reset(); model.postDelta(delta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data model.validateData(fViewer, TreePath.EMPTY, true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); //$NON-NLS-1$ assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); } @@ -303,38 +324,45 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); expandAlternateElements(fListener, model, true); // Set a selection in view - TreeSelection originalSelection = new TreeSelection(model.findElement("5.1")); + TreeSelection originalSelection = new TreeSelection(model.findElement("5.1")); //$NON-NLS-1$ fViewer.setSelection(originalSelection); // Update the model - ModelDelta delta = model.insertElementChild(TreePath.EMPTY, 0, new TestElement(model, "0 - new", new TestElement[0])); + ModelDelta delta = model.insertElementChild(TreePath.EMPTY, 0, new TestElement(model, "0 - new", new TestElement[0])); //$NON-NLS-1$ // Insert delta should generate updates only for the new element - TreePath path = model.findElement("0 - new"); + TreePath path = model.findElement("0 - new"); //$NON-NLS-1$ // Note: redundant label updates on insert. fListener.reset(path, (TestElement)path.getLastSegment(), 0, false, false); fListener.addChildreUpdate(TreePath.EMPTY, 0); model.postDelta(delta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | ALL_UPDATES_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data model.validateData(fViewer, TreePath.EMPTY, true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("1.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("1.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); //$NON-NLS-1$ assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); } @@ -349,7 +377,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); expandAlternateElements(fListener, model, true); @@ -357,7 +389,7 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set a selection in view // Set a selection in view TreeSelection originalSelection = new TreeSelection( - new TreePath[] { model.findElement("5"), model.findElement("5.1"), model.findElement("6") }); +new TreePath[] { model.findElement("5"), model.findElement("5.1"), model.findElement("6") }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ fViewer.setSelection(originalSelection); assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); @@ -370,23 +402,26 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Create the delta which has nodes with CONTENT flag set at multiple levels. ModelDelta rootDelta = new ModelDelta(model.getRootElement(), IModelDelta.CONTENT); - ModelDelta elementDelta = model.getElementDelta(rootDelta, model.findElement("3.1.1"), true); + ModelDelta elementDelta = model.getElementDelta(rootDelta, model.findElement("3.1.1"), true); //$NON-NLS-1$ elementDelta.setFlags(IModelDelta.CONTENT); // Post the multi-content update delta model.postDelta(rootDelta); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data model.validateData(fViewer, TreePath.EMPTY, true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); //$NON-NLS-1$ assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); // Note: in past it was observed sub-optimal coalescing in this test due @@ -407,21 +442,25 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Turn off auto-expansion fViewer.setAutoExpandLevel(0); // Set a selection in view - TreeSelection originalSelection = new TreeSelection(model.findElement("3.3.1")); + TreeSelection originalSelection = new TreeSelection(model.findElement("3.3.1")); //$NON-NLS-1$ fViewer.setSelection(originalSelection); // Update the model - model.addElementChild(model.findElement("3"), null, 0, new TestElement(model, "3.0 - new", new TestElement[0])); + model.addElementChild(model.findElement("3"), null, 0, new TestElement(model, "3.0 - new", new TestElement[0])); //$NON-NLS-1$ //$NON-NLS-2$ // Create the delta for element "3" with content update. - TreePath elementPath = model.findElement("3"); + TreePath elementPath = model.findElement("3"); //$NON-NLS-1$ ModelDelta rootDelta = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); ModelDelta elementDelta = model.getElementDelta(rootDelta, elementPath, true); elementDelta.setFlags(IModelDelta.CONTENT); @@ -432,17 +471,20 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Post the sub-tree update model.postDelta(rootDelta); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data model.validateData(fViewer, TreePath.EMPTY, true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ // On windows, getExpandedState() may return true for an element with no children: // assertTrue(getCTargetViewer().getExpandedState(model.findElement("3.0 - new")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.2")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.3")) == true); + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.2")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.3")) == true); //$NON-NLS-1$ assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); } @@ -457,7 +499,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); expandAlternateElements(fListener, model, true); @@ -465,7 +511,7 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set a selection in view // TreeSelection originalSelection = new TreeSelection( // new TreePath[] { model.findElement("5"), model.findElement("5.1"), model.findElement("6") }); - TreeSelection originalSelection = new TreeSelection(model.findElement("5.1.1")); + TreeSelection originalSelection = new TreeSelection(model.findElement("5.1.1")); //$NON-NLS-1$ fViewer.setSelection(originalSelection); assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); @@ -479,39 +525,45 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi fListener.reset(false, false); fListener.addUpdates(getInternalViewer(), TreePath.EMPTY, model.getRootElement(), -1, ALL_UPDATES_COMPLETE); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data model.validateData(fViewer, TreePath.EMPTY, true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); //$NON-NLS-1$ assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); // Update the model again - model.addElementChild(TreePath.EMPTY, null, 0, new TestElement(model, "1", new TestElement[0])); + model.addElementChild(TreePath.EMPTY, null, 0, new TestElement(model, "1", new TestElement[0])); //$NON-NLS-1$ // Note: Re-expanding nodes causes redundant updates. fListener.reset(false, false); fListener.addUpdates(getInternalViewer(), TreePath.EMPTY, model.getRootElement(), -1, ALL_UPDATES_COMPLETE); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data model.validateData(fViewer, TreePath.EMPTY, true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); //$NON-NLS-1$ assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); } } @@ -527,13 +579,19 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) + { + if (!fDisplay.readAndDispatch ()) + { + Thread.sleep(0); // model.validateData(fViewer, TreePath.EMPTY, true); + } + } expandAlternateElements(fListener, model, false); // Set a selection in view - TreeSelection originalSelection = new TreeSelection(model.findElement("5.1.1")); + TreeSelection originalSelection = new TreeSelection(model.findElement("5.1.1")); //$NON-NLS-1$ fViewer.setSelection(originalSelection); assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); @@ -543,34 +601,42 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Note: Re-expanding nodes causes redundant updates. fListener.reset(false, false); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); //$NON-NLS-1$ assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); // Update the model again - model.addElementChild(TreePath.EMPTY, null, 0, new TestElement(model, "1", new TestElement[0])); + model.addElementChild(TreePath.EMPTY, null, 0, new TestElement(model, "1", new TestElement[0])); //$NON-NLS-1$ // Note: Re-expanding nodes causes redundant updates. fListener.reset(false, false); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); //$NON-NLS-1$ assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); } @@ -591,11 +657,15 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Set a selection in view - fViewer.setSelection(new TreeSelection(model.findElement("3.1.1"))); + fViewer.setSelection(new TreeSelection(model.findElement("3.1.1"))); //$NON-NLS-1$ // Reset the listener (ignore redundant updates) fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, false, false); @@ -603,25 +673,34 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Refresh content. // Note: Wait only for the processing of the delta, not for all updates model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Update the viewer with new selection delta to something new in the view - ModelDelta selectDelta = model.makeElementDelta(model.findElement("2.1"), IModelDelta.SELECT); + ModelDelta selectDelta = model.makeElementDelta(model.findElement("2.1"), IModelDelta.SELECT); //$NON-NLS-1$ // Wait for the second model delta to process fListener.resetModelChanged(); model.postDelta(selectDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Wait for all the updates to complete (note: we're not resetting the listener. model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Check to make sure that the state restore didn't change the selection. - assertEquals(new TreeSelection(model.findElement("2.1")), fViewer.getSelection()); + assertEquals(new TreeSelection(model.findElement("2.1")), fViewer.getSelection()); //$NON-NLS-1$ } public void testPreserveCollapseDeltaAfterContent() throws InterruptedException { @@ -636,7 +715,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Turn off auto-expand @@ -648,38 +731,47 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Refresh content. // Note: Wait only for the processing of the delta, not for all updates model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Update the viewer to collapse an element - ModelDelta collapseDelta = model.makeElementDelta(model.findElement("3.1"), IModelDelta.COLLAPSE); + ModelDelta collapseDelta = model.makeElementDelta(model.findElement("3.1"), IModelDelta.COLLAPSE); //$NON-NLS-1$ // Remove updates for the collapsed element from listener, because they // will never happen if the element remains collapsed. fListener.resetModelChanged(); - fListener.removeLabelUpdate(model.findElement("3.1.1")); - fListener.removeLabelUpdate(model.findElement("3.1.2")); - fListener.removeLabelUpdate(model.findElement("3.1.3")); - fListener.removeHasChildrenUpdate(model.findElement("3.1.1")); - fListener.removeHasChildrenUpdate(model.findElement("3.1.2")); - fListener.removeHasChildrenUpdate(model.findElement("3.1.3")); - fListener.removeChildreCountUpdate(model.findElement("3.1")); - fListener.removeChildrenUpdate(model.findElement("3.1"), 0); - fListener.removeChildrenUpdate(model.findElement("3.1"), 1); - fListener.removeChildrenUpdate(model.findElement("3.1"), 2); + fListener.removeLabelUpdate(model.findElement("3.1.1")); //$NON-NLS-1$ + fListener.removeLabelUpdate(model.findElement("3.1.2")); //$NON-NLS-1$ + fListener.removeLabelUpdate(model.findElement("3.1.3")); //$NON-NLS-1$ + fListener.removeHasChildrenUpdate(model.findElement("3.1.1")); //$NON-NLS-1$ + fListener.removeHasChildrenUpdate(model.findElement("3.1.2")); //$NON-NLS-1$ + fListener.removeHasChildrenUpdate(model.findElement("3.1.3")); //$NON-NLS-1$ + fListener.removeChildreCountUpdate(model.findElement("3.1")); //$NON-NLS-1$ + fListener.removeChildrenUpdate(model.findElement("3.1"), 0); //$NON-NLS-1$ + fListener.removeChildrenUpdate(model.findElement("3.1"), 1); //$NON-NLS-1$ + fListener.removeChildrenUpdate(model.findElement("3.1"), 2); //$NON-NLS-1$ // Wait for the second model delta to process model.postDelta(collapseDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Wait for all the updates to complete (note: we're not resetting the listener. model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Check to make sure that the state restore didn't change the selection. - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == false); //$NON-NLS-1$ } public void testPreserveExpandDeltaAfterContent() throws InterruptedException { @@ -693,7 +785,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Reset the listener (ignore redundant updates) @@ -702,25 +798,34 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Refresh content. // Note: Wait only for the processing of the delta, not for all updates model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Update the viewer to expand an element - ModelDelta expandDelta = model.makeElementDelta(model.findElement("3.1"), IModelDelta.EXPAND); + ModelDelta expandDelta = model.makeElementDelta(model.findElement("3.1"), IModelDelta.EXPAND); //$NON-NLS-1$ // Wait for the second model delta to process fListener.resetModelChanged(); model.postDelta(expandDelta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Wait for all the updates to complete (note: we're not resetting the listener. model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE | STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Check to make sure that the state restore didn't change the selection. - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ } @@ -735,14 +840,18 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Expand some, but not all elements expandAlternateElements(fListener, model, true); // Set a selection in view - fViewer.setSelection(new TreeSelection(new TreePath[] { model.findElement("5.1"), model.findElement("5.1.1"), model.findElement("6.1.1") } )); + fViewer.setSelection(new TreeSelection(new TreePath[] { model.findElement("5.1"), model.findElement("5.1.1"), model.findElement("6.1.1") })); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // Extract the original state from viewer ModelDelta originalState = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); @@ -752,8 +861,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi fListener.reset(false, false); fListener.addStateUpdates(getInternalViewer(), originalState, IModelDelta.EXPAND | IModelDelta.SELECT | IModelDelta.REVEAL); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Set the viewer input back to the model. When view updates are complete // the viewer @@ -761,14 +873,18 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi fListener.reset(TreePath.EMPTY, model.getRootElement(), 1, false, false); // TODO: add state updates somehow? fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Extract the restored state from viewer ModelDelta restoredState = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); fViewer.saveElementState(TreePath.EMPTY, restoredState, IModelDelta.EXPAND | IModelDelta.SELECT); if (!deltaMatches(originalState, restoredState)) { - fail("Expected:\n" + originalState.toString() + "\nGot:\n" + restoredState); + fail("Expected:\n" + originalState.toString() + "\nGot:\n" + restoredState); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -784,12 +900,16 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Set a selection in view - fViewer.setSelection(new TreeSelection(new TreePath[] { model.findElement("3.2"), model.findElement("3.2.1"), model.findElement("2") } )); - fViewer.setSelection(new TreeSelection(model.findElement("3.2.3"))); + fViewer.setSelection(new TreeSelection(new TreePath[] { model.findElement("3.2"), model.findElement("3.2.1"), model.findElement("2") })); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + fViewer.setSelection(new TreeSelection(model.findElement("3.2.3"))); //$NON-NLS-1$ // Turn off the auto-expand now since we want to text the auto-expand logic fViewer.setAutoExpandLevel(-1); @@ -803,8 +923,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi fListener.addStateUpdates(getInternalViewer(), originalState, IModelDelta.EXPAND | IModelDelta.SELECT | IModelDelta.REVEAL); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Set the viewer input back to the model. When view updates are complete // the viewer @@ -812,14 +935,18 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi fListener.reset(TreePath.EMPTY, model.getRootElement(), 1, false, false); // TODO: add state updates somehow? fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Extract the restored state from viewer ModelDelta restoredState = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); fViewer.saveElementState(TreePath.EMPTY, restoredState, IModelDelta.EXPAND | IModelDelta.SELECT); if (!deltaMatches(originalState, restoredState)) { - fail("Expected:\n" + originalState.toString() + "\nGot:\n" + restoredState); + fail("Expected:\n" + originalState.toString() + "\nGot:\n" + restoredState); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -834,14 +961,18 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Expand some, but not all elements expandAlternateElements(fListener, model, true); // Set a selection in view - fViewer.setSelection(new TreeSelection(new TreePath[] { model.findElement("5.1"), model.findElement("5.1.1"), model.findElement("6.1.1") } )); + fViewer.setSelection(new TreeSelection(new TreePath[] { model.findElement("5.1"), model.findElement("5.1.1"), model.findElement("6.1.1") })); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // Extract the original state from viewer ModelDelta originalState = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); @@ -854,14 +985,18 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Note: disable redundant updates because the reveal delta triggers one. fListener.reset(TreePath.EMPTY, model.getRootElement(), 1, false, false); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Extract the restored state from viewer ModelDelta restoredState = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); fViewer.saveElementState(TreePath.EMPTY, restoredState, IModelDelta.EXPAND | IModelDelta.SELECT); if (!deltaMatches(originalState, restoredState)) { - fail("Expected:\n" + originalState.toString() + "\nGot:\n" + restoredState); + fail("Expected:\n" + originalState.toString() + "\nGot:\n" + restoredState); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -876,14 +1011,18 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // Expand some, but not all elements expandAlternateElements(fListener, model, true); // Set a selection in view - fViewer.setSelection(new TreeSelection(new TreePath[] { model.findElement("5.1"), model.findElement("5.1.1"), model.findElement("6.1.1") } )); + fViewer.setSelection(new TreeSelection(new TreePath[] { model.findElement("5.1"), model.findElement("5.1.1"), model.findElement("6.1.1") })); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // Extract the original state from viewer ModelDelta originalState = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); @@ -899,14 +1038,18 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi fListener.reset(TreePath.EMPTY, model.getRootElement(), 1, false, false); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Extract the restored state from viewer ModelDelta restoredState = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); fViewer.saveElementState(TreePath.EMPTY, restoredState, IModelDelta.EXPAND | IModelDelta.SELECT); if (!deltaMatches(originalState, restoredState)) { - fail("Expected:\n" + originalState.toString() + "\nGot:\n" + restoredState); + fail("Expected:\n" + originalState.toString() + "\nGot:\n" + restoredState); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -922,12 +1065,16 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } expandAlternateElements(fListener, model, false); // Set a selection in view - TreeSelection originalSelection = new TreeSelection(model.findElement("5.1.1")); + TreeSelection originalSelection = new TreeSelection(model.findElement("5.1.1")); //$NON-NLS-1$ fViewer.setSelection(originalSelection); assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); @@ -940,26 +1087,33 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi fListener.addStateUpdates(getInternalViewer(), originalState, IModelDelta.EXPAND | IModelDelta.SELECT | IModelDelta.REVEAL); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Set the viewer input back to the model. When view updates are complete // the viewer // Note: disable redundant updates because the reveal delta triggers one. fListener.reset(); fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data (only select visible elements). - assertTrue(getInternalViewer().getExpandedState(model.findElement("1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("1.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("1.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); //$NON-NLS-1$ assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); } @@ -979,12 +1133,16 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } expandAlternateElements(fListener, model, false); // Set a selection in view - TreeSelection originalSelection = new TreeSelection(model.findElement("5.1.1")); + TreeSelection originalSelection = new TreeSelection(model.findElement("5.1.1")); //$NON-NLS-1$ fViewer.setSelection(originalSelection); assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); @@ -997,8 +1155,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi fListener.addStateUpdates(getInternalViewer(), originalState, IModelDelta.EXPAND | IModelDelta.SELECT | IModelDelta.REVEAL); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE | STATE_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } TestElement[] elements = model.getRootElement().getChildren(); @@ -1013,18 +1174,22 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi fViewer.setInput(model.getRootElement()); // MONITOR FOR THE STATE RESTORE TO COMPLETE - while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE| STATE_RESTORE_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_SEQUENCE_COMPLETE| STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Validate data - assertTrue(getInternalViewer().getExpandedState(model.findElement("1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("1.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); - assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); + assertTrue(getInternalViewer().getExpandedState(model.findElement("1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("1.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("4")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("5.1")) == true); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("6")) == false); //$NON-NLS-1$ assertTrue( areTreeSelectionsEqual(originalSelection, (ITreeSelection)fViewer.getSelection()) ); } @@ -1040,10 +1205,14 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); - fViewer.setSelection(new TreeSelection(model.findElement("3"))); + fViewer.setSelection(new TreeSelection(model.findElement("3"))); //$NON-NLS-1$ // Turn off auto-expand fViewer.setAutoExpandLevel(0); @@ -1051,50 +1220,68 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the viewer input to null. This will trigger the view to save the viewer state. fListener.reset(false, false); fViewer.setInput(null); - while (!fListener.isFinished(STATE_SAVE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_SAVE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Set the viewer input back to the model. When view updates are complete // the viewer // Note: disable redundant updates because the reveal delta triggers one. fListener.reset(TreePath.EMPTY, model.getRootElement(), 1, false, false); fViewer.setInput(model.getRootElement()); - TreePath path = model.findElement("2"); + TreePath path = model.findElement("2"); //$NON-NLS-1$ fListener.addUpdates(null, path, (TestElement)path.getLastSegment(), 0, STATE_UPDATES); - path = model.findElement("3"); + path = model.findElement("3"); //$NON-NLS-1$ fListener.addUpdates(null, path, (TestElement)path.getLastSegment(), 0, STATE_UPDATES); // Wait till we restore state of elements we want to collapse and select // Bug 372619 - Need to wait until proxy installed delta is processed before // posting the next delta. - while (!fListener.isFinished(STATE_RESTORE_STARTED | STATE_UPDATES | CHILDREN_UPDATES | MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_RESTORE_STARTED | STATE_UPDATES | CHILDREN_UPDATES | MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Post first collapse delta fListener.resetModelChanged(); - model.postDelta(model.makeElementDelta(model.findElement("2"), IModelDelta.COLLAPSE)); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + model.postDelta(model.makeElementDelta(model.findElement("2"), IModelDelta.COLLAPSE)); //$NON-NLS-1$ + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Post second collapse delta fListener.resetModelChanged(); - model.postDelta(model.makeElementDelta(model.findElement("3"), IModelDelta.COLLAPSE)); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + model.postDelta(model.makeElementDelta(model.findElement("3"), IModelDelta.COLLAPSE)); //$NON-NLS-1$ + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Post select delta - model.postDelta(model.makeElementDelta(model.findElement("1"), IModelDelta.SELECT)); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + model.postDelta(model.makeElementDelta(model.findElement("1"), IModelDelta.SELECT)); //$NON-NLS-1$ + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Wait for all the updates to complete (note: we're not resetting the listener). - while (!fListener.isFinished(STATE_RESTORE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(STATE_RESTORE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Check to make sure that the state restore didn't change the selection. - assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); - assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == false); - assertEquals(new TreeSelection(model.findElement("1")), fViewer.getSelection()); + assertTrue(getInternalViewer().getExpandedState(model.findElement("2")) == false); //$NON-NLS-1$ + assertTrue(getInternalViewer().getExpandedState(model.findElement("3")) == false); //$NON-NLS-1$ + assertEquals(new TreeSelection(model.findElement("1")), fViewer.getSelection()); //$NON-NLS-1$ } /** @@ -1114,7 +1301,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY, true); // a new similar model @@ -1125,9 +1316,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi fListener.expectRestoreAfterSaveComplete(); fViewer.setInput(copyModel.getRootElement()); while (!fListener.isFinished(STATE_RESTORE_STARTED)) { - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } } - assertTrue("RESTORE started before SAVE to complete", fListener.isFinished(STATE_SAVE_COMPLETE)); + assertTrue("RESTORE started before SAVE to complete", fListener.isFinished(STATE_SAVE_COMPLETE)); //$NON-NLS-1$ } /** @@ -1143,7 +1336,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); ModelDelta expandedState = new ModelDelta(model.getRootElement(), IModelDelta.NO_CHANGE); @@ -1155,13 +1352,20 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); // Wait for the delta to be processed. - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } fViewer.setInput(null); fViewer.updateViewer(expandedState); - while (!fListener.isFinished(CONTENT_COMPLETE | VIEWER_UPDATES_RUNNING)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_COMPLETE | VIEWER_UPDATES_RUNNING)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModel.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModel.java index 4bed630bd..fd46141f7 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModel.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -15,8 +16,6 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; - import org.eclipse.core.runtime.PlatformObject; import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer; import org.eclipse.debug.internal.ui.viewers.model.provisional.ICheckUpdate; @@ -43,6 +42,7 @@ import org.eclipse.jface.viewers.TreePath; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.swt.widgets.Display; +import org.junit.Assert; /** * Test model for the use in unit tests. This test model contains a set of @@ -57,7 +57,7 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider private final TestModel fModel; private final String fID; TestElement[] fChildren; - String fLabelAppendix = ""; + String fLabelAppendix = ""; //$NON-NLS-1$ boolean fExpanded; boolean fChecked; boolean fGrayed; @@ -324,7 +324,7 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider update.done(); } - public final static String ELEMENT_MEMENTO_ID = "id"; + public final static String ELEMENT_MEMENTO_ID = "id"; //$NON-NLS-1$ public void compareElements(final IElementCompareRequest[] updates) { doUpdate(updates); @@ -412,8 +412,8 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider IInternalTreeModelViewer viewer = (IInternalTreeModelViewer)_viewer; TestElement element = getElement(path); if ( Boolean.TRUE.equals(_viewer.getPresentationContext().getProperty(ICheckUpdate.PROP_CHECK)) ) { - Assert.assertEquals(element.getChecked(), viewer.getElementChecked(path)); - Assert.assertEquals(element.getGrayed(), viewer.getElementGrayed(path)); + Assert.assertTrue(element.getChecked() == viewer.getElementChecked(path)); + Assert.assertTrue(element.getGrayed() == viewer.getElementGrayed(path)); } if (!expandedElementsOnly || path.getSegmentCount() == 0 || viewer.getExpandedState(path) ) { @@ -424,14 +424,14 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider if (TestModelUpdatesListener.isFiltered(children[i], filters)) { continue; } - Assert.assertEquals(children[i], viewer.getChildElement(path, viewerIndex)); + Assert.assertEquals(children[i], viewer.getChildElement(path, viewerIndex)); validateData(viewer, path.createChildPath(children[i]), expandedElementsOnly, filters); viewerIndex++; } Assert.assertEquals(viewerIndex, viewer.getChildCount(path)); } else if (!viewer.getExpandedState(path)) { // If element not expanded, verify the plus sign. - Assert.assertEquals(viewer.getHasChildren(path), element.getChildren().length > 0); + Assert.assertTrue(viewer.getHasChildren(path) == element.getChildren().length > 0); } } @@ -470,7 +470,7 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider } } if (j == children.length) { - throw new IllegalArgumentException("Invalid path"); + throw new IllegalArgumentException("Invalid path"); //$NON-NLS-1$ } } return delta; @@ -486,7 +486,7 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider } public ModelDelta appendElementLabel(TreePath path, String labelAppendix) { - Assert.assertTrue(path.startsWith(fRootPath, null)); + org.junit.Assert.assertTrue(path.startsWith(fRootPath, null)); ModelDelta rootDelta = new ModelDelta(fInput, IModelDelta.NO_CHANGE); ModelDelta baseDelta = getBaseDelta(rootDelta); TreePath relativePath = getRelativePath(path); @@ -499,7 +499,7 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider } public ModelDelta setElementChecked(TreePath path, boolean checked, boolean grayed) { - Assert.assertTrue(path.startsWith(fRootPath, null)); + Assert.assertTrue(path.startsWith(fRootPath, null)); ModelDelta rootDelta = new ModelDelta(fInput, IModelDelta.NO_CHANGE); ModelDelta baseDelta = getBaseDelta(rootDelta); TreePath relativePath = getRelativePath(path); @@ -658,7 +658,7 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider } public String toString() { - return getElementString(fRoot, ""); + return getElementString(fRoot, ""); //$NON-NLS-1$ } public String getElementString(TestElement element, String indent) { @@ -668,14 +668,14 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider builder.append('\n'); TestElement[] children = element.getChildren(); for (int i = 0; i < children.length; i++) { - builder.append(getElementString(children[i], indent + " ")); + builder.append(getElementString(children[i], indent + " ")); //$NON-NLS-1$ } return builder.toString(); } public static TestModel simpleSingleLevel() { TestModel model = new TestModel(); - model.setRoot( new TestElement(model, "root", makeSingleLevelModelElements(model, 6, ""))); + model.setRoot( new TestElement(model, "root", makeSingleLevelModelElements(model, 6, ""))); //$NON-NLS-1$ //$NON-NLS-2$ return model; } @@ -692,7 +692,7 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider TestElement[] elements = new TestElement[depth]; for (int i = 0; i < depth; i++) { String name = prefix + i; - elements[i] = new TestElement(model, name, makeMultiLevelElements(model, i, name + ".")); + elements[i] = new TestElement(model, name, makeMultiLevelElements(model, i, name + ".")); //$NON-NLS-1$ } return elements; } @@ -706,35 +706,35 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider TestElement[] elements = new TestElement[count]; for (int i = 0; i < count; i++) { String name = prefix + i; - elements[i] = new TestElement(model, name, makeMultiLevelElements2(model, levelCounts, name + ".")); + elements[i] = new TestElement(model, name, makeMultiLevelElements2(model, levelCounts, name + ".")); //$NON-NLS-1$ } return elements; } public static TestModel simpleMultiLevel() { TestModel model = new TestModel(); - model.setRoot( new TestElement(model, "root", new TestElement[] { - new TestElement(model, "1", new TestElement[0]), - new TestElement(model, "2", true, false, new TestElement[] { - new TestElement(model, "2.1", true, true, new TestElement[0]), - new TestElement(model, "2.2", false, true, new TestElement[0]), - new TestElement(model, "2.3", true, false, new TestElement[0]), + model.setRoot( new TestElement(model, "root", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2", true, false, new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "2.1", true, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2.2", false, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2.3", true, false, new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, "3", new TestElement[] { - new TestElement(model, "3.1", new TestElement[] { - new TestElement(model, "3.1.1", new TestElement[0]), - new TestElement(model, "3.1.2", new TestElement[0]), - new TestElement(model, "3.1.3", new TestElement[0]), + new TestElement(model, "3", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.1", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.1.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.1.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.1.3", new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, "3.2", new TestElement[] { - new TestElement(model, "3.2.1", new TestElement[0]), - new TestElement(model, "3.2.2", new TestElement[0]), - new TestElement(model, "3.2.3", new TestElement[0]), + new TestElement(model, "3.2", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.2.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.2.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.2.3", new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, "3.3", new TestElement[] { - new TestElement(model, "3.3.1", new TestElement[0]), - new TestElement(model, "3.3.2", new TestElement[0]), - new TestElement(model, "3.3.3", new TestElement[0]), + new TestElement(model, "3.3", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.3.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.3.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.3.3", new TestElement[0]), //$NON-NLS-1$ }), }) }) ); @@ -743,39 +743,39 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider public static TestModel compositeMultiLevel() { TestModel m2 = new TestModel(); - m2.setRoot( new TestElement(m2, "m2.root", new TestElement[] { - new TestElement(m2, "m2.1", new TestElement[0]), - new TestElement(m2, "m2.2", true, false, new TestElement[] { - new TestElement(m2, "m2.2.1", true, true, new TestElement[0]), - new TestElement(m2, "m2.2.2", false, true, new TestElement[0]), - new TestElement(m2, "m2.2.3", true, false, new TestElement[0]), + m2.setRoot( new TestElement(m2, "m2.root", new TestElement[] { //$NON-NLS-1$ + new TestElement(m2, "m2.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(m2, "m2.2", true, false, new TestElement[] { //$NON-NLS-1$ + new TestElement(m2, "m2.2.1", true, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(m2, "m2.2.2", false, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(m2, "m2.2.3", true, false, new TestElement[0]), //$NON-NLS-1$ }), }) ); TestModel m3 = new TestModel(); - m3.setRoot( new TestElement(m3, "m3.root", new TestElement[] { - new TestElement(m3, "m3.1", new TestElement[0]), - new TestElement(m3, "m3.2", true, false, new TestElement[] { - new TestElement(m3, "m3.2.1", true, true, new TestElement[0]), - new TestElement(m3, "m3.2.2", false, true, new TestElement[0]), - new TestElement(m3, "m3.2.3", true, false, new TestElement[0]), + m3.setRoot( new TestElement(m3, "m3.root", new TestElement[] { //$NON-NLS-1$ + new TestElement(m3, "m3.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(m3, "m3.2", true, false, new TestElement[] { //$NON-NLS-1$ + new TestElement(m3, "m3.2.1", true, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(m3, "m3.2.2", false, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(m3, "m3.2.3", true, false, new TestElement[0]), //$NON-NLS-1$ }), }) ); TestModel m4 = new TestModel(); - m4.setRoot( new TestElement(m4, "m4.root", new TestElement[] { - new TestElement(m4, "m4.1", new TestElement[0]), - new TestElement(m4, "m4.2", true, false, new TestElement[] { - new TestElement(m4, "m4.2.1", true, true, new TestElement[0]), - new TestElement(m4, "m4.2.2", false, true, new TestElement[0]), - new TestElement(m4, "m4.2.3", true, false, new TestElement[0]), + m4.setRoot( new TestElement(m4, "m4.root", new TestElement[] { //$NON-NLS-1$ + new TestElement(m4, "m4.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(m4, "m4.2", true, false, new TestElement[] { //$NON-NLS-1$ + new TestElement(m4, "m4.2.1", true, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(m4, "m4.2.2", false, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(m4, "m4.2.3", true, false, new TestElement[0]), //$NON-NLS-1$ }), }) ); TestModel m1 = new TestModel(); - m1.setRoot( new TestElement(m1, "m1.root", new TestElement[] { - new TestElement(m1, "m1.1", new TestElement[0]), - new TestElement(m1, "m1.2", true, false, new TestElement[] { + m1.setRoot( new TestElement(m1, "m1.root", new TestElement[] { //$NON-NLS-1$ + new TestElement(m1, "m1.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(m1, "m1.2", true, false, new TestElement[] { //$NON-NLS-1$ m2.fRoot, m3.fRoot, m4.fRoot, @@ -788,133 +788,133 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider public static TestModel simpleDeepMultiLevel() { TestModel model = new TestModel(); - model.setRoot( new TestElement(model, "root", new TestElement[] { - new TestElement(model, "1", new TestElement[0]), - new TestElement(model, "2", true, false, new TestElement[] { - new TestElement(model, "2.1", true, true, new TestElement[0]), - new TestElement(model, "2.2", false, true, new TestElement[0]), - new TestElement(model, "2.3", true, false, new TestElement[0]), + model.setRoot( new TestElement(model, "root", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2", true, false, new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "2.1", true, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2.2", false, true, new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2.3", true, false, new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, "3", new TestElement[] { - new TestElement(model, "3.1", new TestElement[] { - new TestElement(model, "3.1.1", new TestElement[0]), - new TestElement(model, "3.1.2", new TestElement[0]), - new TestElement(model, "3.1.3", new TestElement[0]), + new TestElement(model, "3", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.1", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.1.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.1.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.1.3", new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, "3.2", new TestElement[] { - new TestElement(model, "3.2.1", new TestElement[0]), - new TestElement(model, "3.2.2", new TestElement[0]), - new TestElement(model, "3.2.3", new TestElement[0]), + new TestElement(model, "3.2", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.2.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.2.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.2.3", new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, "3.3", new TestElement[] { - new TestElement(model, "3.3.1", new TestElement[0]), - new TestElement(model, "3.3.2", new TestElement[0]), - new TestElement(model, "3.3.3", new TestElement[0]), + new TestElement(model, "3.3", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.3.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.3.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.3.3", new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, "3.4", new TestElement[] { - new TestElement(model, "3.4.1", new TestElement[0]), - new TestElement(model, "3.4.2", new TestElement[0]), - new TestElement(model, "3.4.3", new TestElement[0]), + new TestElement(model, "3.4", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.4.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.4.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.4.3", new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, "3.5", new TestElement[] { - new TestElement(model, "3.5.1", new TestElement[0]), - new TestElement(model, "3.5.2", new TestElement[0]), - new TestElement(model, "3.5.3", new TestElement[0]), + new TestElement(model, "3.5", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.5.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.5.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.5.3", new TestElement[0]), //$NON-NLS-1$ }), - new TestElement(model, "3.6", new TestElement[] { - new TestElement(model, "3.6.1", new TestElement[0]), - new TestElement(model, "3.6.2", new TestElement[0]), - new TestElement(model, "3.6.3", new TestElement[] { - new TestElement(model, "3.6.3.1", new TestElement[0]), - new TestElement(model, "3.6.3.2", new TestElement[0]), - new TestElement(model, "3.6.3.4", new TestElement[0]), - new TestElement(model, "3.6.3.5", new TestElement[0]), - new TestElement(model, "3.6.3.6", new TestElement[0]), - new TestElement(model, "3.6.3.7", new TestElement[0]), - new TestElement(model, "3.6.3.8", new TestElement[0]), - new TestElement(model, "3.6.3.9", new TestElement[0]), - new TestElement(model, "3.6.3.10", new TestElement[0]), - new TestElement(model, "3.6.3.11", new TestElement[0]), - new TestElement(model, "3.6.3.12", new TestElement[0]), - new TestElement(model, "3.6.3.13", new TestElement[0]), - new TestElement(model, "3.6.3.14", new TestElement[0]), - new TestElement(model, "3.6.3.15", new TestElement[0]), - new TestElement(model, "3.6.3.16", new TestElement[] { - new TestElement(model, "3.6.3.16.1", new TestElement[0]), - new TestElement(model, "3.6.3.16.2", new TestElement[0]), - new TestElement(model, "3.6.3.16.4", new TestElement[0]), - new TestElement(model, "3.6.3.16.5", new TestElement[0]), - new TestElement(model, "3.6.3.16.6", new TestElement[0]), - new TestElement(model, "3.6.3.16.7", new TestElement[0]), - new TestElement(model, "3.6.3.16.8", new TestElement[0]), - new TestElement(model, "3.6.3.16.9", new TestElement[0]), - new TestElement(model, "3.6.3.16.10", new TestElement[0]), - new TestElement(model, "3.6.3.16.11", new TestElement[0]), - new TestElement(model, "3.6.3.16.12", new TestElement[0]), - new TestElement(model, "3.6.3.16.13", new TestElement[0]), - new TestElement(model, "3.6.3.16.14", new TestElement[0]), - new TestElement(model, "3.6.3.16.15", new TestElement[0]), - new TestElement(model, "3.6.3.16.16", new TestElement[] { - new TestElement(model, "3.6.3.16.16.1", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.2", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.4", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.5", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.6", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.7", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.8", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.9", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.10", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.11", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.12", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.13", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.14", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.15", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16", new TestElement[] { - new TestElement(model, "3.6.3.16.16.16.1", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.2", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.4", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.5", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.6", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.7", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.8", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.9", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.10", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.11", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.12", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.13", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.14", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.15", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16", new TestElement[] { - new TestElement(model, "3.6.3.16.16.16.16.1", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.2", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.4", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.5", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.6", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.7", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.8", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.9", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.10", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.11", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.12", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.13", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.14", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.15", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16", new TestElement[] { - new TestElement(model, "3.6.3.16.16.16.16.16.1", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.2", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.4", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.5", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.6", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.7", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.8", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.9", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.10", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.11", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.12", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.13", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.14", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.15", new TestElement[0]), - new TestElement(model, "3.6.3.16.16.16.16.16.16", new TestElement[0]), + new TestElement(model, "3.6", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.6.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.6.3.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.4", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.5", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.6", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.7", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.8", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.9", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.10", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.11", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.12", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.13", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.14", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.15", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.4", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.5", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.6", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.7", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.8", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.9", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.10", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.11", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.12", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.13", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.14", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.15", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.4", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.5", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.6", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.7", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.8", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.9", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.10", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.11", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.12", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.13", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.14", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.15", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.4", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.5", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.6", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.7", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.8", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.9", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.10", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.11", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.12", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.13", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.14", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.15", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.4", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.5", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.6", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.7", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.8", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.9", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.10", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.11", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.12", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.13", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.14", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.15", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16", new TestElement[] { //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.4", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.5", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.6", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.7", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.8", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.9", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.10", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.11", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.12", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.13", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.14", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.15", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3.6.3.16.16.16.16.16.16", new TestElement[0]), //$NON-NLS-1$ }), }), }), diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java index 1a1f66c4c..fe151710b 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TestModelUpdatesListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * Wind River Systems - initial API and implementation * Dorin Ciuca - Top index fix (Bug 324100) + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -19,8 +20,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import junit.framework.Assert; - import org.eclipe.debug.tests.viewer.model.TestModel.TestElement; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.IJobChangeEvent; @@ -42,6 +41,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdateListener; import org.eclipse.jface.viewers.TreePath; import org.eclipse.jface.viewers.ViewerFilter; +import org.junit.Assert; public class TestModelUpdatesListener implements IViewerUpdateListener, ILabelUpdateListener, IModelChangedListener, ITestModelUpdatesListenerConstants, @@ -432,7 +432,7 @@ public class TestModelUpdatesListener public boolean isFinished(int flags) { if (isTimedOut()) { - throw new RuntimeException("Timed Out: " + toString(flags)); + throw new RuntimeException("Timed Out: " + toString(flags)); //$NON-NLS-1$ } if (fFailExpectation != null) { @@ -440,20 +440,20 @@ public class TestModelUpdatesListener } if (fJobError != null) { - throw new RuntimeException("Job Error: " + fJobError); + throw new RuntimeException("Job Error: " + fJobError); //$NON-NLS-1$ } if (fFailOnRedundantUpdates && !fRedundantUpdates.isEmpty()) { - Assert.fail("Redundant Updates: " + fRedundantUpdates.toString()); + Assert.fail("Redundant Updates: " + fRedundantUpdates.toString()); //$NON-NLS-1$ } if (fFailOnRedundantLabelUpdates && !fRedundantLabelUpdates.isEmpty()) { - Assert.fail("Redundant Label Updates: " + fRedundantLabelUpdates.toString()); + Assert.fail("Redundant Label Updates: " + fRedundantLabelUpdates.toString()); //$NON-NLS-1$ } if (fFailOnMultipleLabelUpdateSequences && fLabelUpdatesComplete > (fLabelUpdatesCompleteAtReset + 1)) { - Assert.fail("Multiple label update sequences detected"); + Assert.fail("Multiple label update sequences detected"); //$NON-NLS-1$ } if (fFailOnMultipleModelUpdateSequences && fViewerUpdatesComplete > (fViewerUpdatesCompleteAtReset + 1)) { - Assert.fail("Multiple viewer update sequences detected"); + Assert.fail("Multiple viewer update sequences detected"); //$NON-NLS-1$ } if ( (flags & LABEL_SEQUENCE_COMPLETE) != 0) { @@ -626,14 +626,14 @@ public class TestModelUpdatesListener public void viewerUpdatesBegin() { if (fViewerUpdatesStarted > fViewerUpdatesComplete) { - fFailExpectation = new RuntimeException("Unmatched updatesStarted/updateCompleted notifications observed."); + fFailExpectation = new RuntimeException("Unmatched updatesStarted/updateCompleted notifications observed."); //$NON-NLS-1$ } fViewerUpdatesStarted++; } public void viewerUpdatesComplete() { if (fViewerUpdatesStarted <= fViewerUpdatesComplete) { - fFailExpectation = new RuntimeException("Unmatched updatesStarted/updateCompleted notifications observed."); + fFailExpectation = new RuntimeException("Unmatched updatesStarted/updateCompleted notifications observed."); //$NON-NLS-1$ } fViewerUpdatesComplete++; } @@ -647,7 +647,7 @@ public class TestModelUpdatesListener !fRedundantLabelUpdateExceptions.contains(update.getElementPath())) { fRedundantLabelUpdates.add(update); - Assert.fail("Redundant update: " + update); + Assert.fail("Redundant update: " + update); //$NON-NLS-1$ } } @@ -658,14 +658,14 @@ public class TestModelUpdatesListener public void labelUpdatesBegin() { if (fLabelUpdatesStarted > fLabelUpdatesComplete) { - fFailExpectation = new RuntimeException("Unmatched labelUpdatesStarted/labelUpdateCompleted notifications observed."); + fFailExpectation = new RuntimeException("Unmatched labelUpdatesStarted/labelUpdateCompleted notifications observed."); //$NON-NLS-1$ } fLabelUpdatesStarted++; } public void labelUpdatesComplete() { if (fLabelUpdatesStarted <= fLabelUpdatesComplete) { - fFailExpectation = new RuntimeException("Unmatched labelUpdatesStarted/labelUpdateCompleted notifications observed."); + fFailExpectation = new RuntimeException("Unmatched labelUpdatesStarted/labelUpdateCompleted notifications observed."); //$NON-NLS-1$ } fLabelUpdatesComplete++; } @@ -684,13 +684,13 @@ public class TestModelUpdatesListener public void stateRestoreUpdatesBegin(Object input) { if (fExpectRestoreAfterSaveComplete && !fStateSaveComplete) { - fFailExpectation = new RuntimeException("RESTORE should begin after SAVE completed!"); + fFailExpectation = new RuntimeException("RESTORE should begin after SAVE completed!"); //$NON-NLS-1$ } fStateRestoreStarted = true; } public void stateRestoreUpdatesComplete(Object input) { - Assert.assertFalse("RESTORE STATE already complete!", fStateRestoreComplete); + Assert.assertFalse("RESTORE STATE already complete!", fStateRestoreComplete); //$NON-NLS-1$ fStateRestoreComplete = true; } @@ -712,133 +712,133 @@ public class TestModelUpdatesListener } private String toString(int flags) { - StringBuffer buf = new StringBuffer("Viewer Update Listener"); + StringBuffer buf = new StringBuffer("Viewer Update Listener"); //$NON-NLS-1$ if (fJobError != null) { - buf.append("\n\t"); - buf.append("fJobError = " + fJobError); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fJobError = " + fJobError); //$NON-NLS-1$ if (fJobError.getException() != null) { StackTraceElement[] trace = fJobError.getException().getStackTrace(); for (int i = 0; i < trace.length; i++) { - buf.append("\n\t\t"); + buf.append("\n\t\t"); //$NON-NLS-1$ buf.append(trace[i]); } } } if (fFailOnRedundantUpdates) { - buf.append("\n\t"); - buf.append("fRedundantUpdates = " + fRedundantUpdates); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fRedundantUpdates = " + fRedundantUpdates); //$NON-NLS-1$ } if ( (flags & LABEL_SEQUENCE_COMPLETE) != 0) { - buf.append("\n\t"); - buf.append("fLabelUpdatesComplete = " + fLabelUpdatesComplete); - buf.append("\n\t"); - buf.append("fLabelUpdatesCompleteAtReset = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fLabelUpdatesComplete = " + fLabelUpdatesComplete); //$NON-NLS-1$ + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fLabelUpdatesCompleteAtReset = "); //$NON-NLS-1$ buf.append( fLabelUpdatesCompleteAtReset ); } if ( (flags & LABEL_UPDATES_RUNNING) != 0) { - buf.append("\n\t"); - buf.append("fLabelUpdatesRunning = " + fLabelUpdatesCounter); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fLabelUpdatesRunning = " + fLabelUpdatesCounter); //$NON-NLS-1$ } if ( (flags & LABEL_SEQUENCE_STARTED) != 0) { - buf.append("\n\t"); - buf.append("fLabelUpdatesStarted = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fLabelUpdatesStarted = "); //$NON-NLS-1$ buf.append( fLabelUpdatesStarted ); - buf.append("\n\t"); - buf.append("fLabelUpdatesCompleted = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fLabelUpdatesCompleted = "); //$NON-NLS-1$ buf.append( fLabelUpdatesCompleted ); } if ( (flags & LABEL_UPDATES) != 0) { - buf.append("\n\t"); - buf.append("fLabelUpdates = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fLabelUpdates = "); //$NON-NLS-1$ buf.append( toString(fLabelUpdates) ); } if ( (flags & VIEWER_UPDATES_RUNNING) != 0) { - buf.append("\n\t"); - buf.append("fViewerUpdatesStarted = " + fViewerUpdatesStarted); - buf.append("\n\t"); - buf.append("fViewerUpdatesRunning = " + fViewerUpdatesCounter); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fViewerUpdatesStarted = " + fViewerUpdatesStarted); //$NON-NLS-1$ + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fViewerUpdatesRunning = " + fViewerUpdatesCounter); //$NON-NLS-1$ } if ( (flags & CONTENT_SEQUENCE_COMPLETE) != 0) { - buf.append("\n\t"); - buf.append("fViewerUpdatesComplete = " + fViewerUpdatesComplete); - buf.append("\n\t"); - buf.append("fViewerUpdatesCompleteAtReset = " + fViewerUpdatesCompleteAtReset); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fViewerUpdatesComplete = " + fViewerUpdatesComplete); //$NON-NLS-1$ + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fViewerUpdatesCompleteAtReset = " + fViewerUpdatesCompleteAtReset); //$NON-NLS-1$ } if ( (flags & HAS_CHILDREN_UPDATES_STARTED) != 0) { - buf.append("\n\t"); - buf.append("fHasChildrenUpdatesRunning = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fHasChildrenUpdatesRunning = "); //$NON-NLS-1$ buf.append( fHasChildrenUpdatesRunning ); - buf.append("\n\t"); - buf.append("fHasChildrenUpdatesCompleted = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fHasChildrenUpdatesCompleted = "); //$NON-NLS-1$ buf.append( fHasChildrenUpdatesCompleted ); } if ( (flags & HAS_CHILDREN_UPDATES) != 0) { - buf.append("\n\t"); - buf.append("fHasChildrenUpdates = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fHasChildrenUpdates = "); //$NON-NLS-1$ buf.append( toString(fHasChildrenUpdatesScheduled) ); } if ( (flags & CHILD_COUNT_UPDATES_STARTED) != 0) { - buf.append("\n\t"); - buf.append("fChildCountUpdatesRunning = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fChildCountUpdatesRunning = "); //$NON-NLS-1$ buf.append( fChildCountUpdatesRunning ); - buf.append("\n\t"); - buf.append("fChildCountUpdatesCompleted = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fChildCountUpdatesCompleted = "); //$NON-NLS-1$ buf.append( fChildCountUpdatesCompleted ); } if ( (flags & CHILD_COUNT_UPDATES) != 0) { - buf.append("\n\t"); - buf.append("fChildCountUpdates = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fChildCountUpdates = "); //$NON-NLS-1$ buf.append( toString(fChildCountUpdatesScheduled) ); } if ( (flags & CHILDREN_UPDATES_STARTED) != 0) { - buf.append("\n\t"); - buf.append("fChildrenUpdatesRunning = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fChildrenUpdatesRunning = "); //$NON-NLS-1$ buf.append( fChildrenUpdatesRunning ); - buf.append("\n\t"); - buf.append("fChildrenUpdatesCompleted = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fChildrenUpdatesCompleted = "); //$NON-NLS-1$ buf.append( fChildrenUpdatesCompleted ); } if ( (flags & CHILDREN_UPDATES) != 0) { - buf.append("\n\t"); - buf.append("fChildrenUpdates = "); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fChildrenUpdates = "); //$NON-NLS-1$ buf.append( toString(fChildrenUpdatesScheduled) ); } if ( (flags & MODEL_CHANGED_COMPLETE) != 0) { - buf.append("\n\t"); - buf.append("fModelChangedComplete = " + fModelChangedComplete); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fModelChangedComplete = " + fModelChangedComplete); //$NON-NLS-1$ } if ( (flags & STATE_SAVE_COMPLETE) != 0) { - buf.append("\n\t"); - buf.append("fStateSaveComplete = " + fStateSaveComplete); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fStateSaveComplete = " + fStateSaveComplete); //$NON-NLS-1$ } if ( (flags & STATE_RESTORE_COMPLETE) != 0) { - buf.append("\n\t"); - buf.append("fStateRestoreComplete = " + fStateRestoreComplete); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fStateRestoreComplete = " + fStateRestoreComplete); //$NON-NLS-1$ } if ( (flags & MODEL_PROXIES_INSTALLED) != 0) { - buf.append("\n\t"); - buf.append("fProxyModels = " + fProxyModels); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fProxyModels = " + fProxyModels); //$NON-NLS-1$ } if ( (flags & STATE_UPDATES) != 0) { - buf.append("\n\t"); - buf.append("fStateUpdates = " + toString(fStateUpdates)); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fStateUpdates = " + toString(fStateUpdates)); //$NON-NLS-1$ } if (fTimeoutInterval > 0) { - buf.append("\n\t"); - buf.append("fTimeoutInterval = " + fTimeoutInterval); + buf.append("\n\t"); //$NON-NLS-1$ + buf.append("fTimeoutInterval = " + fTimeoutInterval); //$NON-NLS-1$ } return buf.toString(); } private String toString(Set set) { if (set.isEmpty()) { - return "(EMPTY)"; + return "(EMPTY)"; //$NON-NLS-1$ } StringBuffer buf = new StringBuffer(); for (Iterator itr = set.iterator(); itr.hasNext(); ) { - buf.append("\n\t\t"); + buf.append("\n\t\t"); //$NON-NLS-1$ buf.append(toString((TreePath)itr.next())); } return buf.toString(); @@ -846,15 +846,15 @@ public class TestModelUpdatesListener private String toString(Map map) { if (map.isEmpty()) { - return "(EMPTY)"; + return "(EMPTY)"; //$NON-NLS-1$ } StringBuffer buf = new StringBuffer(); for (Iterator itr = map.keySet().iterator(); itr.hasNext(); ) { - buf.append("\n\t\t"); + buf.append("\n\t\t"); //$NON-NLS-1$ TreePath path = (TreePath)itr.next(); buf.append(toString(path)); Set updates = (Set)map.get(path); - buf.append(" = "); + buf.append(" = "); //$NON-NLS-1$ buf.append(updates.toString()); } return buf.toString(); @@ -862,11 +862,11 @@ public class TestModelUpdatesListener private String toString(TreePath path) { if (path.getSegmentCount() == 0) { - return "/"; + return "/"; //$NON-NLS-1$ } StringBuffer buf = new StringBuffer(); for (int i = 0; i < path.getSegmentCount(); i++) { - buf.append("/"); + buf.append("/"); //$NON-NLS-1$ buf.append(path.getSegment(i)); } return buf.toString(); diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TreePathWrapper.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TreePathWrapper.java index 23484333f..bac73a857 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TreePathWrapper.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/TreePathWrapper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 IBM Corporation and others. + * Copyright (c) 2011, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; -import junit.framework.Assert; import org.eclipse.jface.viewers.TreePath; +import org.junit.Assert; /** * Utility for comparing TreePath objects in unit tests. This wrapper prints the tree @@ -38,14 +38,14 @@ public class TreePathWrapper { public String toString() { if (fPath.getSegmentCount() == 0) { - return "TreePath:EMPTY"; + return "TreePath:EMPTY"; //$NON-NLS-1$ } - StringBuffer buf = new StringBuffer("TreePath:["); + StringBuffer buf = new StringBuffer("TreePath:["); //$NON-NLS-1$ for (int i = 0; i < fPath.getSegmentCount(); i++) { if (i != 0) { - buf.append(", "); + buf.append(", "); //$NON-NLS-1$ } buf.append(fPath.getSegment(i)); } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java index f119cd81f..2af970dc6 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/UpdateTests.java @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -76,14 +77,18 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } protected void runTest() throws Throwable { try { super.runTest(); } catch (Throwable t) { - throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); + throw new ExecutionException("Test failed: " + t.getMessage() + "\n fListener = " + fListener.toString(), t); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -102,16 +107,20 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Update the model TestElement root = model.getRootElement(); TreePath rootPath = new TreePath(new Object[] {}); TestElement[] newElements = new TestElement[] { - new TestElement(model, "1", new TestElement[0]), - new TestElement(model, "2", new TestElement[0]), - new TestElement(model, "3", new TestElement[0]), + new TestElement(model, "1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "3", new TestElement[0]), //$NON-NLS-1$ }; model.setElementChildren(rootPath, newElements); @@ -122,7 +131,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL fListener.reset(rootPath, root, -1, false, false); model.postDelta(new ModelDelta(root, IModelDelta.CONTENT)); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -141,16 +154,20 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Update the model TestElement element = model.getRootElement().getChildren()[0]; TreePath elementPath = new TreePath(new Object[] { element }); TestElement[] newChildren = new TestElement[] { - new TestElement(model, "1.1", new TestElement[0]), - new TestElement(model, "1.2", new TestElement[0]), - new TestElement(model, "1.3", new TestElement[0]), + new TestElement(model, "1.1", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "1.2", new TestElement[0]), //$NON-NLS-1$ + new TestElement(model, "1.3", new TestElement[0]), //$NON-NLS-1$ }; model.setElementChildren(elementPath, newChildren); @@ -163,7 +180,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Refresh the viewer model.postDelta(new ModelDelta(rootElement, IModelDelta.CONTENT)); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -175,7 +196,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // be processed. fListener.reset(); model.postDelta(delta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } if (validate) { model.validateData(fViewer, TreePath.EMPTY); @@ -191,11 +216,18 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL model.postDelta(delta); if (validate) { - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_SEQUENCE_COMPLETE | LABEL_SEQUENCE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_SEQUENCE_COMPLETE | LABEL_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } else { - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } } @@ -208,11 +240,18 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL model.postDelta(delta); if (validate) { - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_SEQUENCE_COMPLETE | LABEL_SEQUENCE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_SEQUENCE_COMPLETE | LABEL_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } else { - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } } @@ -227,18 +266,22 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Update the model removeElement(model, 2, true); - addElement(model, "3-new", 3, true); + addElement(model, "3-new", 3, true); //$NON-NLS-1$ removeElement(model, 4, true); - addElement(model, "5-new", 5, true); + addElement(model, "5-new", 5, true); //$NON-NLS-1$ removeElement(model, 1, true); - addElement(model, "1-new", 1, true); + addElement(model, "1-new", 1, true); //$NON-NLS-1$ removeElement(model, 3, true); - addElement(model, "4-new", 4, true); + addElement(model, "4-new", 4, true); //$NON-NLS-1$ } /** @@ -255,7 +298,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Refresh the viewer so that updates are generated. @@ -263,7 +310,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); // Wait for the delta to be processed. - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } Assert.assertTrue( fListener.isFinished(CONTENT_SEQUENCE_STARTED) ); } @@ -284,21 +335,29 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Create a listener to listen only to a children count update for the root. TestModelUpdatesListener childrenCountUpdateListener = new TestModelUpdatesListener(fViewer, false, false); for (int i = 0; i < 10; i++) { - String pass = "pass #" + i; + String pass = "pass #" + i; //$NON-NLS-1$ // Request a content update for view childrenCountUpdateListener.reset(); childrenCountUpdateListener.addChildreCountUpdate(TreePath.EMPTY); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); // Wait until the delta is processed - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } removeElement(model, 5, false); removeElement(model, 4, false); @@ -309,18 +368,24 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Wait until the children count update is completed using the count from // before elements were removed. - while (!childrenCountUpdateListener.isFinished(CHILD_COUNT_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!childrenCountUpdateListener.isFinished(CHILD_COUNT_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } - insertElement(model, "1 - " + pass, 0, false); - insertElement(model, "2 - " + pass, 1, false); - insertElement(model, "3 - " + pass, 2, false); - insertElement(model, "4 - " + pass, 3, false); - insertElement(model, "5 - " + pass, 4, false); - insertElement(model, "6 - " + pass, 5, false); + insertElement(model, "1 - " + pass, 0, false); //$NON-NLS-1$ + insertElement(model, "2 - " + pass, 1, false); //$NON-NLS-1$ + insertElement(model, "3 - " + pass, 2, false); //$NON-NLS-1$ + insertElement(model, "4 - " + pass, 3, false); //$NON-NLS-1$ + insertElement(model, "5 - " + pass, 4, false); //$NON-NLS-1$ + insertElement(model, "6 - " + pass, 5, false); //$NON-NLS-1$ - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -344,12 +409,16 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Insert element at the end of the list. final int insertIndex = model.getRootElement().getChildren().length; - ModelDelta delta = model.insertElementChild(TreePath.EMPTY, insertIndex, new TestElement(model, "last - invalid index", new TestElement[0])); + ModelDelta delta = model.insertElementChild(TreePath.EMPTY, insertIndex, new TestElement(model, "last - invalid index", new TestElement[0])); //$NON-NLS-1$ // Change insert index to out of range delta.accept(new IModelDeltaVisitor() { @@ -367,8 +436,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL fListener.reset(); model.postDelta(delta); - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_SEQUENCE_COMPLETE | LABEL_SEQUENCE_COMPLETE)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CONTENT_SEQUENCE_COMPLETE | LABEL_SEQUENCE_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); } @@ -386,7 +458,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); for (int i = 0; i < 5; i++) { @@ -397,11 +473,15 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL model.postDelta(new ModelDelta(rootElement, IModelDelta.CONTENT)); // Wait for the delta to be processed. - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES | CHILDREN_UPDATES_STARTED)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES | CHILDREN_UPDATES_STARTED)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Update the model removeElement(model, 0, true); - addElement(model, "1", 0, true); + addElement(model, "1", 0, true); //$NON-NLS-1$ } } @@ -421,7 +501,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); @@ -433,12 +517,20 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); // Wait for the delta to be processed. - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES_STARTED)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES_STARTED)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } model.setQeueueingUpdate(false); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } @@ -458,7 +550,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); @@ -470,7 +566,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); // Wait for the delta to be processed. - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES_STARTED)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES_STARTED)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } @@ -481,7 +581,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL } model.setQeueueingUpdate(false); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } /** @@ -500,7 +604,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); @@ -515,12 +623,18 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILDREN_UPDATES_STARTED)) { completeQueuedUpdatesOfType(model, IChildrenCountUpdate.class); completeQueuedUpdatesOfType(model, IHasChildrenUpdate.class); - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } } } model.setQeueueingUpdate(false); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } @@ -540,7 +654,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); @@ -555,7 +673,9 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILDREN_UPDATES_STARTED)) { completeQueuedUpdatesOfType(model, IChildrenCountUpdate.class); completeQueuedUpdatesOfType(model, IHasChildrenUpdate.class); - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } } } @@ -567,7 +687,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL } model.setQeueueingUpdate(false); - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } /** @@ -587,24 +711,36 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); // Refresh the viewer so that updates are generated. fListener.reset(); - TreePath path = model.findElement("2"); + TreePath path = model.findElement("2"); //$NON-NLS-1$ fListener.addUpdates(path, model.getElement(path), 1, CHILD_COUNT_UPDATES); fListener.addChildreUpdate(path, 0); model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); // Wait for the delta to be processed and child updates for "2" to get started. - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES | CHILDREN_UPDATES_RUNNING)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES | CHILDREN_UPDATES_RUNNING)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } // Remove element "2" removeElement(model, 1, true); // Wait for all updates to finish. - while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(ALL_UPDATES_COMPLETE)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } /** @@ -623,7 +759,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); model.setQeueueingUpdate(false); @@ -634,14 +774,21 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); // Wait for the delta to be processed. - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } TestModel model2 = new TestModel(); - model2.setRoot(new TestElement(model2, "root", new TestElement[0])); + model2.setRoot(new TestElement(model2, "root", new TestElement[0])); //$NON-NLS-1$ fViewer.setInput(model2.getRootElement()); - while (!fListener.isFinished(CONTENT_COMPLETE | VIEWER_UPDATES_RUNNING)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_COMPLETE | VIEWER_UPDATES_RUNNING)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } @@ -661,7 +808,11 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL // Set the input into the view and update the view. fViewer.setInput(model.getRootElement()); - while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } model.validateData(fViewer, TreePath.EMPTY); model.setQeueueingUpdate(false); @@ -672,12 +823,19 @@ abstract public class UpdateTests extends TestCase implements ITestModelUpdatesL model.postDelta(new ModelDelta(model.getRootElement(), IModelDelta.CONTENT)); // Wait for the delta to be processed. - while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES)) - if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(MODEL_CHANGED_COMPLETE | CHILD_COUNT_UPDATES)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } fViewer.setInput(null); - while (!fListener.isFinished(CONTENT_COMPLETE | VIEWER_UPDATES_RUNNING)) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fListener.isFinished(CONTENT_COMPLETE | VIEWER_UPDATES_RUNNING)) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerContentTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerContentTests.java index a7998c8db..6f06e6346 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerContentTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerContentTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -26,6 +27,6 @@ public class VirtualViewerContentTests extends ContentTests { } protected IInternalTreeModelViewer createViewer(Display display, Shell shell) { - return new VirtualTreeModelViewer(fDisplay, 0, new PresentationContext("TestViewer")); + return new VirtualTreeModelViewer(fDisplay, 0, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerDeltaTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerDeltaTests.java index 4614cdf99..a2ab1a21b 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerDeltaTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerDeltaTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -26,6 +27,6 @@ public class VirtualViewerDeltaTests extends DeltaTests { } protected IInternalTreeModelViewer createViewer(Display display, Shell shell) { - return new VirtualTreeModelViewer(fDisplay, 0, new PresentationContext("TestViewer")); + return new VirtualTreeModelViewer(fDisplay, 0, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerFilterTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerFilterTests.java index 969d74a21..fd584069a 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerFilterTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerFilterTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Wind River Systems and others. + * Copyright (c) 2011, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -27,6 +28,6 @@ public class VirtualViewerFilterTests extends FilterTests { } protected IInternalTreeModelViewer createViewer(Display display, Shell shell) { - return new VirtualTreeModelViewer(fDisplay, SWT.VIRTUAL, new PresentationContext("TestViewer"), new VisibleVirtualItemValidator(0, 100)); + return new VirtualTreeModelViewer(fDisplay, SWT.VIRTUAL, new PresentationContext("TestViewer"), new VisibleVirtualItemValidator(0, 100)); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerLazyModeTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerLazyModeTests.java index 5ea544562..94c370675 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerLazyModeTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerLazyModeTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -60,7 +61,7 @@ public class VirtualViewerLazyModeTests extends TestCase { * @return the viewer */ protected ITreeModelViewer createViewer(Display display, Shell shell) { - return new VirtualTreeModelViewer(display, SWT.VIRTUAL, new PresentationContext("TestViewer")); + return new VirtualTreeModelViewer(display, SWT.VIRTUAL, new PresentationContext("TestViewer")); //$NON-NLS-1$ } /** @@ -72,7 +73,11 @@ public class VirtualViewerLazyModeTests extends TestCase { // Close the shell and exit. fShell.close(); - while (!fShell.isDisposed()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0); + while (!fShell.isDisposed()) { + if (!fDisplay.readAndDispatch ()) { + Thread.sleep(0); + } + } } public void test() { diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPerformanceTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPerformanceTests.java index d0180f7f8..e21fd505b 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPerformanceTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPerformanceTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -27,7 +28,7 @@ public class VirtualViewerPerformanceTests extends PerformanceTests { } protected IInternalTreeModelViewer createViewer(Display display, Shell shell) { - return new VirtualTreeModelViewer(fDisplay, SWT.VIRTUAL, new PresentationContext("TestViewer"), fVirtualItemValidator); + return new VirtualTreeModelViewer(fDisplay, SWT.VIRTUAL, new PresentationContext("TestViewer"), fVirtualItemValidator); //$NON-NLS-1$ } protected int getTestModelDepth() { diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPopupTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPopupTests.java index 62bf033c0..4c2dcda52 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPopupTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerPopupTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -26,7 +27,7 @@ public class VirtualViewerPopupTests extends PopupTests { } protected ITreeModelViewer createViewer(Display display, Shell shell, int style) { - return new VirtualTreeModelViewer(fDisplay, style, new PresentationContext("TestViewer")); + return new VirtualTreeModelViewer(fDisplay, style, new PresentationContext("TestViewer")); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerSelectionTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerSelectionTests.java index d71140e21..a0df1576f 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerSelectionTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerSelectionTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -26,6 +27,6 @@ public class VirtualViewerSelectionTests extends SelectionTests { } protected ITreeModelViewer createViewer(Display display, Shell shell) { - return new VirtualTreeModelViewer(fDisplay, 0, new PresentationContext("TestViewer")); + return new VirtualTreeModelViewer(fDisplay, 0, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerStateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerStateTests.java index d794c3f13..b441ca685 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerStateTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerStateTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -26,6 +27,6 @@ public class VirtualViewerStateTests extends StateTests { } protected ITreeModelViewer createViewer(Display display, Shell shell) { - return new VirtualTreeModelViewer(fDisplay, 0, new PresentationContext("TestViewer")); + return new VirtualTreeModelViewer(fDisplay, 0, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerUpdateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerUpdateTests.java index 9f6013678..d1ce76967 100644 --- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerUpdateTests.java +++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/VirtualViewerUpdateTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Wind River Systems - initial API and implementation + * IBM Corporation - bug fixing *******************************************************************************/ package org.eclipe.debug.tests.viewer.model; @@ -26,6 +27,6 @@ public class VirtualViewerUpdateTests extends UpdateTests { } protected ITreeModelViewer createViewer(Display display, Shell shell) { - return new VirtualTreeModelViewer(fDisplay, 0, new PresentationContext("TestViewer")); + return new VirtualTreeModelViewer(fDisplay, 0, new PresentationContext("TestViewer")); //$NON-NLS-1$ } } diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestsPlugin.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestsPlugin.java index 6652d3339..36de236c9 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestsPlugin.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestsPlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems and others. + * Copyright (c) 2009, 2013 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -81,7 +81,7 @@ public class TestsPlugin extends AbstractUIPlugin { public File getFileInPlugin(IPath path) { try { Bundle bundle = getDefault().getBundle(); - URL installURL= new URL(bundle.getEntry("/"), path.toString()); + URL installURL = new URL(bundle.getEntry("/"), path.toString()); //$NON-NLS-1$ URL localURL= FileLocator.toFileURL(installURL);//Platform.asLocalURL(installURL); return new File(localURL.getFile()); } catch (IOException e) { diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java index 96254046e..2454caa1c 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java @@ -53,7 +53,7 @@ public class BreakpointOrderingTests extends TestCase { */ static class TestBreakpoint implements IBreakpoint { - private String fText; + private final String fText; private IMarker fMarker = null; TestBreakpoint(String text) { @@ -74,7 +74,7 @@ public class BreakpointOrderingTests extends TestCase { ResourcesPlugin.getWorkspace().run( wr, null ); } catch ( CoreException e ) { - fail("Unexpected exception: " + e.toString()); + fail("Unexpected exception: " + e.toString()); //$NON-NLS-1$ } } @@ -97,26 +97,26 @@ public class BreakpointOrderingTests extends TestCase { } public String getModelIdentifier() { - return "Test"; + return "Test"; //$NON-NLS-1$ } public boolean isEnabled() throws CoreException { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return false; } public boolean isPersisted() throws CoreException { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return false; } public boolean isRegistered() throws CoreException { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return false; } public void setEnabled(boolean enabled) throws CoreException { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } public void setMarker(IMarker marker) throws CoreException { @@ -125,16 +125,16 @@ public class BreakpointOrderingTests extends TestCase { } public void setPersisted(boolean registered) throws CoreException { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } public void setRegistered(boolean registered) throws CoreException { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } public Object getAdapter(Class adapter) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return null; } @@ -144,7 +144,7 @@ public class BreakpointOrderingTests extends TestCase { * Test only implementation of ILineBreakpoint. */ static class TestLineBreakpoint extends TestBreakpoint implements ILineBreakpoint { - private int fLineNum; + private final int fLineNum; TestLineBreakpoint(String text, int lineNum) { super(text, IBreakpoint.LINE_BREAKPOINT_MARKER); @@ -156,12 +156,12 @@ public class BreakpointOrderingTests extends TestCase { } public int getCharEnd() throws CoreException { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return 0; } public int getCharStart() throws CoreException { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return 0; } } @@ -176,38 +176,38 @@ public class BreakpointOrderingTests extends TestCase { } protected Widget doFindInputItem(Object element) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return null; } protected Widget doFindItem(Object element) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return null; } protected void doUpdateItem(Widget item, Object element, boolean fullMap) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } protected List getSelectionFromWidget() { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return null; } protected void internalRefresh(Object element) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } public void reveal(Object element) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } protected void setSelectionToWidget(List l, boolean reveal) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } public Control getControl() { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return null; }}; @@ -215,72 +215,72 @@ public class BreakpointOrderingTests extends TestCase { IDebugModelPresentation fDebugModelPres = new IDebugModelPresentation() { public void computeDetail(IValue value, IValueDetailListener listener) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } public Image getImage(Object element) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return null; } public String getText(Object element) { - assertTrue("Unexpected element", element instanceof TestBreakpoint); + assertTrue("Unexpected element", element instanceof TestBreakpoint); //$NON-NLS-1$ return ((TestBreakpoint)element).getText(); } public void setAttribute(String attribute, Object value) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } public void addListener(ILabelProviderListener listener) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } public void dispose() { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } public boolean isLabelProperty(Object element, String property) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return false; } public void removeListener(ILabelProviderListener listener) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ } public String getEditorId(IEditorInput input, Object element) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return null; } public IEditorInput getEditorInput(Object element) { - fail("not implemented in test"); + fail("not implemented in test"); //$NON-NLS-1$ return null; }}; // Test vector with some UNIX paths TestBreakpoint[] createTestBreakpoints0() { TestBreakpoint[] fTestBps = { - new TestBreakpoint(""), - new TestBreakpoint("/file/text.c"), - new TestBreakpoint("/file/text.c:1"), - new TestLineBreakpoint("", 0), - new TestLineBreakpoint("/file/text.c", 0), - new TestLineBreakpoint("/file/text.c", 1), - new TestLineBreakpoint("/file/text.c:", 0), - new TestLineBreakpoint("/file/text.c:0", 0), - new TestLineBreakpoint("/file/text.c:1", 1), - new TestLineBreakpoint("/file/text.c:0002", 2), - new TestLineBreakpoint("/file/text.c:3xxx", 3), - new TestLineBreakpoint("/file/text.c:10xxx", 10), - new TestLineBreakpoint("/file/text.c:a_01", 1), - new TestLineBreakpoint("/file/text.c:a_01a", 1), - new TestLineBreakpoint("/file/text.c:a_09", 9), - new TestLineBreakpoint("/file/text.c:a_09a", 9), - new TestLineBreakpoint("/file/text.c:a_011", 11), - new TestLineBreakpoint("/file/text.c:a_011a", 11), - new TestLineBreakpoint("/file/text.c:y", 0), + new TestBreakpoint(""), //$NON-NLS-1$ + new TestBreakpoint("/file/text.c"), //$NON-NLS-1$ + new TestBreakpoint("/file/text.c:1"), //$NON-NLS-1$ + new TestLineBreakpoint("", 0), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c", 0), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c", 1), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:", 0), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:0", 0), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:1", 1), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:0002", 2), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:3xxx", 3), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:10xxx", 10), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:a_01", 1), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:a_01a", 1), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:a_09", 9), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:a_09a", 9), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:a_011", 11), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:a_011a", 11), //$NON-NLS-1$ + new TestLineBreakpoint("/file/text.c:y", 0), //$NON-NLS-1$ }; return fTestBps; } @@ -288,19 +288,19 @@ public class BreakpointOrderingTests extends TestCase { // Check plain numbers TestBreakpoint[] createTestBreakpoints1() { TestBreakpoint[] fTestBps = { - new TestLineBreakpoint("0", 0), - new TestLineBreakpoint("1", 1), - new TestLineBreakpoint("1_a", 1), - new TestLineBreakpoint("001_b", 1), - new TestLineBreakpoint("01_c", 1), - new TestLineBreakpoint("3", 3), - new TestLineBreakpoint("10", 10), - new TestLineBreakpoint("11", 11), - new TestLineBreakpoint("20", 20), - new TestLineBreakpoint("110", 110), - new TestLineBreakpoint("112", 112), - new TestLineBreakpoint("112a", 112), - new TestLineBreakpoint("112b", 112), + new TestLineBreakpoint("0", 0), //$NON-NLS-1$ + new TestLineBreakpoint("1", 1), //$NON-NLS-1$ + new TestLineBreakpoint("1_a", 1), //$NON-NLS-1$ + new TestLineBreakpoint("001_b", 1), //$NON-NLS-1$ + new TestLineBreakpoint("01_c", 1), //$NON-NLS-1$ + new TestLineBreakpoint("3", 3), //$NON-NLS-1$ + new TestLineBreakpoint("10", 10), //$NON-NLS-1$ + new TestLineBreakpoint("11", 11), //$NON-NLS-1$ + new TestLineBreakpoint("20", 20), //$NON-NLS-1$ + new TestLineBreakpoint("110", 110), //$NON-NLS-1$ + new TestLineBreakpoint("112", 112), //$NON-NLS-1$ + new TestLineBreakpoint("112a", 112), //$NON-NLS-1$ + new TestLineBreakpoint("112b", 112), //$NON-NLS-1$ }; return fTestBps; } @@ -308,13 +308,13 @@ public class BreakpointOrderingTests extends TestCase { // Test consistent behavior with leading 0's TestBreakpoint[] createTestBreakpoints2() { TestBreakpoint[] fTestBps = { - new TestLineBreakpoint("0", 0), - new TestLineBreakpoint("00", 0), - new TestLineBreakpoint("0000", 0), - new TestLineBreakpoint("0001", 1), - new TestLineBreakpoint("0010", 10), - new TestLineBreakpoint("1000", 1000), - new TestLineBreakpoint("10000", 10000), + new TestLineBreakpoint("0", 0), //$NON-NLS-1$ + new TestLineBreakpoint("00", 0), //$NON-NLS-1$ + new TestLineBreakpoint("0000", 0), //$NON-NLS-1$ + new TestLineBreakpoint("0001", 1), //$NON-NLS-1$ + new TestLineBreakpoint("0010", 10), //$NON-NLS-1$ + new TestLineBreakpoint("1000", 1000), //$NON-NLS-1$ + new TestLineBreakpoint("10000", 10000), //$NON-NLS-1$ }; return fTestBps; } @@ -322,10 +322,10 @@ public class BreakpointOrderingTests extends TestCase { // Test Win32 paths TestBreakpoint[] createTestBreakpoints3() { TestBreakpoint[] fTestBps = { - new TestLineBreakpoint(":a", 0), - new TestLineBreakpoint("c:\\file\\text.c:1", 1), - new TestLineBreakpoint("c:\\file\\text.c:2", 2), - new TestLineBreakpoint("d:\\file\\text.c:3", 3), + new TestLineBreakpoint(":a", 0), //$NON-NLS-1$ + new TestLineBreakpoint("c:\\file\\text.c:1", 1), //$NON-NLS-1$ + new TestLineBreakpoint("c:\\file\\text.c:2", 2), //$NON-NLS-1$ + new TestLineBreakpoint("d:\\file\\text.c:3", 3), //$NON-NLS-1$ }; return fTestBps; } @@ -360,11 +360,11 @@ public class BreakpointOrderingTests extends TestCase { boolean equalCheck = (res == 0) == (inner == outer); boolean ltCheck = (res < 0) == (inner < outer); if (!equalCheck) { - System.err.println("Equal Comparison in between " + inner + " and " + outer + " ("+testBps[inner].getText()+ " and "+testBps[outer].getText()+") failed" ); + System.err.println("Equal Comparison in between " + inner + " and " + outer + " (" + testBps[inner].getText() + " and " + testBps[outer].getText() + ") failed"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ failed = true; } if (!ltCheck) { - System.err.println("Less Comparison in between " + inner + " and " + outer + " ("+testBps[inner].getText()+ " and "+testBps[outer].getText()+") failed" ); + System.err.println("Less Comparison in between " + inner + " and " + outer + " (" + testBps[inner].getText() + " and " + testBps[outer].getText() + ") failed"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ failed = true; } } diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java index 927632bcc..7238c93f7 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -181,12 +181,12 @@ public class ExpressionManagerTests extends TestCase { manager.addExpressionListener(single); manager.addExpressionListener(multi); try { - IWatchExpression exp1 = manager.newWatchExpression("exp1"); - IWatchExpression exp2 = manager.newWatchExpression("exp2"); - IWatchExpression exp3 = manager.newWatchExpression("exp3"); + IWatchExpression exp1 = manager.newWatchExpression("exp1"); //$NON-NLS-1$ + IWatchExpression exp2 = manager.newWatchExpression("exp2"); //$NON-NLS-1$ + IWatchExpression exp3 = manager.newWatchExpression("exp3"); //$NON-NLS-1$ manager.addExpressions(new IExpression[]{exp1, exp2, exp3}); IExpression[] expressions = manager.getExpressions(); - assertEquals("Wrong number of expressions", 3, expressions.length); + assertEquals("Wrong number of expressions", 3, expressions.length); //$NON-NLS-1$ assertEquals(single.addedCallbacks, 3); assertEquals(3, single.added.size()); assertEquals(0, single.added.indexOf(exp1)); @@ -216,13 +216,13 @@ public class ExpressionManagerTests extends TestCase { manager.addExpressionListener(single); manager.addExpressionListener(multi); try { - IWatchExpression exp1 = manager.newWatchExpression("exp1"); - IWatchExpression exp2 = manager.newWatchExpression("exp2"); - IWatchExpression exp3 = manager.newWatchExpression("exp3"); + IWatchExpression exp1 = manager.newWatchExpression("exp1"); //$NON-NLS-1$ + IWatchExpression exp2 = manager.newWatchExpression("exp2"); //$NON-NLS-1$ + IWatchExpression exp3 = manager.newWatchExpression("exp3"); //$NON-NLS-1$ manager.addExpressions(new IExpression[]{exp1, exp2, exp3}); manager.removeExpressions(new IExpression[]{exp1, exp3}); IExpression[] expressions = manager.getExpressions(); - assertEquals("Wrong number of expressions", 1, expressions.length); + assertEquals("Wrong number of expressions", 1, expressions.length); //$NON-NLS-1$ assertEquals(single.addedCallbacks, 3); assertEquals(3, single.added.size()); assertEquals(0, single.added.indexOf(exp1)); @@ -256,14 +256,14 @@ public class ExpressionManagerTests extends TestCase { manager.addExpressionListener(single); manager.addExpressionListener(multi); try { - IWatchExpression exp1 = manager.newWatchExpression("exp1"); - IWatchExpression exp2 = manager.newWatchExpression("exp2"); - IWatchExpression exp3 = manager.newWatchExpression("exp3"); + IWatchExpression exp1 = manager.newWatchExpression("exp1"); //$NON-NLS-1$ + IWatchExpression exp2 = manager.newWatchExpression("exp2"); //$NON-NLS-1$ + IWatchExpression exp3 = manager.newWatchExpression("exp3"); //$NON-NLS-1$ manager.addExpressions(new IExpression[]{exp1, exp2, exp3}); IExpression[] expressions = manager.getExpressions(); exp1.setEnabled(false); - exp2.setExpressionText("exp2changed"); - assertEquals("Wrong number of expressions", 3, expressions.length); + exp2.setExpressionText("exp2changed"); //$NON-NLS-1$ + assertEquals("Wrong number of expressions", 3, expressions.length); //$NON-NLS-1$ assertEquals(single.addedCallbacks, 3); assertEquals(3, single.added.size()); assertEquals(0, single.added.indexOf(exp1)); @@ -296,14 +296,14 @@ public class ExpressionManagerTests extends TestCase { MultiListener multi = new MultiListener(); InsertMoveListener insert = new InsertMoveListener(); try { - IWatchExpression exp1 = manager.newWatchExpression("exp1"); - IWatchExpression exp2 = manager.newWatchExpression("exp2"); - IWatchExpression exp3 = manager.newWatchExpression("exp3"); - IWatchExpression exp4 = manager.newWatchExpression("exp4"); - IWatchExpression exp5 = manager.newWatchExpression("exp5"); + IWatchExpression exp1 = manager.newWatchExpression("exp1"); //$NON-NLS-1$ + IWatchExpression exp2 = manager.newWatchExpression("exp2"); //$NON-NLS-1$ + IWatchExpression exp3 = manager.newWatchExpression("exp3"); //$NON-NLS-1$ + IWatchExpression exp4 = manager.newWatchExpression("exp4"); //$NON-NLS-1$ + IWatchExpression exp5 = manager.newWatchExpression("exp5"); //$NON-NLS-1$ manager.addExpressions(new IExpression[]{exp1, exp2, exp3}); IExpression[] expressions = manager.getExpressions(); - assertEquals("Wrong number of expressions", 3, expressions.length); + assertEquals("Wrong number of expressions", 3, expressions.length); //$NON-NLS-1$ assertEquals(0, indexOf(exp1, expressions)); assertEquals(1, indexOf(exp2, expressions)); assertEquals(2, indexOf(exp3, expressions)); @@ -330,7 +330,7 @@ public class ExpressionManagerTests extends TestCase { assertEquals(1, insert.inserted.indexOf(exp5)); expressions = manager.getExpressions(); - assertEquals("Wrong number of expressions", 5, expressions.length); + assertEquals("Wrong number of expressions", 5, expressions.length); //$NON-NLS-1$ assertEquals(0, indexOf(exp1, expressions)); assertEquals(1, indexOf(exp4, expressions)); assertEquals(2, indexOf(exp5, expressions)); @@ -353,14 +353,14 @@ public class ExpressionManagerTests extends TestCase { MultiListener multi = new MultiListener(); InsertMoveListener insert = new InsertMoveListener(); try { - IWatchExpression exp1 = manager.newWatchExpression("exp1"); - IWatchExpression exp2 = manager.newWatchExpression("exp2"); - IWatchExpression exp3 = manager.newWatchExpression("exp3"); - IWatchExpression exp4 = manager.newWatchExpression("exp4"); - IWatchExpression exp5 = manager.newWatchExpression("exp5"); + IWatchExpression exp1 = manager.newWatchExpression("exp1"); //$NON-NLS-1$ + IWatchExpression exp2 = manager.newWatchExpression("exp2"); //$NON-NLS-1$ + IWatchExpression exp3 = manager.newWatchExpression("exp3"); //$NON-NLS-1$ + IWatchExpression exp4 = manager.newWatchExpression("exp4"); //$NON-NLS-1$ + IWatchExpression exp5 = manager.newWatchExpression("exp5"); //$NON-NLS-1$ manager.addExpressions(new IExpression[]{exp1, exp2, exp3}); IExpression[] expressions = manager.getExpressions(); - assertEquals("Wrong number of expressions", 3, expressions.length); + assertEquals("Wrong number of expressions", 3, expressions.length); //$NON-NLS-1$ assertEquals(0, indexOf(exp1, expressions)); assertEquals(1, indexOf(exp2, expressions)); assertEquals(2, indexOf(exp3, expressions)); @@ -387,7 +387,7 @@ public class ExpressionManagerTests extends TestCase { assertEquals(1, insert.inserted.indexOf(exp5)); expressions = manager.getExpressions(); - assertEquals("Wrong number of expressions", 5, expressions.length); + assertEquals("Wrong number of expressions", 5, expressions.length); //$NON-NLS-1$ assertEquals(0, indexOf(exp1, expressions)); assertEquals(1, indexOf(exp2, expressions)); assertEquals(2, indexOf(exp4, expressions)); @@ -410,11 +410,11 @@ public class ExpressionManagerTests extends TestCase { MultiListener multi = new MultiListener(); InsertMoveListener insert = new InsertMoveListener(); try { - IWatchExpression exp1 = manager.newWatchExpression("exp1"); - IWatchExpression exp2 = manager.newWatchExpression("exp2"); - IWatchExpression exp3 = manager.newWatchExpression("exp3"); - IWatchExpression exp4 = manager.newWatchExpression("exp4"); - IWatchExpression exp5 = manager.newWatchExpression("exp5"); + IWatchExpression exp1 = manager.newWatchExpression("exp1"); //$NON-NLS-1$ + IWatchExpression exp2 = manager.newWatchExpression("exp2"); //$NON-NLS-1$ + IWatchExpression exp3 = manager.newWatchExpression("exp3"); //$NON-NLS-1$ + IWatchExpression exp4 = manager.newWatchExpression("exp4"); //$NON-NLS-1$ + IWatchExpression exp5 = manager.newWatchExpression("exp5"); //$NON-NLS-1$ manager.addExpressions(new IExpression[]{exp1, exp2, exp3, exp4, exp5}); // add listeners manager.addExpressionListener(single); @@ -437,7 +437,7 @@ public class ExpressionManagerTests extends TestCase { assertEquals(2, insert.insertIndex); IExpression[] expressions = manager.getExpressions(); - assertEquals("Wrong number of expressions", 5, expressions.length); + assertEquals("Wrong number of expressions", 5, expressions.length); //$NON-NLS-1$ assertEquals(0, indexOf(exp3, expressions)); assertEquals(1, indexOf(exp4, expressions)); assertEquals(2, indexOf(exp1, expressions)); @@ -460,11 +460,11 @@ public class ExpressionManagerTests extends TestCase { MultiListener multi = new MultiListener(); InsertMoveListener insert = new InsertMoveListener(); try { - IWatchExpression exp1 = manager.newWatchExpression("exp1"); - IWatchExpression exp2 = manager.newWatchExpression("exp2"); - IWatchExpression exp3 = manager.newWatchExpression("exp3"); - IWatchExpression exp4 = manager.newWatchExpression("exp4"); - IWatchExpression exp5 = manager.newWatchExpression("exp5"); + IWatchExpression exp1 = manager.newWatchExpression("exp1"); //$NON-NLS-1$ + IWatchExpression exp2 = manager.newWatchExpression("exp2"); //$NON-NLS-1$ + IWatchExpression exp3 = manager.newWatchExpression("exp3"); //$NON-NLS-1$ + IWatchExpression exp4 = manager.newWatchExpression("exp4"); //$NON-NLS-1$ + IWatchExpression exp5 = manager.newWatchExpression("exp5"); //$NON-NLS-1$ manager.addExpressions(new IExpression[]{exp1, exp2, exp3, exp4, exp5}); // add listeners manager.addExpressionListener(single); @@ -487,7 +487,7 @@ public class ExpressionManagerTests extends TestCase { assertEquals(1, insert.insertIndex); IExpression[] expressions = manager.getExpressions(); - assertEquals("Wrong number of expressions", 5, expressions.length); + assertEquals("Wrong number of expressions", 5, expressions.length); //$NON-NLS-1$ assertEquals(0, indexOf(exp3, expressions)); assertEquals(1, indexOf(exp1, expressions)); assertEquals(2, indexOf(exp2, expressions)); @@ -506,23 +506,23 @@ public class ExpressionManagerTests extends TestCase { */ public void testPersistExpressions() { ExpressionManager manager = (ExpressionManager) getManager(); - IWatchExpression exp1 = manager.newWatchExpression("exp1"); - IWatchExpression exp2 = manager.newWatchExpression("exp2"); - IWatchExpression exp3 = manager.newWatchExpression("exp3"); - IWatchExpression exp4 = manager.newWatchExpression("exp4"); - IWatchExpression exp5 = manager.newWatchExpression("exp5"); + IWatchExpression exp1 = manager.newWatchExpression("exp1"); //$NON-NLS-1$ + IWatchExpression exp2 = manager.newWatchExpression("exp2"); //$NON-NLS-1$ + IWatchExpression exp3 = manager.newWatchExpression("exp3"); //$NON-NLS-1$ + IWatchExpression exp4 = manager.newWatchExpression("exp4"); //$NON-NLS-1$ + IWatchExpression exp5 = manager.newWatchExpression("exp5"); //$NON-NLS-1$ manager.addExpressions(new IExpression[]{exp1, exp2, exp3, exp4, exp5}); manager.storeWatchExpressions(); // create a new manager that will restore the expressions ExpressionManager manager2 = new ExpressionManager(); IExpression[] expressions = manager2.getExpressions(); - assertEquals("Wrong number of expressions", 5, expressions.length); - assertEquals("exp1", expressions[0].getExpressionText()); - assertEquals("exp2", expressions[1].getExpressionText()); - assertEquals("exp3", expressions[2].getExpressionText()); - assertEquals("exp4", expressions[3].getExpressionText()); - assertEquals("exp5", expressions[4].getExpressionText()); + assertEquals("Wrong number of expressions", 5, expressions.length); //$NON-NLS-1$ + assertEquals("exp1", expressions[0].getExpressionText()); //$NON-NLS-1$ + assertEquals("exp2", expressions[1].getExpressionText()); //$NON-NLS-1$ + assertEquals("exp3", expressions[2].getExpressionText()); //$NON-NLS-1$ + assertEquals("exp4", expressions[3].getExpressionText()); //$NON-NLS-1$ + assertEquals("exp5", expressions[4].getExpressionText()); //$NON-NLS-1$ } /** diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/statushandlers/StatusHandlerTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/statushandlers/StatusHandlerTests.java index 9b560c30c..e1c68a0c9 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/statushandlers/StatusHandlerTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/statushandlers/StatusHandlerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 IBM Corporation and others. + * Copyright (c) 2009, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,15 +29,15 @@ public class StatusHandlerTests extends TestCase { /** * Status for which a handler is registered. */ - public static final IStatus STATUS = new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID, 333,"", null); + public static final IStatus STATUS = new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID, 333, "", null); //$NON-NLS-1$ /** * Tests that a status handler extension exists */ public void testStatusHandlerExtension() { IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(STATUS); - assertNotNull("missing status handler extension", handler); - assertTrue("Unexpected handler", handler instanceof StatusHandler); + assertNotNull("missing status handler extension", handler); //$NON-NLS-1$ + assertTrue("Unexpected handler", handler instanceof StatusHandler); //$NON-NLS-1$ } /** @@ -47,7 +47,7 @@ public class StatusHandlerTests extends TestCase { try { Preferences.setBoolean(DebugPlugin.getUniqueIdentifier(), IInternalDebugCoreConstants.PREF_ENABLE_STATUS_HANDLERS, false, InstanceScope.INSTANCE); IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(STATUS); - assertNull("status handler extension should be disabled", handler); + assertNull("status handler extension should be disabled", handler); //$NON-NLS-1$ } finally { Preferences.setBoolean(DebugPlugin.getUniqueIdentifier(), IInternalDebugCoreConstants.PREF_ENABLE_STATUS_HANDLERS, true, InstanceScope.INSTANCE); } diff --git a/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs index 32accb991..5d7a22fe3 100644 --- a/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs @@ -8,6 +8,7 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault @@ -52,7 +53,9 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled @@ -69,6 +72,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error @@ -89,6 +93,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -113,11 +118,292 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.3 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_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_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_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +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.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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 +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_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=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_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_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_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.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.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_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 diff --git a/org.eclipse.debug.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.debug.ui/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..13d5dca2c --- /dev/null +++ b/org.eclipse.debug.ui/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,109 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_Platform Debug 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_settings_version=12 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=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 +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +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.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +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 +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=true +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_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/org.eclipse.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.debug.ui/META-INF/MANIFEST.MF index d5bbbaa64..b069c2af8 100644 --- a/org.eclipse.debug.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.debug.ui; singleton:=true -Bundle-Version: 3.9.0.qualifier +Bundle-Version: 3.9.100.qualifier Bundle-Activator: org.eclipse.debug.internal.ui.DebugUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.debug.ui/pom.xml b/org.eclipse.debug.ui/pom.xml index e04d88b42..03457df19 100644 --- a/org.eclipse.debug.ui/pom.xml +++ b/org.eclipse.debug.ui/pom.xml @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.debug</groupId> <artifactId>org.eclipse.debug.ui</artifactId> - <version>3.9.0-SNAPSHOT</version> + <version>3.9.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPerspectiveFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPerspectiveFactory.java index 93b2f7d17..12f0af24b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPerspectiveFactory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPerspectiveFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,7 +35,7 @@ public class DebugPerspectiveFactory implements IPerspectiveFactory { IFolderLayout navFolder= layout.createFolder(IInternalDebugUIConstants.ID_NAVIGATOR_FOLDER_VIEW, IPageLayout.TOP, (float) 0.45, layout.getEditorArea()); navFolder.addView(IDebugUIConstants.ID_DEBUG_VIEW); - navFolder.addPlaceholder(IPageLayout.ID_RES_NAV); + navFolder.addPlaceholder(IPageLayout.ID_PROJECT_EXPLORER); IFolderLayout toolsFolder= layout.createFolder(IInternalDebugUIConstants.ID_TOOLS_FOLDER_VIEW, IPageLayout.RIGHT, (float) 0.50, IInternalDebugUIConstants.ID_NAVIGATOR_FOLDER_VIEW); toolsFolder.addView(IDebugUIConstants.ID_VARIABLE_VIEW); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneWordWrapAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneWordWrapAction.java index 107ca9876..f8bb07b1b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneWordWrapAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneWordWrapAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.actions.variables.details; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; import org.eclipse.debug.internal.ui.actions.ActionMessages; @@ -18,6 +20,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.text.ITextViewer; import org.eclipse.ui.PlatformUI; +import org.osgi.service.prefs.BackingStoreException; /** * An check box action that allows the word wrap property to be set, determining if the detail pane @@ -38,8 +41,6 @@ public class DetailPaneWordWrapAction extends Action { boolean prefSetting = DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IDebugPreferenceConstants.PREF_DETAIL_PANE_WORD_WRAP); fTextViewer.getTextWidget().setWordWrap(prefSetting); setChecked(prefSetting); - - } /* (non-Javadoc) @@ -47,8 +48,14 @@ public class DetailPaneWordWrapAction extends Action { */ public void run() { fTextViewer.getTextWidget().setWordWrap(isChecked()); - DebugUIPlugin.getDefault().getPreferenceStore().setValue(IDebugPreferenceConstants.PREF_DETAIL_PANE_WORD_WRAP,isChecked()); - DebugUIPlugin.getDefault().savePluginPreferences(); + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); + if(node != null) { + try { + node.putBoolean(IDebugPreferenceConstants.PREF_DETAIL_PANE_WORD_WRAP, isChecked()); + node.flush(); + } catch (BackingStoreException e) { + DebugUIPlugin.log(e); + } + } } - } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java index 845733b8a..181d6ebf4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,8 +10,10 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.commands.actions; -import org.eclipse.core.runtime.Preferences.IPropertyChangeListener; -import org.eclipse.core.runtime.Preferences.PropertyChangeEvent; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; +import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.commands.IStepFiltersHandler; import org.eclipse.debug.internal.core.StepFilterManager; @@ -30,7 +32,7 @@ import org.eclipse.ui.IWorkbenchWindow; /** * This class provides the action for toggling step filters on or off for the debug view */ -public class ToggleStepFiltersAction extends DebugCommandAction implements IPropertyChangeListener { +public class ToggleStepFiltersAction extends DebugCommandAction implements IPreferenceChangeListener { private boolean fInitialized = !DebugUITools.isUseStepFilters(); @@ -150,7 +152,10 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IProp * Initializes the state, by adding this action as a property listener */ protected void initState() { - DebugPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(this); + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugPlugin.getUniqueIdentifier()); + if (node != null) { + node.addPreferenceChangeListener(this); + } } /** @@ -158,22 +163,20 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IProp */ public void dispose() { super.dispose(); - DebugPlugin.getDefault().getPluginPreferences().removePropertyChangeListener(this); + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugPlugin.getUniqueIdentifier()); + if (node != null) { + node.removePreferenceChangeListener(this); + } } - /** - * @see org.eclipse.core.runtime.Preferences$IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent) - */ - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(StepFilterManager.PREF_USE_STEP_FILTERS)) { + public void preferenceChange(PreferenceChangeEvent event) { + if (event.getKey().equals(StepFilterManager.PREF_USE_STEP_FILTERS)) { boolean checked = DebugUITools.isUseStepFilters(); setChecked(checked); IAction action = getActionProxy(); if (action != null) { action.setChecked(checked); } - } + } } - - } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java index 0551c39fa..80585cc0e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/launchconfigurations/ExportLaunchConfigurationsWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 IBM Corporation and others. + * Copyright (c) 2007, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -117,7 +117,7 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { private CheckboxTreeViewer fViewer = null; private Text fFilePath = null; private Button fOverwrite = null; - + private ConfigContentProvider fContentProvider = null; /** * Constructor */ @@ -157,7 +157,8 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { fViewer = new CheckboxTreeViewer(tree); fViewer.setLabelProvider(DebugUITools.newDebugModelPresentation()); fViewer.setComparator(new WorkbenchViewerComparator()); - fViewer.setContentProvider(new ConfigContentProvider()); + fContentProvider = new ConfigContentProvider(); + fViewer.setContentProvider(fContentProvider); fViewer.setInput(DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationTypes()); //we don't want to see builders.... fViewer.addFilter(new LaunchCategoryFilter(IInternalDebugUIConstants.ID_EXTERNAL_TOOL_BUILDER_LAUNCH_CATEGORY)); @@ -174,14 +175,20 @@ public class ExportLaunchConfigurationsWizardPage extends WizardPage { Button button = SWTFactory.createPushButton(buttoncomp, WizardMessages.ExportLaunchConfigurationsWizardPage_8, null); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - fViewer.setAllChecked(true); + Object[] items = fContentProvider.getElements(fViewer.getInput()); + for (int i = 0; i < items.length; i++) { + fViewer.setSubtreeChecked(items[i], true); + } setPageComplete(isComplete()); } }); button = SWTFactory.createPushButton(buttoncomp, WizardMessages.ExportLaunchConfigurationsWizardPage_9, null); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - fViewer.setAllChecked(false); + Object[] items = fContentProvider.getElements(fViewer.getInput()); + for (int i = 0; i < items.length; i++) { + fViewer.setSubtreeChecked(items[i], false); + } setPageComplete(isComplete()); } }); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/IPersistableDebugElement.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/IPersistableDebugElement.java index 338db1a96..70bf29578 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/IPersistableDebugElement.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/IPersistableDebugElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.debug.internal.ui.memory; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Preferences.IPropertyChangeListener; /** * Represents an element that is capable of persisting properties. @@ -47,17 +46,4 @@ public interface IPersistableDebugElement { */ public boolean supportsProperty(Object context, String propertyId); - /** - * Add the property change listener to the persistable. The listener will - * be notified when properties have changed from the peristable element. - * @param listener is the listener to add - */ - public void addPropertyChangeListener(IPropertyChangeListener listener); - - /** - * Remove the property change listener from the persistable. The listener will - * no longer be notified when properties are changed from the persistable element. - * @param listener is the listener to remove - */ - public void removePropertyChangeListener(IPropertyChangeListener listener); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java index 24fc22883..1f342680b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -361,6 +361,9 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I String modeString= fmodes.size() == 1 ? fmodes.get(0).toString() : fmodes.toString(); SWTFactory.createLabel(parent, modeString + ":", 1); //$NON-NLS-1$ combo = SWTFactory.createCombo(parent, SWT.READ_ONLY, 1, fgPerspectiveLabels); + if(combo == null) { + continue; + } String text = getComboSelection(smodes); if(text != null) { combo.setText(text); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java index 239ed8bf3..829ae860e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java @@ -76,11 +76,10 @@ import org.eclipse.ui.IMemento; * * @since 3.3 */ -public class InternalTreeModelViewer extends TreeViewer - implements IInternalTreeModelViewer, org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer +public class InternalTreeModelViewer extends TreeViewer implements IInternalTreeModelViewer, org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer { - private IPresentationContext fContext; + private final IPresentationContext fContext; /** * Current column presentation or <code>null</code> @@ -91,25 +90,25 @@ public class InternalTreeModelViewer extends TreeViewer * Map of columns presentation id to its visible columns id's (String[]) * When a columns presentation is not in the map, default settings are used. */ - private Map fVisibleColumns = new HashMap(); + private final Map fVisibleColumns = new HashMap(); /** * Map of column id's to persisted sizes */ - private Map fColumnSizes = new HashMap(); + private final Map fColumnSizes = new HashMap(); /** * Map of column presentation id's to an array of integers representing the column order * for that presentation, or <code>null</code> if default. */ - private Map fColumnOrder = new HashMap(); + private final Map fColumnOrder = new HashMap(); /** * Map of column presentation id to whether columns should be displayed * for that presentation (the user can toggle columns on/off when a * presentation is optional. */ - private Map fShowColumns = new HashMap(); + private final Map fShowColumns = new HashMap(); /** * Item's tree path cache @@ -176,7 +175,7 @@ public class InternalTreeModelViewer extends TreeViewer } } - private ColumnListener fListener = new ColumnListener(); + private final ColumnListener fListener = new ColumnListener(); /** * Proxy to cell modifier/editor support @@ -259,7 +258,7 @@ public class InternalTreeModelViewer extends TreeViewer } - private CellModifierProxy fCellModifier; + private final CellModifierProxy fCellModifier; /** @@ -739,8 +738,9 @@ public class InternalTreeModelViewer extends TreeViewer int treeWidgetWidth = tree.getSize().x; int avg = treeWidgetWidth; - if (visibleColumnIds != null) - avg /= visibleColumnIds.length; + if (visibleColumnIds != null) { + avg /= visibleColumnIds.length; + } if (avg == 0) { tree.addPaintListener(new PaintListener() { @@ -809,7 +809,9 @@ public class InternalTreeModelViewer extends TreeViewer for (int i = 0; i < columns.length; i++) { boolean columnAvailable = false; for (int j = 0; j < available.length; j++) { - if (columns[i].equals(available[j])) columnAvailable = true; + if (columns[i].equals(available[j])) { + columnAvailable = true; + } } if (!columnAvailable || presentation.getHeader(columns[i]) == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java index 2f29050b3..d4bcd72ba 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java @@ -30,8 +30,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Preferences.IPropertyChangeListener; -import org.eclipse.core.runtime.Preferences.PropertyChangeEvent; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; +import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; @@ -68,17 +70,17 @@ import org.w3c.dom.NodeList; * * @since 3.2 */ -public class ViewContextService implements IDebugContextListener, IPerspectiveListener4, IPropertyChangeListener, IContextManagerListener { +public class ViewContextService implements IDebugContextListener, IPerspectiveListener4, IPreferenceChangeListener, IContextManagerListener { /** * Maps the perspectives in this window to its last activated workbench context */ - private Map fPerspectiveToActiveContext = new HashMap(); + private final Map fPerspectiveToActiveContext = new HashMap(); /** * Map of the perspectives to all workbench contexts activated in that perspective */ - private Map fPerspectiveToActivatedContexts = new HashMap(); + private final Map fPerspectiveToActivatedContexts = new HashMap(); /** * Map of context id's to context view bindings @@ -101,9 +103,9 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi */ private IWorkbenchWindow fWindow; - private IContextService fContextService; + private final IContextService fContextService; - private IDebugContextService fDebugContextService; + private final IDebugContextService fDebugContextService; /** * Perspective that is currently being de-activated. Used to determine @@ -156,7 +158,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi private class DebugContextViewBindings { // context id - private String fId; + private final String fId; // list of view bindings id's specific to this context private String[] fViewBindingIds = EMPTY_IDS; @@ -164,7 +166,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi // all bindings including inherited bindings, top down in activation order private String[] fAllViewBindingIds = null; // associated binding to activate - private Map fAllViewIdToBindings = new HashMap(); + private final Map fAllViewIdToBindings = new HashMap(); // all context id's in this context hierarchy (top down order) private String[] fAllConetxtIds = null; @@ -367,19 +369,19 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * Information for a view */ private class ViewBinding { - private IConfigurationElement fElement; + private final IConfigurationElement fElement; /** * Set of perspectives this view was opened in by the user */ - private Set fUserOpened = new HashSet(); + private final Set fUserOpened = new HashSet(); /** * Set of perspectives this view was closed in by the user */ - private Set fUserClosed = new HashSet(); + private final Set fUserClosed = new HashSet(); /** * Set of perspectives this view was auto-opened by view management. */ - private Set fAutoOpened = new HashSet(); + private final Set fAutoOpened = new HashSet(); public ViewBinding(IConfigurationElement element) { fElement = element; @@ -623,7 +625,10 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi loadPerspectives(); window.addPerspectiveListener(this); getDebugContextService().addDebugContextListener(this); - DebugUIPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(this); + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); + if (node != null) { + node.addPreferenceChangeListener(this); + } fContextService.addContextManagerListener(this); if (fWindow != null) { IWorkbenchPage page = fWindow.getActivePage(); @@ -637,7 +642,10 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi fWindow.removePerspectiveListener(this); fWindow = null; // avoid leaking a window reference (bug 321658). getDebugContextService().removeDebugContextListener(this); - DebugUIPlugin.getDefault().getPluginPreferences().removePropertyChangeListener(this); + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); + if (node != null) { + node.removePreferenceChangeListener(this); + } fContextService.removeContextManagerListener(this); fActivePerspective = null; } @@ -713,24 +721,6 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi } } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent) - */ - public void propertyChange(PropertyChangeEvent event) { - if (!fIgnoreChanges) { - if (IDebugUIConstants.PREF_MANAGE_VIEW_PERSPECTIVES.equals(event.getProperty())) { - loadPerspectives(); - } else if (IInternalDebugUIConstants.PREF_USER_VIEW_BINDINGS.equals(event.getProperty())) { - loadContextToViewExtensions(); - applyUserViewBindings(); - // clear activations to re-enable activation based on new settings - fPerspectiveToActivatedContexts.clear(); - ISelection selection = getDebugContextService().getActiveContext(); - contextActivated(selection); - } - } - } - /** * Returns whether this service's window's active perspective supports view management. * @@ -1002,7 +992,10 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * @param perspective the perspective description */ private void activateChain(String contextId, IPerspectiveDescriptor perspective, Set allViewIds) { - if (fWindow == null) return; // disposed + if (fWindow == null) + { + return; // disposed + } IWorkbenchPage page = fWindow.getActivePage(); if (page != null) { @@ -1014,7 +1007,10 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi } private Set getAllContextsViewIDs(List contextsIds) { - if (fWindow == null) return Collections.EMPTY_SET; // disposed + if (fWindow == null) + { + return Collections.EMPTY_SET; // disposed + } TreeSet viewIds = new TreeSet(); for (int i = 0; i < contextsIds.size(); i++) { @@ -1087,7 +1083,10 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi } private void deactivate(String contextId, IPerspectiveDescriptor perspective) { - if (fWindow == null) return; // disposed + if (fWindow == null) + { + return; // disposed + } IWorkbenchPage page = fWindow.getActivePage(); if (page != null) { @@ -1166,7 +1165,10 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi * @param viewId the id of the view to show */ public void showViewQuiet(String viewId) { - if (fWindow == null) return; // disposed; + if (fWindow == null) + { + return; // disposed; + } IWorkbenchPage page = fWindow.getActivePage(); if (page != null) { @@ -1193,4 +1195,20 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi clean(perspective); } } + + public void preferenceChange(PreferenceChangeEvent event) { + if (!fIgnoreChanges) { + if (IDebugUIConstants.PREF_MANAGE_VIEW_PERSPECTIVES.equals(event.getKey())) { + loadPerspectives(); + } else if (IInternalDebugUIConstants.PREF_USER_VIEW_BINDINGS.equals(event.getKey())) { + loadContextToViewExtensions(); + applyUserViewBindings(); + // clear activations to re-enable activation based on new + // settings + fPerspectiveToActivatedContexts.clear(); + ISelection selection = getDebugContextService().getActiveContext(); + contextActivated(selection); + } + } + } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java index ddb2bc4b7..1725bd43e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -23,6 +23,8 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IMarkerDelta; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IBreakpointManager; import org.eclipse.debug.core.IBreakpointsListener; @@ -40,6 +42,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.PlatformUI; +import org.osgi.service.prefs.BackingStoreException; /** * Breakpoint organizers for breakpoint working sets. @@ -322,7 +325,15 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate } } fDefaultWorkingSet = set; - DebugUIPlugin.getDefault().getPluginPreferences().setValue(IInternalDebugUIConstants.MEMENTO_BREAKPOINT_WORKING_SET_NAME, name); + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); + if(node != null) { + try { + node.put(IInternalDebugUIConstants.MEMENTO_BREAKPOINT_WORKING_SET_NAME, name); + node.flush(); + } catch (BackingStoreException e) { + DebugUIPlugin.log(e); + } + } } /* diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java index 012236f7a..d6001e865 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java @@ -20,7 +20,9 @@ import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.Preferences; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.debug.internal.ui.DebugUIMessages; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.views.variables.VariablesViewMessages; @@ -65,6 +67,7 @@ import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.contexts.IContextService; import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.part.ViewPart; +import org.osgi.service.prefs.BackingStoreException; /** * @@ -656,37 +659,41 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { return fVisibleViewPanes.contains(paneId); } - private void storeViewPaneVisibility() - { + private void storeViewPaneVisibility() { fVisibleViewPanes.clear(); - Preferences prefs = DebugUIPlugin.getDefault().getPluginPreferences(); StringBuffer visibleViewPanes= new StringBuffer(); Enumeration enumeration = fViewPaneControls.keys(); - while (enumeration.hasMoreElements()) - { + while (enumeration.hasMoreElements()) { String paneId = (String)enumeration.nextElement(); Control control = (Control)fViewPaneControls.get(paneId); - if (control.isVisible()) - { + if (control.isVisible()) { visibleViewPanes.append(paneId); visibleViewPanes.append(","); //$NON-NLS-1$ fVisibleViewPanes.add(paneId); } } - - prefs.setValue(getVisibilityPrefId(), visibleViewPanes.toString()); + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); + if(node != null) { + try { + node.put(getVisibilityPrefId(), visibleViewPanes.toString()); + node.flush(); + } catch (BackingStoreException e) { + DebugUIPlugin.log(e); + } + } } - private void loadViewPanesVisibility() - { - Preferences prefs = DebugUIPlugin.getDefault().getPluginPreferences(); - String visiblePanes = prefs.getString(getVisibilityPrefId()); - - if (visiblePanes != null && visiblePanes.length() > 0) - { + private void loadViewPanesVisibility() { + String visiblePanes = Platform.getPreferencesService().getString( + DebugUIPlugin.getUniqueIdentifier(), + getVisibilityPrefId(), + null, + null); + + if (visiblePanes != null && visiblePanes.length() > 0) { StringTokenizer tokenizer = new StringTokenizer(visiblePanes, ","); //$NON-NLS-1$ while (tokenizer.hasMoreTokens()) { @@ -694,8 +701,7 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { fVisibleViewPanes.add(paneId); } } - else - { + else { for (int i=0 ;i<defaultVisiblePaneIds.length; i++) { fVisibleViewPanes.add(defaultVisiblePaneIds[i]); @@ -720,13 +726,14 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { fSashForm.layout(); } - private void loadOrientation() - { - Preferences prefs = DebugUIPlugin.getDefault().getPluginPreferences(); - fViewOrientation = prefs.getInt(getOrientationPrefId()); - - for (int i=0; i<fOrientationActions.length; i++) - { + private void loadOrientation() { + fViewOrientation = Platform.getPreferencesService().getInt( + DebugUIPlugin.getUniqueIdentifier(), + getOrientationPrefId(), + HORIZONTAL_VIEW_ORIENTATION, + null); + + for (int i=0; i<fOrientationActions.length; i++) { if (fOrientationActions[i].getOrientation() == fViewOrientation) { fOrientationActions[i].run(); @@ -735,10 +742,16 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { updateOrientationActions(); } - private void saveOrientation() - { - Preferences prefs = DebugUIPlugin.getDefault().getPluginPreferences(); - prefs.setValue(getOrientationPrefId(), fViewOrientation); + private void saveOrientation() { + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); + if(node != null) { + try { + node.putInt(getOrientationPrefId(), fViewOrientation); + node.flush(); + } catch (BackingStoreException e) { + DebugUIPlugin.log(e); + } + } } private void updateOrientationActions() diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java index a8c040c29..e20a18ee3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 IBM Corporation and others. + * Copyright (c) 2004, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,7 +17,10 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Preferences; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.preferences.DefaultScope; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IDebugEventSetListener; @@ -33,6 +36,7 @@ import org.eclipse.debug.ui.memory.IMemoryRenderingSite; import org.eclipse.debug.ui.memory.IMemoryRenderingType; import org.eclipse.ui.IViewSite; import org.eclipse.ui.IWorkbenchPartSite; +import org.osgi.service.prefs.BackingStoreException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -50,8 +54,8 @@ import org.w3c.dom.NodeList; */ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ - private ArrayList fRenderings = new ArrayList(); - private IMemoryRenderingContainer fViewPane; + private final ArrayList fRenderings = new ArrayList(); + private final IMemoryRenderingContainer fViewPane; private static final String RENDERINGS_TAG = "persistedMemoryRenderings"; //$NON-NLS-1$ private static final String MEMORY_RENDERING_TAG = "memoryRendering"; //$NON-NLS-1$ @@ -66,8 +70,9 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ public void removeMemoryBlockRendering(IMemoryBlock mem, String renderingId) { - if(fRenderings == null) + if(fRenderings == null) { return; + } IMemoryRendering[] toRemove = getRenderings(mem, renderingId); @@ -89,8 +94,9 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ public void addMemoryBlockRendering(IMemoryRendering rendering) { // do not allow duplicated objects - if (fRenderings.contains(rendering)) + if (fRenderings.contains(rendering)) { return; + } fRenderings.add(rendering); @@ -105,11 +111,13 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ public void removeMemoryBlockRendering(IMemoryRendering rendering) { - if(rendering == null) + if(rendering == null) { return; + } - if(!fRenderings.contains(rendering)) + if(!fRenderings.contains(rendering)) { return; + } fRenderings.remove(rendering); @@ -191,8 +199,9 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ public void handleDebugEvents(DebugEvent[] events) { - for (int i=0; i < events.length; i++) + for (int i=0; i < events.length; i++) { handleDebugEvent(events[i]); + } } @@ -226,12 +235,18 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ fRenderings.clear(); String secondaryId = getViewSiteSecondaryId(); - if (secondaryId != null) - { + if (secondaryId != null) { // do not save renderings if this is not the primary rendering view String prefid = getPrefId(); - Preferences prefs = DebugUIPlugin.getDefault().getPluginPreferences(); - prefs.setToDefault(prefid); + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); + if (node != null) { + node.remove(prefid); + try { + node.flush(); + } catch (BackingStoreException e) { + DebugUIPlugin.log(e); + } + } } DebugPlugin.getDefault().removeDebugEventListener(this); @@ -243,7 +258,6 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ */ private void storeRenderings() { - Preferences prefs = DebugUIPlugin.getDefault().getPluginPreferences(); String renderingsStr= IInternalDebugCoreConstants.EMPTY_STRING; try { renderingsStr= getRenderingsAsXML(); @@ -256,11 +270,23 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ } String prefid = getPrefId(); - - if (renderingsStr != null) - prefs.setValue(prefid, renderingsStr); - else - prefs.setToDefault(prefid); + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); + if(node != null) { + if (renderingsStr != null) { + node.put(prefid, renderingsStr); + } + else { + IEclipsePreferences def = DefaultScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); + if(def != null) { + node.put(prefid, def.get(prefid, IInternalDebugCoreConstants.EMPTY_STRING)); + } + } + try { + node.flush(); + } catch (BackingStoreException e) { + DebugUIPlugin.log(e); + } + } } private String getPrefId() { @@ -295,8 +321,9 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ private String getRenderingsAsXML() throws IOException, ParserConfigurationException, TransformerException { IMemoryRendering[] renderings= (IMemoryRendering[])fRenderings.toArray(new IMemoryRendering[fRenderings.size()]); - if (renderings.length == 0) + if (renderings.length == 0) { return null; + } Document document= LaunchManager.getDocument(); Element rootElement= document.createElement(RENDERINGS_TAG); @@ -315,7 +342,11 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ * Load renderings currently stored. */ private void loadPersistedRenderings(String prefId) { - String renderingsStr= DebugUIPlugin.getDefault().getPluginPreferences().getString(prefId); + String renderingsStr = Platform.getPreferencesService().getString( + DebugUIPlugin.getUniqueIdentifier(), + prefId, + "", //$NON-NLS-1$ + null); if (renderingsStr.length() == 0) { return; } @@ -347,8 +378,9 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ IMemoryBlock memoryBlock = null; for (int j=0; j<memoryBlocks.length; j++) { - if (Integer.toString(memoryBlocks[j].hashCode()).equals(memoryBlockHashCode)) + if (Integer.toString(memoryBlocks[j].hashCode()).equals(memoryBlockHashCode)) { memoryBlock = memoryBlocks[j]; + } } if (memoryBlock != null) @@ -357,8 +389,9 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ IMemoryRenderingType type = null; for (int k=0; k<types.length; k++) { - if (types[k].getId().equals(renderingId)) + if (types[k].getId().equals(renderingId)) { type = types[k]; + } } // if memory block is not found, the rendering is no longer valid diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java index d865d8bd4..23b1c4002 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -33,12 +33,15 @@ import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.debug.internal.core.IConfigurationElementConstants; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.IDetailPane; import org.eclipse.debug.ui.IDetailPaneFactory; import org.eclipse.jface.viewers.IStructuredSelection; +import org.osgi.service.prefs.BackingStoreException; /** * Organizes the detail factories contributed through the extension point and keeps @@ -499,7 +502,15 @@ public class DetailPaneManager { buffer.append(entry.getValue()); buffer.append('|'); } - DebugUIPlugin.getDefault().getPluginPreferences().setValue(PREF_DETAIL_AREAS, buffer.toString()); + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); + if(node != null) { + node.put(PREF_DETAIL_AREAS, buffer.toString()); + try { + node.flush(); + } catch (BackingStoreException e) { + DebugUIPlugin.log(e); + } + } } /** @@ -509,7 +520,10 @@ public class DetailPaneManager { */ private void loadPreferredDetailsAreas() { fPreferredDetailPanes = new HashMap(); - String preferenceValue = DebugUIPlugin.getDefault().getPluginPreferences().getString(PREF_DETAIL_AREAS); + String preferenceValue = Platform.getPreferencesService().getString(DebugUIPlugin.getUniqueIdentifier(), + PREF_DETAIL_AREAS, + "", //$NON-NLS-1$ + null); StringTokenizer entryTokenizer = new StringTokenizer(preferenceValue,"|"); //$NON-NLS-1$ while (entryTokenizer.hasMoreTokens()){ String token = entryTokenizer.nextToken(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/InspectPopupDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/InspectPopupDialog.java index 90d5babe2..c0c71c341 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/InspectPopupDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/InspectPopupDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,6 +13,8 @@ package org.eclipse.debug.ui; import java.util.List; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.model.IExpression; import org.eclipse.debug.internal.ui.DebugUIPlugin; @@ -50,6 +52,7 @@ import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.PartInitException; +import org.osgi.service.prefs.BackingStoreException; /** * A <code>DebugPopup</code> that can be used to inspect an @@ -194,7 +197,15 @@ public class InspectPopupDialog extends DebugPopup { int[] weights = fSashForm.getWeights(); if (weights.length == 2){ String weightString = weights[0] + ":" + weights[1]; //$NON-NLS-1$ - DebugUIPlugin.getDefault().getPluginPreferences().setValue(PREF_INSPECT_POPUP_SASH_WEIGHTS, weightString); + IEclipsePreferences node = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier()); + if(node != null) { + node.put(PREF_INSPECT_POPUP_SASH_WEIGHTS, weightString); + try { + node.flush(); + } catch (BackingStoreException e) { + DebugUIPlugin.log(e); + } + } } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java index 2599e5477..5e94b9d18 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -182,7 +182,9 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { return; } attributes = collectBreakpointProperties(nodes[i]); - + if(attributes == null) { + continue; + } IResource resource; if(fImportBreakpoints) { resource = workspace.findMember((String) attributes.get(IImportExportConstants.IE_NODE_PATH)); diff --git a/org.eclipse.ui.console/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ui.console/.settings/org.eclipse.jdt.core.prefs index 32accb991..5d7a22fe3 100644 --- a/org.eclipse.ui.console/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.ui.console/.settings/org.eclipse.jdt.core.prefs @@ -8,6 +8,7 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault @@ -52,7 +53,9 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled @@ -69,6 +72,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error @@ -89,6 +93,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -113,11 +118,292 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.3 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_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_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_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +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.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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 +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_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=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_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_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_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.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.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_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 diff --git a/org.eclipse.ui.console/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.ui.console/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..13d5dca2c --- /dev/null +++ b/org.eclipse.ui.console/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,109 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_Platform Debug 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_settings_version=12 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=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 +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +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.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +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 +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=true +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_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.core.prefs index 32accb991..5d7a22fe3 100644 --- a/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.core.prefs @@ -8,6 +8,7 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault @@ -52,7 +53,9 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled @@ -69,6 +72,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error @@ -89,6 +93,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -113,11 +118,292 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.3 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_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_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_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +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.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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 +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_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=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_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_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_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_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 +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.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.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_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 diff --git a/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.ui.prefs index 60a514d1b..13d5dca2c 100644 --- a/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.ui.externaltools/.settings/org.eclipse.jdt.ui.prefs @@ -1,3 +1,109 @@ -#Wed Feb 22 12:19:21 PST 2006 +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_Platform Debug Cleanups +cleanup_settings_version=2 eclipse.preferences.version=1 -internal.default.compliance=default +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Platform Debug Formatting +formatter_settings_version=12 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=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 +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +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.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +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 +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=true +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_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java index 43375bc6f..caac40406 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java @@ -979,6 +979,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta if (commandsToBeDeleted != null && commandsToBeDeleted.contains(data)) { //command specified to be removed data= null; + continue; } ICommand command= (ICommand)data; Map/*<String, String>*/ args = command.getArguments(); diff --git a/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF b/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF index c0dba571e..4a37b5cf4 100644 --- a/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF +++ b/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.externaltools; singleton:=true -Bundle-Version: 3.2.200.qualifier +Bundle-Version: 3.2.300.qualifier Bundle-Activator: org.eclipse.ui.externaltools.internal.model.ExternalToolsPlugin Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin diff --git a/org.eclipse.ui.externaltools/pom.xml b/org.eclipse.ui.externaltools/pom.xml index f01934643..0c7b2b628 100644 --- a/org.eclipse.ui.externaltools/pom.xml +++ b/org.eclipse.ui.externaltools/pom.xml @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.ui</groupId> <artifactId>org.eclipse.ui.externaltools</artifactId> - <version>3.2.200-SNAPSHOT</version> + <version>3.2.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |