diff options
| author | Simon Scholz | 2015-03-12 21:32:20 +0000 |
|---|---|---|
| committer | Simon Scholz | 2015-03-12 21:53:55 +0000 |
| commit | 9b04be270b2a50d9172c8c3d12a0f1ff2e2c3348 (patch) | |
| tree | 8544b2f1973e3956c87b5d37b0bff4032ed59063 | |
| parent | c8d7a0cd6976a31824124c61f02a1ee8dd005247 (diff) | |
| download | eclipse.platform.runtime-9b04be270b2a50d9172c8c3d12a0f1ff2e2c3348.tar.gz eclipse.platform.runtime-9b04be270b2a50d9172c8c3d12a0f1ff2e2c3348.tar.xz eclipse.platform.runtime-9b04be270b2a50d9172c8c3d12a0f1ff2e2c3348.zip | |
Bug 461689 - Fix whitespace issues in org.eclipse.core.toolsI20150315-2000
Change-Id: Ifab9926d15de8a19f3fb57a3d82953f3f9179b80
Signed-off-by: Simon Scholz <simon.scholz@vogella.com>
60 files changed, 548 insertions, 399 deletions
diff --git a/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.core.prefs index 0fec8b844..7cf345822 100644 --- a/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.core.prefs @@ -101,6 +101,7 @@ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 @@ -111,15 +112,18 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 org.eclipse.jdt.core.formatter.blank_lines_before_field=0 @@ -139,28 +143,35 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true org.eclipse.jdt.core.formatter.comment.format_comments=false 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=false -org.eclipse.jdt.core.formatter.comment.format_line_comments=false +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=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +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 @@ -170,15 +181,17 @@ org.eclipse.jdt.core.formatter.indent_empty_lines=false org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false org.eclipse.jdt.core.formatter.indentation.size=4 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert @@ -186,7 +199,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do no 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=do not 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 @@ -226,10 +239,11 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=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 @@ -244,12 +258,14 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invoca org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert @@ -258,7 +274,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=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 @@ -273,11 +289,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invoc org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=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=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 @@ -300,6 +317,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -328,6 +346,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invoc org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert @@ -337,6 +356,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=inser org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -346,14 +366,23 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=800 +org.eclipse.jdt.core.formatter.lineSplit=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.ui.prefs index 9f52b6c0f..885617268 100644 --- a/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.ui.prefs +++ b/bundles/org.eclipse.core.tools/.settings/org.eclipse.jdt.ui.prefs @@ -1,9 +1,127 @@ -#Fri Feb 23 16:59:33 EST 2007 +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=false +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_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=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=false +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_redundant_type_arguments=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=false +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_anonymous_class_creation=false +cleanup.use_blocks=false +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +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.use_type_arguments=false +cleanup_profile=_Whitespace_remove +cleanup_settings_version=2 eclipse.preferences.version=1 -formatter_profile=_core -formatter_settings_version=11 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile +formatter_settings_version=12 org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=; +org.eclipse.jdt.ui.javadoc=false org.eclipse.jdt.ui.ondemandthreshold=3 org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} IBM Corporation and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n * IBM Corporation - initial API and implementation\r\n ******************************************************************************/\r\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @since 3.2\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="New classes and interfaces" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) ${year} IBM Corporation and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * IBM Corporation - initial API and implementation\r\n *******************************************************************************/\r\n${filecomment}\r\n${package_declaration}\r\n\r\n/**\r\n * \r\n */\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block&\#13;\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} The ${bare_field_name} to set.\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} IBM Corporation and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * IBM Corporation - initial API and implementation\n ******************************************************************************/\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @since 3.2\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="New classes and interfaces" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\n * Copyright (c) ${year} IBM Corporation and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n * \n * Contributors\:\n * IBM Corporation - initial API and implementation\n *******************************************************************************/\n${filecomment}\n${package_declaration}\n\n/**\n * \n */\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block&\#13;\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template></templates> +sp_cleanup.add_default_serial_version_id=false +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +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=false +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=false +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=false +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=false +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false +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=false +sp_cleanup.remove_redundant_type_arguments=false +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=false +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=false +sp_cleanup.remove_unused_private_types=false +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=false +sp_cleanup.use_type_arguments=false diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractCopySelectionAction.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractCopySelectionAction.java index 299d09c34..4685ffb85 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractCopySelectionAction.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractCopySelectionAction.java @@ -29,7 +29,7 @@ public abstract class AbstractCopySelectionAction extends GlobalAction { /** * Sets action's text and tool tip text. - * + * * @param selectionProvider the selection provider */ public AbstractCopySelectionAction(ISelectionProvider selectionProvider) { @@ -38,10 +38,10 @@ public abstract class AbstractCopySelectionAction extends GlobalAction { } /** - * Copies the currently selected contents to the clipboard. The meaning of the - * currently selected contents is defined by overriding the getContents() + * Copies the currently selected contents to the clipboard. The meaning of the + * currently selected contents is defined by overriding the getContents() * method. - * + * * @see org.eclipse.jface.action.IAction#run() */ @Override @@ -54,7 +54,7 @@ public abstract class AbstractCopySelectionAction extends GlobalAction { /** * Registers this action as a global action handler. - * + * * @param actionBars the action bars where this action will be registered. * @see org.eclipse.core.tools.GlobalAction#registerAsGlobalAction( * org.eclipse.ui.IActionBars) @@ -66,7 +66,7 @@ public abstract class AbstractCopySelectionAction extends GlobalAction { /** * Returns the currently selected contents as a String object. - * + * * @return the selected contents as string. */ protected abstract String getContents(); diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractTreeContentProvider.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractTreeContentProvider.java index d1d44238e..87455736b 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractTreeContentProvider.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/AbstractTreeContentProvider.java @@ -14,17 +14,17 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; /** - * An abstract base class for hierarchical content providers. Uses + * An abstract base class for hierarchical content providers. Uses * <code>TreeContentProviderNode</code> objects to keep a hierarchical - * data model. Subclasses must provide an implementation for the + * data model. Subclasses must provide an implementation for the * <code>#rebuild(Object)</code> operation in order to define how the data model - * will be built upon a given input provided by the viewer. + * will be built upon a given input provided by the viewer. */ public abstract class AbstractTreeContentProvider implements ITreeContentProvider { /** - * Flag for omitting the root or not when providing the contents. + * Flag for omitting the root or not when providing the contents. */ private boolean omitRoot; @@ -34,19 +34,19 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide private TreeContentProviderNode rootNode; /** - * Constructs a AbstractTreeContentProvider. + * Constructs a AbstractTreeContentProvider. * - * @param omitRoot if true, the root node will be omitted when providing - * contents. + * @param omitRoot if true, the root node will be omitted when providing + * contents. */ protected AbstractTreeContentProvider(boolean omitRoot) { this.omitRoot = omitRoot; } /** - * Constructs a AbstractTreeContentProvider that will omit the root node when + * Constructs a AbstractTreeContentProvider that will omit the root node when * providing contents. - * + * * @see #AbstractTreeContentProvider(boolean) */ protected AbstractTreeContentProvider() { @@ -55,11 +55,11 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide /** * Returns the child elements of the given parent element. - * - * @return an array containing <code>parentElement</code>'s children. + * + * @return an array containing <code>parentElement</code>'s children. * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren( * java.lang.Object) - * @see org.eclipse.core.tools.TreeContentProviderNode#getChildren() + * @see org.eclipse.core.tools.TreeContentProviderNode#getChildren() */ @Override public Object[] getChildren(Object parentElement) { @@ -71,10 +71,10 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide } /** - * Returns the parent for the given element, or <code>null</code> - * indicating that the parent can't be computed. + * Returns the parent for the given element, or <code>null</code> + * indicating that the parent can't be computed. * - * @return <coded>element</code>'s parent node or null, if it is a root node + * @return <coded>element</code>'s parent node or null, if it is a root node * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent( * java.lang.Object) * @see org.eclipse.core.tools.TreeContentProviderNode#getParent() @@ -91,10 +91,10 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide /** * Returns whether the given element has children. * - * @return true, if <code>element</code> has children, false otherwise + * @return true, if <code>element</code> has children, false otherwise * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren( * java.lang.Object) - * @see org.eclipse.core.tools.TreeContentProviderNode#hasChildren() * + * @see org.eclipse.core.tools.TreeContentProviderNode#hasChildren() * */ @Override public boolean hasChildren(Object element) { @@ -102,9 +102,9 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide } /** - * Returns the elements to display in the viewer - * when its input is set to the given element. - * + * Returns the elements to display in the viewer + * when its input is set to the given element. + * * @return this content provider root element's children * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements( * java.lang.Object) @@ -118,9 +118,9 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide } /** - * Disposes of this content provider. + * Disposes of this content provider. * This is called by the viewer when it is disposed. - * + * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ @Override @@ -130,11 +130,11 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide /** * Helper method that creates a root node given a node name and value. - * + * * @param name the name of the node * @param value the value of the node. May be null. * @return the tree node created - * @see TreeContentProviderNode#TreeContentProviderNode(String, Object) + * @see TreeContentProviderNode#TreeContentProviderNode(String, Object) */ protected TreeContentProviderNode createNode(String name, Object value) { return new TreeContentProviderNode(name, value); @@ -142,10 +142,10 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide /** * Helper method that creates a root node given a node name and no value. - * + * * @param name the name of the node * @return the tree node created - * @see TreeContentProviderNode#TreeContentProviderNode(String) + * @see TreeContentProviderNode#TreeContentProviderNode(String) */ protected TreeContentProviderNode createNode(String name) { return new TreeContentProviderNode(name); @@ -155,12 +155,12 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide * Notifies this content provider that the given viewer's input * has been switched to a different element. * Rebuilds this content provider's state from a given resource. - * + * * @param viewer the viewer * @param oldInput ignored * @param input the new input. If null, clears this content provider. If not, - * is passed in a call to <code>rebuild(Object)</code>. - * @see + * is passed in a call to <code>rebuild(Object)</code>. + * @see * org.eclipse.jface.viewers.IContentProvider#inputChanged( * org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) * @see #rebuild(Viewer, Object) @@ -175,13 +175,13 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide if (!acceptInput(input)) return; - rootNode = createNode("root"); //$NON-NLS-1$ + rootNode = createNode("root"); //$NON-NLS-1$ rebuild(viewer, input); } /** * Reconstructs this content provider data model upon the provided input object. - * + * * @param input the new input object - must not be null * @param viewer the corresponding viewer */ @@ -189,7 +189,7 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide /** * Returns true if the provided input is accepted by this content provider. - * + * * @param input an input object * @return boolean true if the provided object is accepted, false otherwise */ @@ -197,7 +197,7 @@ public abstract class AbstractTreeContentProvider implements ITreeContentProvide /** * Returns the rootNode. - * + * * @return this content provider root node */ protected TreeContentProviderNode getRootNode() { diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ByteUtil.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ByteUtil.java index 7f749cec0..af90aae30 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ByteUtil.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ByteUtil.java @@ -17,10 +17,10 @@ public class ByteUtil { /** * Helper method that creates a string representation for a byte array. - * + * * @param byteArray a byte array to be represented as string - * @param max a maximum number of bytes to be considered - if zero, there is - * no maximum. + * @param max a maximum number of bytes to be considered - if zero, there is + * no maximum. * @return a byte array string representation */ public static String byteArrayToString(byte[] byteArray, int max) { diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java index 82263c980..b343bf861 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ClearTextAction.java @@ -27,8 +27,8 @@ public class ClearTextAction extends GlobalAction { private IDocument document; /** - * Constructs a ClearTextAction action with the provided document. - * + * Constructs a ClearTextAction action with the provided document. + * * @param document the document to be cleared when this action is run. */ public ClearTextAction(IDocument document) { @@ -52,7 +52,7 @@ public class ClearTextAction extends GlobalAction { /** * Registers this action as a global action handler. - * + * * @param actionBars the action bars where this action will be registered. * @see GlobalAction#registerAsGlobalAction(org.eclipse.ui.IActionBars) */ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java index a964d982c..15448c4d9 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyStructuredSelectionAction.java @@ -15,14 +15,14 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; /** - * A concrete implementation for <code>AbstractCopySelectionAction</code> that + * A concrete implementation for <code>AbstractCopySelectionAction</code> that * supports structured selections. - * + * * @see org.eclipse.jface.viewers.IStructuredSelection */ public class CopyStructuredSelectionAction extends AbstractCopySelectionAction { - /** + /** * @see org.eclipse.core.tools.AbstractCopySelectionAction#AbstractCopySelectionAction(ISelectionProvider) */ public CopyStructuredSelectionAction(ISelectionProvider selectionProvider) { @@ -30,13 +30,13 @@ public class CopyStructuredSelectionAction extends AbstractCopySelectionAction { } /** - * Returns the current structured selection as a string object where each + * Returns the current structured selection as a string object where each * node is followed by a line terminator char. This method depends on the * toString() method of each node to define a reasonably formatted string * for display. - * + * * @return a string containing the currently selected elements separated by - * line terminators + * line terminators * @see org.eclipse.core.tools.AbstractCopySelectionAction#getContents() */ @Override diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyTextSelectionAction.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyTextSelectionAction.java index 7a92204c5..edfd552ea 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyTextSelectionAction.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/CopyTextSelectionAction.java @@ -14,9 +14,9 @@ import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.viewers.ISelectionProvider; /** - * A concrete implementation for <code>AbstractCopySelectionAction</code> that + * A concrete implementation for <code>AbstractCopySelectionAction</code> that * supports text selections. - * + * * @see org.eclipse.jface.text.ITextSelection */ public class CopyTextSelectionAction extends AbstractCopySelectionAction { @@ -31,7 +31,7 @@ public class CopyTextSelectionAction extends AbstractCopySelectionAction { /** * Returns the current text selection. - * + * * @return a string containing the currently selected text * @see org.eclipse.core.tools.AbstractCopySelectionAction#getContents() */ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java index ad2ae4902..ddd84af63 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/DeepSize.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM - Initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ErrorUtil.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ErrorUtil.java index b6b24553c..9bc43d2e4 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ErrorUtil.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ErrorUtil.java @@ -17,14 +17,14 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; /** - * A helper class that supports error report and logging for - * Spy plug-in classes. + * A helper class that supports error report and logging for + * Spy plug-in classes. */ public class ErrorUtil { /** * Logs the provided exception and user message in Spy plug-in's log. - * + * * @param exception the exception to be logged * @param userMessage an optional higher-level explanation for the exception */ @@ -38,7 +38,7 @@ public class ErrorUtil { /** * Shows the provided message using a MessageDialog. - * + * * @param message * @param title * @see org.eclipse.jface.dialogs.MessageDialog#openError(Shell,String,String) diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/GlobalAction.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/GlobalAction.java index 09c18cdc0..d265b56e9 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/GlobalAction.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/GlobalAction.java @@ -15,12 +15,12 @@ import org.eclipse.ui.IActionBars; /** * An abstract base class for global actions. Global actions - * are able to register themselves in a view's action bars. + * are able to register themselves in a view's action bars. */ public abstract class GlobalAction extends Action { /** * Constructs an action. - * + * * @param text the action description */ GlobalAction(String text) { @@ -30,7 +30,7 @@ public abstract class GlobalAction extends Action { /** * Registers this action as a global action handler. - * + * * @param actionBars the action bars where this action will be registered. * @see IActionBars#updateActionBars() */ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ITreeNodeVisitor.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ITreeNodeVisitor.java index 6be51cc62..54a66c3b9 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ITreeNodeVisitor.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/ITreeNodeVisitor.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.core.tools; -/** +/** * This interface is implemented by objects that visit trees made of * <code>TreeContentProviderNode</code> objects. * * @see org.eclipse.core.tools.TreeContentProviderNode#accept(ITreeNodeVisitor) */ public interface ITreeNodeVisitor { - /** + /** * Visits the given node. * * @param node the node to visit diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/Messages.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/Messages.java index 77cd0fa90..61eb29df6 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/Messages.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/Messages.java @@ -3,8 +3,8 @@ * program and the accompanying materials are made available under the terms of * the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * + * Contributors: * IBM - Initial API and implementation **********************************************************************/ package org.eclipse.core.tools; diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SelectAllAction.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SelectAllAction.java index cfd346d63..331675e85 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SelectAllAction.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SelectAllAction.java @@ -25,7 +25,7 @@ public class SelectAllAction extends GlobalAction { /** * Registers this action as a global action handler. - * + * * @param actionBars the action bars where this action will be registered. * @see org.eclipse.core.tools.GlobalAction#registerAsGlobalAction(org.eclipse.ui.IActionBars) */ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SpyView.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SpyView.java index a0c838be9..cb0f46a2f 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SpyView.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/SpyView.java @@ -12,7 +12,7 @@ package org.eclipse.core.tools; import org.eclipse.ui.part.ViewPart; -/** +/** * A common base class for all Spy Plug-in views */ public abstract class SpyView extends ViewPart { diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java index 02600a356..9be9318f3 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableSelectionProviderDecorator.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM - Initial API and implementation *******************************************************************************/ @@ -19,17 +19,17 @@ import org.eclipse.jface.viewers.*; * TableViewer as their viewer and PluginStats as the basis for their data * model. The only affected method is <code>getSelection()</code>, which will * return a string that closely resembles the table view of this object. - * + * */ public class TableSelectionProviderDecorator implements ISelectionProvider { /** The decorated selection provider. */ private ISelectionProvider selectionProvider; - /** + /** * Constructs a <code>TableSelectionProviderDecorator</code> having * the given selection provider as its decorated object. - * + * * @param selectionProvider the selection provider to be decorated */ public TableSelectionProviderDecorator(ISelectionProvider selectionProvider) { @@ -49,20 +49,20 @@ public class TableSelectionProviderDecorator implements ISelectionProvider { * structured selection made of <code>PluginStats</code> elements, this method * will return a structured selection of strings that resemble the table view * of this data. - * + * * @return the current selection, printed in table view format * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() */ @Override public ISelection getSelection() { - // gets the original selection object + // gets the original selection object ISelection selection = selectionProvider.getSelection(); // in these cases the original selection will be returned if (selection == null || selection.isEmpty() || !(selection instanceof IStructuredSelection)) return selection; - // constructs a list with the selected elements + // constructs a list with the selected elements IStructuredSelection structuredSelection = (IStructuredSelection) selection; StringBuffer copyText = new StringBuffer(); diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java index f8c7cbc5b..32014ca31 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java @@ -33,7 +33,7 @@ public abstract class TableWithTotalView extends ViewPart implements ISelectionP protected TableTreeViewer viewer; // Table tree viewer used to contain all the data but the total protected TableTree tableTree; // The table tree that will populate the viewer protected Table totalTable; // The table used to display the totals - protected boolean flat; // Flag indicating the view mode + protected boolean flat; // Flag indicating the view mode protected Clipboard clipboard; protected Action copyAction; protected Action selectAllAction; diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java index 1cf9a925d..ba820e2fa 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeContentProviderNode.java @@ -14,13 +14,13 @@ import java.util.*; import org.eclipse.core.runtime.IAdaptable; /** - * Represents a node (possibly containing children) in a tree content + * Represents a node (possibly containing children) in a tree content * provider model. Every node has a name and optionally a value. */ public class TreeContentProviderNode implements Comparable, IAdaptable { /** - * A list containing this node's children. + * A list containing this node's children. */ private List children; @@ -29,7 +29,7 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { */ private String name; - /** + /** * This node's value (may be null). */ private Object value; @@ -41,7 +41,7 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { /** * Constructs a TreeContentProviderNode with the given name and value. - * + * * @param name this node's name (may be null, if value is not null) * @param value this node's value (may be null, if name is not null) */ @@ -52,8 +52,8 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { /** * Constructs a TreeContentProviderNode with the given name. - * - * @param name this node's name (may not be null). + * + * @param name this node's name (may not be null). */ public TreeContentProviderNode(String name) { this(name, null); @@ -61,7 +61,7 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { /** * Sets this node's parent. - * + * * @param parent this node's new parent */ private void setParent(TreeContentProviderNode parent) { @@ -71,7 +71,7 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { /** * Adds a new child. If the child is a TreeContentProviderNode, sets its parent * to this object. - * + * * @param child a new child to be added. */ public void addChild(Object child) { @@ -87,9 +87,9 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { } /** - * Returns an array containing all children this node has. If this node + * Returns an array containing all children this node has. If this node * has no children, returns an empty array. - * + * * @return an array containing this node's children. */ public Object[] getChildren() { @@ -98,7 +98,7 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { /** * Returns a boolean indicating if this node has any children. - * + * * @return true, if this node has children, false otherwise */ public boolean hasChildren() { @@ -107,7 +107,7 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { /** * Returns a string representation of the object. - * + * * @see java.lang.Object#toString() */ @Override @@ -121,7 +121,7 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { /** * Returns this node's parent node. - * + * * @return this node's parent node or null, if this node is a root */ public TreeContentProviderNode getParent() { @@ -130,7 +130,7 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { /** * Returns this node's value (may be null). - * + * * @return this node's value */ public Object getValue() { @@ -139,7 +139,7 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { /** * Returns a boolean indicating if this node is root or not. - * + * * @return true if this node is root, false otherwise */ public boolean isRoot() { @@ -147,10 +147,10 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { } /** - * Sorts this node's children list in ascending order. The children are - * ordered by name. Any changes in the children list will potentially - * invalidate the ordering. All children must be instances of - * <code>TreeContentProviderNode</code>. + * Sorts this node's children list in ascending order. The children are + * ordered by name. Any changes in the children list will potentially + * invalidate the ordering. All children must be instances of + * <code>TreeContentProviderNode</code>. */ public void sort() { if (children == null) @@ -159,8 +159,8 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { } /** - * Compares this node with another node. - * + * Compares this node with another node. + * * @see java.lang.Comparable#compareTo(java.lang.Object) */ @Override @@ -192,7 +192,7 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { /** * Returns this node's tree root node. If this node is a root node, returns itself. - * + * * @return this node's tree root node */ public TreeContentProviderNode getRoot() { @@ -201,7 +201,7 @@ public class TreeContentProviderNode implements Comparable, IAdaptable { /** * Returns this node's immediate child that has the given value. - * + * * @return a tree node, or <code>null</code> */ public TreeContentProviderNode findNode(Object obj) { diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java index e807bc0ae..45b29c03e 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TreeSelectionProviderDecorator.java @@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.*; * The only affected method is <code>getSelection()</code>, which will return a * selection object that provides selected elements in the same order they * appear in the tree. - * + * * <p>This class is an workaround to the SWT's <code>Tree.getSelection()</code> * method, which returns an array of selected elements without preserving the * order they appear in the tree widget.</p> @@ -29,10 +29,10 @@ public class TreeSelectionProviderDecorator implements ISelectionProvider { /** The decorated selection provider. */ private ISelectionProvider selectionProvider; - /** - * Constructs a <code>TreeSelectionProviderDecorator</code> having the given + /** + * Constructs a <code>TreeSelectionProviderDecorator</code> having the given * selection provider as its decorated object. - * + * * @param selectionProvider the selection provider to be decorated */ public TreeSelectionProviderDecorator(ISelectionProvider selectionProvider) { @@ -53,21 +53,21 @@ public class TreeSelectionProviderDecorator implements ISelectionProvider { * elements, this method will return a structured selection where the order of * elements is the same order the elements appear in the tree (only for tree * elements that are instances of <code>TreeContentProviderNode</code>). - * + * * @return the current selection, ordered in the same sequence they appear in * the tree * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() */ @Override public ISelection getSelection() { - // gets the original selection object + // gets the original selection object ISelection selection = selectionProvider.getSelection(); // in these cases the original selection will be returned if (selection == null || selection.isEmpty() || !(selection instanceof IStructuredSelection)) return selection; - // constructs a list with the selected elements + // constructs a list with the selected elements IStructuredSelection structuredSelection = (IStructuredSelection) selection; final List selectedElements = new ArrayList(structuredSelection.toList()); @@ -83,7 +83,7 @@ public class TreeSelectionProviderDecorator implements ISelectionProvider { final List orderedElements = new LinkedList(); // uses a visitor to traverse the whole tree - // when a visited node is the selected list, it is moved to the ordered list + // when a visited node is the selected list, it is moved to the ordered list anyNode.getRoot().accept(new ITreeNodeVisitor() { @Override public boolean visit(TreeContentProviderNode node) { @@ -97,15 +97,15 @@ public class TreeSelectionProviderDecorator implements ISelectionProvider { }); // any remaining elements in the list (probably they are not tree nodes) - // are copied to the end of the ordered list + // are copied to the end of the ordered list orderedElements.addAll(selectedElements); return new StructuredSelection(orderedElements); } - /** - * Returns the first element in the list that is instance of + /** + * Returns the first element in the list that is instance of * <code>TreeContentProviderNode</code>. - * + * * @return the first element that is a tree node or null, if none is found. */ private TreeContentProviderNode findNodeElement(List elements) { diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/AbstractDumper.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/AbstractDumper.java index 4967a3849..f2f4eb93c 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/AbstractDumper.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/AbstractDumper.java @@ -13,28 +13,28 @@ package org.eclipse.core.tools.metadata; import java.io.*; /** - * An abstract implementation for dumpers that generate bare text dumps by + * An abstract implementation for dumpers that generate bare text dumps by * sequentially reading input streams. */ public abstract class AbstractDumper implements IDumper { /** - * Reads a given file and produces a dump object. Provides a template implementation for - * <code>IDumper.dump(java.io.File)</code>. - * <p>Subclasses must implement - * <code>getStringDumpingStrategy(InputStream)</code> in order to select the - * real dumping behaviour. This method will call - * <code>IStringDumpingStrategy#dumpStringContents(DataInputStream)</code> on - * the returned strategy. If, after calling that method, there are still bytes - * to be read in the input stream, - * <code>getStringDumpingStrategy(InputStream)</code> will be called again in + * Reads a given file and produces a dump object. Provides a template implementation for + * <code>IDumper.dump(java.io.File)</code>. + * <p>Subclasses must implement + * <code>getStringDumpingStrategy(InputStream)</code> in order to select the + * real dumping behaviour. This method will call + * <code>IStringDumpingStrategy#dumpStringContents(DataInputStream)</code> on + * the returned strategy. If, after calling that method, there are still bytes + * to be read in the input stream, + * <code>getStringDumpingStrategy(InputStream)</code> will be called again in * order to select another strategy to read the remaining contents, and so on. - * </p> + * </p> * - * <p>Subclasses can also select which type of low-level InputStream will be + * <p>Subclasses can also select which type of low-level InputStream will be * used to read the file to be dumped by overriding - * <code>openInputStream(File)</code>.</p> - * + * <code>openInputStream(File)</code>.</p> + * * @param file the file to be dumped * @return a dump object representing the contents of the dumped file * @see org.eclipse.core.tools.metadata.IDumper#dump(java.io.File) @@ -50,7 +50,7 @@ public abstract class AbstractDumper implements IDumper { try { //uses a metered input stream in order to count the number of bytes read meteredInput = new MeteredInputStream(openInputStream(file)); - dumpContents(meteredInput, contents); //$NON-NLS-1$ + dumpContents(meteredInput, contents); } catch (PartialDumpException pde) { // ensure we remember any partial contents if (pde.getPartialContents() != null) @@ -58,7 +58,7 @@ public abstract class AbstractDumper implements IDumper { dump.setFailureReason(pde); } catch (Exception e) { dump.setFailureReason(e); - } + } dump.setContents(contents.toString()); if (meteredInput != null) dump.setOffset(meteredInput.getOffset()); @@ -69,7 +69,7 @@ public abstract class AbstractDumper implements IDumper { * Does the actual work. Subclasses must implement this method to define * dumping behavior. The results are added to the <code>contents</code> * string buffer. - * + * * @param input * @param contents * @throws IOException @@ -79,12 +79,12 @@ public abstract class AbstractDumper implements IDumper { protected abstract void dumpContents(PushbackInputStream input, StringBuffer contents) throws IOException, Exception, DumpException; /** - * Opens an input stream connected to the file object provided. Provides an - * opportunity for subclasses to select a different input stream class. By + * Opens an input stream connected to the file object provided. Provides an + * opportunity for subclasses to select a different input stream class. By * default, returns a <code>FileInputStream</code> object. - * + * * @param file the file to be opened - * @return an input stream connected to the file provided as + * @return an input stream connected to the file provided as * argument * @throws IOException if an exception happens while opening the inpuut stream */ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/Dump.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/Dump.java index 3dbf5c645..87e6afa13 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/Dump.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/Dump.java @@ -13,8 +13,8 @@ package org.eclipse.core.tools.metadata; import java.io.File; /** - * Default implementation for <code>IDump</code>. - * + * Default implementation for <code>IDump</code>. + * * @see IDump */ public class Dump implements IDump { @@ -27,7 +27,7 @@ public class Dump implements IDump { */ private boolean failed; /** - * The exception that caused the failure (may be null) + * The exception that caused the failure (may be null) */ private Exception failureReason; /** @@ -72,7 +72,7 @@ public class Dump implements IDump { /** * Sets the failure reason. - * + * * @param failureReason The failure reason for this dump object */ public void setFailureReason(Exception failureReason) { @@ -81,7 +81,7 @@ public class Dump implements IDump { /** * Sets the file. - * + * * @param file The file for this dump object */ public void setFile(File file) { @@ -98,7 +98,7 @@ public class Dump implements IDump { /** * Sets the contents. - * + * * @param contents The contents for this dump object */ public void setContents(Object contents) { @@ -107,7 +107,7 @@ public class Dump implements IDump { /** * Sets the offset. - * + * * @param offset The offset for this dump object */ public void setOffset(long offset) { @@ -123,9 +123,9 @@ public class Dump implements IDump { } /** - * Returns a human-readable representation for this dump object (for + * Returns a human-readable representation for this dump object (for * debugging purposes). - * + * * @see java.lang.Object#toString() */ @Override diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpContentsView.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpContentsView.java index 45f6dc60e..4567b22a1 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpContentsView.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpContentsView.java @@ -45,7 +45,7 @@ public class DumpContentsView extends SpyView { public static final String VIEW_ID = DumpContentsView.class.getName(); /** - * Constructs a DumpContentsView. + * Constructs a DumpContentsView. */ public DumpContentsView() { dumperFactory = DumperFactory.getInstance(); @@ -54,7 +54,7 @@ public class DumpContentsView extends SpyView { /** * Creates this view widget and actions. - * + * * @param parent the parent control * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ @@ -88,7 +88,7 @@ public class DumpContentsView extends SpyView { /** * Sets the file to be dumped. The view state will be updated to reflect * changes. - * + * * @param file the file to be dumped */ public void setFile(File file) { @@ -103,12 +103,12 @@ public class DumpContentsView extends SpyView { return; } - // dumps file + // dumps file IDump dump = dumper.dump(file); if (dump.isFailed()) { CoreToolsPlugin.getDefault().log("Error during file dump", dump.getFailureReason()); //$NON-NLS-1$ String message = "File dumping did not complete successfully. Reason: " + dump.getFailureReason(); //$NON-NLS-1$ - ErrorUtil.showErrorMessage(message, "Error during file dump"); //$NON-NLS-1$ + ErrorUtil.showErrorMessage(message, "Error during file dump"); //$NON-NLS-1$ } // loads the new dump object @@ -117,14 +117,14 @@ public class DumpContentsView extends SpyView { /** * Rebuilds the view with the dump object provided. - * - * @param dump a dump object to be shown on this view + * + * @param dump a dump object to be shown on this view */ private void load(IDump dump) { this.currentFile = dump.getFile(); - // now it is safe to get the part title + // now it is safe to get the part title // (during createPartControl it gets Workbench window title) if (initialTitle == null) this.initialTitle = this.getTitle(); @@ -151,12 +151,12 @@ public class DumpContentsView extends SpyView { ErrorUtil.logException(pie, "Error opening view"); //$NON-NLS-1$ } - // if the Dump Summary view is available, updates it + // if the Dump Summary view is available, updates it if (summaryView != null) summaryView.load(dump); } - /** + /** * File load action implementation. */ private class LoadFileAction extends Action { @@ -166,11 +166,11 @@ public class DumpContentsView extends SpyView { this.setToolTipText("Load file..."); //$NON-NLS-1$ } - /** - * Executes this action, opening a file dialog so the user can select the + /** + * Executes this action, opening a file dialog so the user can select the * file to be dumped. If a file is successfully selected, opens it by * calling <code>#setFile(File)</code>. - * + * * @see DumpContentsView#setFile * @see org.eclipse.jface.action.IAction#run() */ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpException.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpException.java index d0d615239..fd311552e 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpException.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpException.java @@ -14,23 +14,23 @@ import java.io.PrintStream; import java.io.PrintWriter; /** - A high-level exception class to be used by <code>IDumper</code>s. It is - intended to be used as a wrapper for low-level exceptions. A method for - accessing the low-level exception that caused this - <code>DumpException</code> is provided. + A high-level exception class to be used by <code>IDumper</code>s. It is + intended to be used as a wrapper for low-level exceptions. A method for + accessing the low-level exception that caused this + <code>DumpException</code> is provided. */ public class DumpException extends Exception { private static final long serialVersionUID = 1L; /** - * The low-level exception that caused this <code>DumpException</code>. May be + * The low-level exception that caused this <code>DumpException</code>. May be * null. */ private Throwable cause; /** * Constructs a <code>DumpException</code> with the provided message. - * + * * @param msg the message */ public DumpException(String msg) { @@ -39,8 +39,8 @@ public class DumpException extends Exception { /** * Constructs a <code>DumpException</code> with the provided message and cause. - * - * @param msg the message + * + * @param msg the message * @param cause the exception that caused this <code>DumpException</code> */ public DumpException(String msg, Throwable cause) { @@ -50,7 +50,7 @@ public class DumpException extends Exception { /** * Returns the cause for this <code>DumpException</code>. May be null. - * + * * @return the cause for this <code>DumpException</code>. */ @Override @@ -59,9 +59,9 @@ public class DumpException extends Exception { } /** - * Returns this exception message (including the cause message, if there is a + * Returns this exception message (including the cause message, if there is a * cause exception). - * + * * @return the error message string * @see java.lang.Throwable#getMessage() */ @@ -71,9 +71,9 @@ public class DumpException extends Exception { } /** - * Prints this <code>DumpException</code> message and its backtrace to the - * specified print stream. - * + * Prints this <code>DumpException</code> message and its backtrace to the + * specified print stream. + * * @param output the <code>java.io.PrintStream</code> object where to print * @see java.lang.Throwable#printStackTrace(java.io.PrintStream) */ @@ -87,9 +87,9 @@ public class DumpException extends Exception { } /** - * Prints this <code>DumpException</code> message and its backtrace to the - * specified print writer. - * + * Prints this <code>DumpException</code> message and its backtrace to the + * specified print writer. + * * @param output the <code>java.io.PrintWriter</code> object where to print * @see java.lang.Throwable#printStackTrace(java.io.PrintWriter) */ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpSummaryView.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpSummaryView.java index 3e3a98add..4fa4d5147 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpSummaryView.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpSummaryView.java @@ -35,7 +35,7 @@ public class DumpSummaryView extends SpyView { /** * Creates this view widget and actions. - * + * * @param parent the parent control * @see org.eclipse.ui.IWorkbenchPart#createPartControl * (org.eclipse.swt.widgets.Composite) @@ -67,8 +67,8 @@ public class DumpSummaryView extends SpyView { /** * Rebuilds the view with the dump object provided. Only summary information * is made available. - * - * @param dump a dump object describing the result of a dumping process. + * + * @param dump a dump object describing the result of a dumping process. */ void load(IDump dump) { @@ -92,7 +92,7 @@ public class DumpSummaryView extends SpyView { output.append(dump.getFile().length()); output.append(" byte(s) read"); //$NON-NLS-1$ - // updates the view contents + // updates the view contents viewer.getDocument().set(output.toString()); } diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java index 465cd4b65..f8675bfb8 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumpTool.java @@ -19,32 +19,32 @@ import org.eclipse.equinox.app.IApplicationContext; /** * A command-line interface for running dumpers on metadata files. * This application requires the name of the file to be dumped as its unique - * argument. + * argument. */ public class DumpTool implements IApplication { // list of files to dump String[] files = null; - - /** - * The file filter. - * + + /** + * The file filter. + * * @see MetadataFileFilter */ private FileFilter fileFilter; - /** - * The directory filter. - * + /** + * The directory filter. + * * @see DirectoryFilter */ private FileFilter directoryFilter; - + /** - * Dumps a given file using the associated dumper, sending its contents to the - * standard output. - * + * Dumps a given file using the associated dumper, sending its contents to the + * standard output. + * * @param context Application Context * @see DumperFactory#getDumper(String) */ @@ -52,16 +52,16 @@ public class DumpTool implements IApplication { public Object start(IApplicationContext context) throws Exception { String fileName = System.getProperty("dump.file"); //$NON-NLS-1$ if (fileName == null) { - System.err.println("Use \"dump.file\" system property to point to the metadata file to be dumped"); //$NON-NLS-1$ + System.err.println("Use \"dump.file\" system property to point to the metadata file to be dumped"); //$NON-NLS-1$ return new Integer(0); } File toDump = new File(fileName); if (!toDump.exists()) { - System.err.println("File \"" + toDump.getAbsolutePath() + "\" does not exist"); //$NON-NLS-1$ //$NON-NLS-2$ + System.err.println("File \"" + toDump.getAbsolutePath() + "\" does not exist"); //$NON-NLS-1$ //$NON-NLS-2$ return new Integer(1); } - + // ready to parse DumperFactory factory = DumperFactory.getInstance(); String[] registeredFileNames = factory.getRegisteredFileNames(); @@ -69,7 +69,7 @@ public class DumpTool implements IApplication { this.directoryFilter = new DirectoryFilter(); System.out.println("DumpTool started..."); System.out.println("Analyzing: "+fileName); - + if (toDump.isFile()) { files = new String[]{fileName}; } else { @@ -77,7 +77,7 @@ public class DumpTool implements IApplication { } for (int i = 0; i < files.length; i++) { - dump(files[i]); + dump(files[i]); } System.out.println("DumpTool finished..."); @@ -114,7 +114,7 @@ public class DumpTool implements IApplication { private String[] extractFiles(String directory) { List fileNames = new ArrayList(); extractInfo(new File(directory), fileNames, new NullProgressMonitor()); - + String[] result = new String[fileNames.size()]; if (fileNames.size()>0){ result = (String[])fileNames.toArray(new String[fileNames.size()]); @@ -122,16 +122,16 @@ public class DumpTool implements IApplication { return result; } /** - * Builds this content provider data model from a given root directory. This - * method operates recursively, adding a tree node for each file of a registered - * type it finds and for each directory that contains (any directories that - * contain) a file of a registered type. This method returns a boolean value - * indicating that it (or at least one of its sub dirs) contains files with one + * Builds this content provider data model from a given root directory. This + * method operates recursively, adding a tree node for each file of a registered + * type it finds and for each directory that contains (any directories that + * contain) a file of a registered type. This method returns a boolean value + * indicating that it (or at least one of its sub dirs) contains files with one * of the registered types (so its parent will include it too). - * + * * @param dir a directory potentially containing known metadata files. - * @param dirNode the node corresponding to that directory - * @return true if the provided dir (or at least one of its sub dirs) + * @param dirNode the node corresponding to that directory + * @return true if the provided dir (or at least one of its sub dirs) * contains files with one of the registered types, false otherwise */ void extractInfo(File dir, List fileList, IProgressMonitor monitor) { @@ -141,7 +141,7 @@ public class DumpTool implements IApplication { monitor.beginTask("Scanning dir " + dir, 100); //$NON-NLS-1$ try { - // looks for files of registered types in this directory + // looks for files of registered types in this directory File[] selectedFiles = dir.listFiles(fileFilter); monitor.worked(1); Arrays.sort(selectedFiles); @@ -161,10 +161,10 @@ public class DumpTool implements IApplication { monitor.done(); } } - + /** * Filters directories entries. - * + * * @see java.io.FileFilter */ private class DirectoryFilter implements FileFilter { @@ -176,7 +176,7 @@ public class DumpTool implements IApplication { return file.isDirectory(); } } - + @Override public void stop() { // Does not do anything diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java index 9c46d825d..7a2d0cef3 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/DumperFactory.java @@ -36,7 +36,7 @@ public class DumperFactory { /** * Provides access to a DumperFactory instance. - * + * * @return a <code>DumperFactory</code> instance */ public synchronized static DumperFactory getInstance() { @@ -47,8 +47,8 @@ public class DumperFactory { } /** - * Constructs a dumper factory, reading dumper definitions from the - * extension registry. Forbids instantiation from outside this class. + * Constructs a dumper factory, reading dumper definitions from the + * extension registry. Forbids instantiation from outside this class. */ private DumperFactory() { loadDumpers(); @@ -64,22 +64,22 @@ public class DumperFactory { /** * Returns an array containing all known file names. - * - * @return an array containing file names registered in this factory. + * + * @return an array containing file names registered in this factory. */ public String[] getRegisteredFileNames() { String[] fileNames = new String[configuration.size()]; - return (String[]) configuration.keySet().toArray(fileNames); + return configuration.keySet().toArray(fileNames); } /** - * Returns an instance of the dumper class registered for the provided file name. - * If there is no dumper class registered for the provided file name, raises an + * Returns an instance of the dumper class registered for the provided file name. + * If there is no dumper class registered for the provided file name, raises an * exception. - * + * * @param fileName the file to be dumped's name * @return a <code>IDumper</code> that knows how to read the file - * @throws DumpException if there is no dumper class registered for the + * @throws DumpException if there is no dumper class registered for the * provided file name of if we cannot instanciate the dumper class */ public IDumper getDumper(String fileName) throws DumpException { @@ -97,13 +97,13 @@ public class DumperFactory { try { return (IDumper) Class.forName((String) dumper).newInstance(); } catch (Exception e) { - throw new DumpException("Error instantiating dumper named " + dumper + " for <" + fileName + "> file", e); //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-2$ + throw new DumpException("Error instantiating dumper named " + dumper + " for <" + fileName + "> file", e); //$NON-NLS-1$ //$NON-NLS-2$ } - // dumper defined through extension mechanism + // dumper defined through extension mechanism try { return (IDumper) ((IConfigurationElement) dumper).createExecutableExtension("class"); //$NON-NLS-1$ } catch (CoreException ce) { - throw new DumpException("Error instantiating dumper for <" + fileName + "> file", ce); //$NON-NLS-1$ //$NON-NLS-2$ + throw new DumpException("Error instantiating dumper for <" + fileName + "> file", ce); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDump.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDump.java index b7b3e6df0..0a85076b7 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDump.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDump.java @@ -13,49 +13,49 @@ package org.eclipse.core.tools.metadata; import java.io.File; /** - * Represents an object produced by dumping a given file. + * Represents an object produced by dumping a given file. */ public interface IDump { /** * Returns the file processed in order to produce this dump. - * + * * @return the file processed */ File getFile(); /** - * Returns the dump contents. Dump contents objects must have a + * Returns the dump contents. Dump contents objects must have a * <code>toString()</code> - * implementation that returns meaningful, human-readable, representation for + * implementation that returns meaningful, human-readable, representation for * the contents. - * + * * @return an object representing the contents of the dumped file. */ Object getContents(); /** - * Returns true if the file reading process ended due to a failure. If - * <code>getFailureReason()</code> does not return <code>null</code>, this + * Returns true if the file reading process ended due to a failure. If + * <code>getFailureReason()</code> does not return <code>null</code>, this * method must return <code>true</code>. - * + * * @return true if the dumping process terminated due to a failure */ boolean isFailed(); /** - * Returns the exception that caused the failure, or null if a failure did not + * Returns the exception that caused the failure, or null if a failure did not * happen. - * - * @return the exception that caused the failure, or null if a + * + * @return the exception that caused the failure, or null if a * failure did not happen. */ Exception getFailureReason(); /** - * Returns the offset where dumper stopped reading the dumped file. Optionally + * Returns the offset where dumper stopped reading the dumped file. Optionally * implemented. - * + * * @return the number of bytes read */ long getOffset(); diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDumper.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDumper.java index eb2a9bd03..cc42ff50e 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDumper.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IDumper.java @@ -18,11 +18,11 @@ import java.io.File; */ public interface IDumper { - /** - * Reads a given file and produces a dump object. Any exception that - * may occur during file processing must be caught and stored as + /** + * Reads a given file and produces a dump object. Any exception that + * may occur during file processing must be caught and stored as * failure reason in the IDump object returned. - * + * * @param file the file to be dumped * @return a dump object representing the contents of the file dumped */ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IStringDumpingStrategy.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IStringDumpingStrategy.java index 91c3620f5..e405e40fe 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IStringDumpingStrategy.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/IStringDumpingStrategy.java @@ -15,30 +15,30 @@ import java.io.IOException; /** * A dumping strategy defines how a input stream will be dumped as a string. - * A given dumper may use different strategies for reading different versions of - * a file it understands, or may even use different strategies for reading + * A given dumper may use different strategies for reading different versions of + * a file it understands, or may even use different strategies for reading * different segments of a same file. - * + * * @see org.eclipse.core.tools.metadata.AbstractDumper */ public interface IStringDumpingStrategy { /** * Dumps contents read from the provided stream. - * Concrete implementations should not catch any exceptions. + * Concrete implementations should not catch any exceptions. * Concrete implementations should not close the input stream. * This method may read the entire input stream contents, or just part of it. - * - * @param input the input stream where to dump contents from + * + * @param input the input stream where to dump contents from * @return the contents read in string format, or null if no further reading should occur - * @throws IOException an exception occurred while dumping the input stream - * @throws DumpException an exception occurred while dumping the input stream + * @throws IOException an exception occurred while dumping the input stream + * @throws DumpException an exception occurred while dumping the input stream */ public String dumpStringContents(DataInputStream input) throws IOException, DumpException; /** - * Returns a high-level description for the file format understood by this + * Returns a high-level description for the file format understood by this * strategy. - * + * * @return a string describing the file format this strategy understands. */ public String getFormatDescription(); diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataFileFilter.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataFileFilter.java index eee49866d..c9cb23bc4 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataFileFilter.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataFileFilter.java @@ -16,8 +16,8 @@ import java.util.Arrays; /** * Filters accepted files (the ones who are registered in the DumperFactory). - * - * @see MetadataTreeContentProvider#MetadataTreeContentProvider(String[]) + * + * @see MetadataTreeContentProvider#MetadataTreeContentProvider(String[]) * @see java.io.FileFilter */ class MetadataFileFilter implements FileFilter { diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataPerspective.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataPerspective.java index 1e0290d98..aa49e8ab2 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataPerspective.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataPerspective.java @@ -19,7 +19,7 @@ public class MetadataPerspective implements IPerspectiveFactory { /** * Creates a layout containing the following views: Metadata Tree, Dump Contents * and Dump Summary, with no editor area. - * + * * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout( * org.eclipse.ui.IPageLayout) */ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeContentProvider.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeContentProvider.java index a222161af..84a61fd57 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeContentProvider.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeContentProvider.java @@ -21,27 +21,27 @@ import org.eclipse.jface.viewers.Viewer; /** * A tree content provider for Metadata view. Its input is a metadata directory, - * the root directory from which Eclipse metadata files - * will be searched. The result is a tree containing directory that contains - * (any directories that contain) metadata files and the metadata files + * the root directory from which Eclipse metadata files + * will be searched. The result is a tree containing directory that contains + * (any directories that contain) metadata files and the metadata files * themselves.<br> - * This content provider mantains its contents using + * This content provider mantains its contents using * <code>TreeContentProviderNode</code> * objects. - * + * * @see org.eclipse.core.tools.TreeContentProviderNode */ public class MetadataTreeContentProvider extends AbstractTreeContentProvider { - /** - * The file filter. - * + /** + * The file filter. + * * @see MetadataFileFilter */ private FileFilter fileFilter; - /** - * The directory filter. - * + /** + * The directory filter. + * * @see DirectoryFilter */ private FileFilter directoryFilter; @@ -49,9 +49,9 @@ public class MetadataTreeContentProvider extends AbstractTreeContentProvider { private MetadataTreeRebuilder treeRebuilder; /** - * Constructs a new content provider. - * - * @param registeredFileNames an array containing all metadata file names known + * Constructs a new content provider. + * + * @param registeredFileNames an array containing all metadata file names known */ public MetadataTreeContentProvider(String[] registeredFileNames) { super(true); @@ -61,24 +61,24 @@ public class MetadataTreeContentProvider extends AbstractTreeContentProvider { } /** - * Returns true if the input is a <code>File</code> object pointing to + * Returns true if the input is a <code>File</code> object pointing to * a directory. - * - * @return true if this input object is a <code>File</code> pointing to a + * + * @return true if this input object is a <code>File</code> pointing to a * directory. - * @param input an input object + * @param input an input object * @see org.eclipse.core.tools.AbstractTreeContentProvider#acceptInput(java.lang.Object) */ @Override protected boolean acceptInput(Object input) { - return (input instanceof File) && ((File) input).isDirectory(); //$NON-NLS-1$ + return (input instanceof File) && ((File) input).isDirectory(); } /** * Updates the data model for this content provider upon the provided input. - * + * * @param input a File object pointing to a metadata directory. - * + * * @see org.eclipse.core.tools.AbstractTreeContentProvider#rebuild(Viewer, Object) */ @Override @@ -126,16 +126,16 @@ public class MetadataTreeContentProvider extends AbstractTreeContentProvider { } /** - * Builds this content provider data model from a given root directory. This - * method operates recursively, adding a tree node for each file of a registered - * type it finds and for each directory that contains (any directories that - * contain) a file of a registered type. This method returns a boolean value - * indicating that it (or at least one of its sub dirs) contains files with one + * Builds this content provider data model from a given root directory. This + * method operates recursively, adding a tree node for each file of a registered + * type it finds and for each directory that contains (any directories that + * contain) a file of a registered type. This method returns a boolean value + * indicating that it (or at least one of its sub dirs) contains files with one * of the registered types (so its parent will include it too). - * + * * @param dir a directory potentially containing known metadata files. - * @param dirNode the node corresponding to that directory - * @return true if the provided dir (or at least one of its sub dirs) + * @param dirNode the node corresponding to that directory + * @return true if the provided dir (or at least one of its sub dirs) * contains files with one of the registered types, false otherwise */ boolean extractInfo(File dir, TreeContentProviderNode dirNode, IProgressMonitor monitor) { @@ -147,7 +147,7 @@ public class MetadataTreeContentProvider extends AbstractTreeContentProvider { monitor.beginTask("Scanning dir " + dir, 100); //$NON-NLS-1$ try { - // looks for files of registered types in this directory + // looks for files of registered types in this directory File[] selectedFiles = dir.listFiles(fileFilter); monitor.worked(1); Arrays.sort(selectedFiles); @@ -175,15 +175,15 @@ public class MetadataTreeContentProvider extends AbstractTreeContentProvider { } /** - * Helper method that creates a new TreeContentProviderNode object given a File + * Helper method that creates a new TreeContentProviderNode object given a File * object. - * + * * @param file the file a node will created for - * @return a <code>TreeContentProviderNode</code> + * @return a <code>TreeContentProviderNode</code> */ private TreeContentProviderNode makeNode(final File file) { return new TreeContentProviderNode(file.getName(), file) { - // redefines toString so the root shows the full path while any other + // redefines toString so the root shows the full path while any other // node shows only the file / directory name @Override public String toString() { @@ -194,7 +194,7 @@ public class MetadataTreeContentProvider extends AbstractTreeContentProvider { /** * Filters directories entries. - * + * * @see java.io.FileFilter */ private class DirectoryFilter implements FileFilter { diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeView.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeView.java index 1db90c318..7114c56ff 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeView.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MetadataTreeView.java @@ -25,9 +25,9 @@ import org.eclipse.ui.PlatformUI; */ public class MetadataTreeView extends SpyView { - /** + /** * A JFace widget used to display a tree corresponding to the metadata - * directory structure (containing only files of known types). + * directory structure (containing only files of known types). */ protected AbstractTreeViewer viewer; @@ -116,7 +116,7 @@ public class MetadataTreeView extends SpyView { /** * Creates this view widget and actions. - * + * * @param parent the parent control * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ @@ -157,7 +157,7 @@ public class MetadataTreeView extends SpyView { /** * Rebuilds the viewer content provider. - * + * * @param file * @see WorkspaceContentProvider#inputChanged(Viewer, Object, Object) */ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MeteredInputStream.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MeteredInputStream.java index 178e23cde..5650bff86 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MeteredInputStream.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MeteredInputStream.java @@ -22,7 +22,7 @@ public class MeteredInputStream extends PushbackInputStream { /** * Constructs a metered input stream chained to the given source input stream. - * + * * @param in the input stream from where to read data */ public MeteredInputStream(InputStream in) { @@ -30,11 +30,11 @@ public class MeteredInputStream extends PushbackInputStream { } /** - * Forwards the call to the super class, incrementing the offset if a + * Forwards the call to the super class, incrementing the offset if a * byte is successfully read. - * + * * @return the next byte or <code>-1</code> if there is more data to be read. - * @throws IOException if a failure occurs while reading the input stream + * @throws IOException if a failure occurs while reading the input stream * @see java.io.PushbackInputStream#read() */ @Override @@ -48,8 +48,8 @@ public class MeteredInputStream extends PushbackInputStream { /** * Forwards the call to the super class, incrementing the current offset * by the number of bytes read. - * - * @param b an array containing bytes to be read + * + * @param b an array containing bytes to be read * @return the number of bytes read. * @throws IOException if a failure occurs while reading the input stream * @see java.io.PushbackInputStream#read(byte[]) @@ -62,10 +62,10 @@ public class MeteredInputStream extends PushbackInputStream { /** * Forwards the call to the super class, incrementing the current offset * by the number of bytes read. - * + * * @param b an array containing bytes to be read * @param off the array offset where bytes will be read to - * @param len the number of bytes to be read + * @param len the number of bytes to be read * @return the number of bytes read * @throws IOException if a failure occurs while reading the input stream * @see java.io.PushbackInputStream#read(byte[], int, int) @@ -80,7 +80,7 @@ public class MeteredInputStream extends PushbackInputStream { /** * Returns the current offset value. - * + * * @return long the current number of bytes read */ public long getOffset() { @@ -90,8 +90,8 @@ public class MeteredInputStream extends PushbackInputStream { /** * Forwards the call to the underlying input stream, decrementing the offset by * the number of bytes unread. - * - * @param b an array containing bytes to be unread + * + * @param b an array containing bytes to be unread * @throws IOException if a failure occurs * @see java.io.PushbackInputStream#unread(byte) */ @@ -104,10 +104,10 @@ public class MeteredInputStream extends PushbackInputStream { /** * Forwards the call to the underlying input stream, decrementing the offset by * the number of bytes unread. - * + * * @param b an array containing bytes to be unread * @param off the array offset from where bytes will be unread - * @param len the number of bytes to be unread + * @param len the number of bytes to be unread * @throws IOException if a failure occurs * @see PushbackInputStream#unread(byte[], int, int) */ @@ -118,10 +118,10 @@ public class MeteredInputStream extends PushbackInputStream { } /** - * Forwards the call to the underlying push back input stream, decrementing the - * offset if a + * Forwards the call to the underlying push back input stream, decrementing the + * offset if a * byte is successfully unread. - * + * * @param b the byte to be unread * @throws IOException if a failure occurs * @see PushbackInputStream#unread(byte[]) diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MultiStrategyDumper.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MultiStrategyDumper.java index 2cb639f49..e431f363f 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MultiStrategyDumper.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/MultiStrategyDumper.java @@ -13,22 +13,22 @@ package org.eclipse.core.tools.metadata; import java.io.*; /** - * Subclasses must provide a concrete + * Subclasses must provide a concrete * implementation for <code>getStringDumpingStrategy(InputStream)</code> method. */ public abstract class MultiStrategyDumper extends AbstractDumper { /** - * <p>Subclasses must implement - * <code>getStringDumpingStrategy(InputStream)</code> in order to select the - * real dumping behaviour. This method will call - * <code>IStringDumpingStrategy#dumpStringContents(DataInputStream)</code> on - * the returned strategy. If, after calling that method, there are still bytes - * to be read in the input stream, - * <code>getStringDumpingStrategy(InputStream)</code> will be called again in + * <p>Subclasses must implement + * <code>getStringDumpingStrategy(InputStream)</code> in order to select the + * real dumping behaviour. This method will call + * <code>IStringDumpingStrategy#dumpStringContents(DataInputStream)</code> on + * the returned strategy. If, after calling that method, there are still bytes + * to be read in the input stream, + * <code>getStringDumpingStrategy(InputStream)</code> will be called again in * order to select another strategy to read the remaining contents, and so on. - * </p> - * + * </p> + * * @param file the file to be dumped * @return a dump object representing the contents of the dumped file * @see org.eclipse.core.tools.metadata.IDumper#dump(java.io.File) @@ -50,32 +50,32 @@ public abstract class MultiStrategyDumper extends AbstractDumper { contents.append(strategy.getFormatDescription()); contents.append("\n\n"); //$NON-NLS-1$ contents.append(dumpedContents); - contents.append("\n"); //$NON-NLS-1$ + contents.append("\n"); //$NON-NLS-1$ } if (contents.length() == 0) contents.append("No contents\n"); //$NON-NLS-1$ } /** - * Returns a <code>IStringDumpingStrategy</code> object. Subclasses must provide - * a concrete implementation for this method. The input stream is connected to - * the file being dumped. If needed, implementations may consume the input + * Returns a <code>IStringDumpingStrategy</code> object. Subclasses must provide + * a concrete implementation for this method. The input stream is connected to + * the file being dumped. If needed, implementations may consume the input * stream in order to choose a strategy. - * + * * @param input the input stream being read * @return a <code>IStringDumpingStrategy</code> object - * @throws Exception any exceptions occurred during input stream reading must + * @throws Exception any exceptions occurred during input stream reading must * NOT be caught */ protected abstract IStringDumpingStrategy getStringDumpingStrategy(DataInputStream input) throws Exception; /** - * Opens an input stream connected to the file object provided. Provides an - * opportunity for subclasses to select a different input stream class. By + * Opens an input stream connected to the file object provided. Provides an + * opportunity for subclasses to select a different input stream class. By * default, returns a <code>FileInputStream</code> object. - * + * * @param file the file to be opened - * @return an input stream connected to the file provided as + * @return an input stream connected to the file provided as * argument * @throws IOException if an exception happens while opening the inpuut stream */ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/PartialDumpException.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/PartialDumpException.java index 81b0a6487..b544f6a56 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/PartialDumpException.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/PartialDumpException.java @@ -14,8 +14,8 @@ public class PartialDumpException extends DumpException { private static final long serialVersionUID = 1L; /** - * Data read when the error happened. May be - * null. + * Data read when the error happened. May be + * null. */ private Object partialContents; @@ -25,10 +25,10 @@ public class PartialDumpException extends DumpException { } /** - * Returns the contents partially read when this exception occurred. May + * Returns the contents partially read when this exception occurred. May * return <code>null</code>. - * - * @return the contents partially read, or <code>null</code> + * + * @return the contents partially read, or <code>null</code> */ public Object getPartialContents() { return partialContents; diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java index b1c897f29..bdba59a8b 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/ConvertMessageBundleAction.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/ConvertMessageBundleAction.java index 37d9f800b..a061bfdef 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/ConvertMessageBundleAction.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/ConvertMessageBundleAction.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/GotoResourceAction.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/GotoResourceAction.java index d8ab85d71..968facb51 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/GotoResourceAction.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/GotoResourceAction.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/IntegerMap.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/IntegerMap.java index b23507e00..d4df4d7af 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/IntegerMap.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/IntegerMap.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java index 02f1d6ac8..64231794a 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/MessageBundleRefactoring.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java index 1a208dac8..81eaff4a0 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/NLSFileChange.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java index 66c186f85..4157b1fe0 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/PropertyFileConverter.java @@ -3,8 +3,8 @@ * program and the accompanying materials are made available under the terms of * the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * + * Contributors: * IBM - Initial API and implementation **********************************************************************/ package org.eclipse.core.tools.nls; diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java index 11f4bda9b..ec29ce653 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessages.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessagesAction.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessagesAction.java index 8f2d9d4d5..127fc4915 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessagesAction.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/nls/RemoveUnusedMessagesAction.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ActivePluginsView.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ActivePluginsView.java index 07e3470d6..c4b6da635 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ActivePluginsView.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ActivePluginsView.java @@ -23,7 +23,7 @@ import org.eclipse.ui.*; import org.eclipse.ui.actions.ActionFactory; /** - * View used to display the activated plugins + * View used to display the activated plugins */ public class ActivePluginsView extends TableWithTotalView { private Action refreshAction; diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java index b6487d2fe..159874d77 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypePropertySource.java @@ -4,8 +4,8 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * + * Contributors: * Geoff Longman - Initial API and implementation * IBM - Tightening integration with existing Platform **********************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java index 96d92e71f..17fc081eb 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/ContentTypeView.java @@ -22,9 +22,9 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; /** - * Content type Spy view. This view shows detailed information about the currently - * the content type registry . - * + * Content type Spy view. This view shows detailed information about the currently + * the content type registry . + * */ public class ContentTypeView extends SpyView implements IAdaptable { diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java index 16f552595..38ee04353 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsSorter.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM - Initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java index 8c7f1fd9f..29558dbb1 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/EventsView.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM - Initial API and implementation *******************************************************************************/ @@ -27,21 +27,21 @@ import org.eclipse.ui.part.WorkbenchPart; /** * Stats View - * + * * This spy utility will display globally available statistical * information on various plug-ins. The statistics available are those that * are available through the PluginStats class of * org.eclipse.core.resource/src/org/eclipse/core/internal/utils - * + * * Currently available information includes: - * the id of the statistic + * the id of the statistic * the number of notification this plug-in received * the amount of time spent receiving these notifications * the number of build requests on this plug-in * the amount of time spent building this plug-in - * + * * Build statistics will only be displayed if the tracing/debug option - * "build/invoking" in the plug-in org.eclipse.core.resources is set to + * "build/invoking" in the plug-in org.eclipse.core.resources is set to * true. */ @@ -116,7 +116,7 @@ public class EventsView extends TableWithTotalView { case COLUMN_BLAME : return stats.getBlameString(); case COLUMN_CONTEXT : - return stats.getContext(); //$NON-NLS-1$ + return stats.getContext(); case COLUMN_COUNT : return Integer.toString(stats.getRunCount()); case COLUMN_TIME : @@ -196,7 +196,7 @@ public class EventsView extends TableWithTotalView { private ColumnLayoutData columnLayouts[] = {new ColumnWeightData(80), // event new ColumnWeightData(180), // blame new ColumnWeightData(40), // context - new ColumnPixelData(65), // count + new ColumnPixelData(65), // count new ColumnPixelData(65)}; // total time private CopyStructuredSelectionAction copyAction; private Action resetAction; diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/LoadedClassesViewLabelProvider.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/LoadedClassesViewLabelProvider.java index 1b0577513..2ca03b85c 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/LoadedClassesViewLabelProvider.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/LoadedClassesViewLabelProvider.java @@ -41,7 +41,7 @@ public class LoadedClassesViewLabelProvider extends LabelProvider implements ITa // return clazz.getLoadOrder() == -2 ? "<boot>" : "" + clazz.getLoadOrder(); //$NON-NLS-1$ //$NON-NLS-2$ // case 2 : // "Memory", // return classInfo == null ? "" : "" + (classInfo.getRAMSize() + classInfo.getROMSize()); //$NON-NLS-1$ //$NON-NLS-2$ -// case 3 : // "Plug-in Id", +// case 3 : // "Plug-in Id", // return clazz.getClassloader().getId(); // case 4 : // "Activation time", // return "" + clazz.getTimestamp(); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java index 9228a18df..2a9ff25bc 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyGraphNode.java @@ -30,7 +30,7 @@ public class PluginDependencyGraphNode { private Set ancestors = new HashSet(); /** - * Constructor for this class. Each node is associated with a plug-in so + * Constructor for this class. Each node is associated with a plug-in so * we accept the plug-in descriptor here and keep it around for later use. */ public PluginDependencyGraphNode(BundleDescription descriptor) { @@ -54,7 +54,7 @@ public class PluginDependencyGraphNode { /** * Return the identifier for this node. It is the unique plug-in identifier * for this object's plug-in descriptor. - * + * * @return the plug-in id */ public String getId() { diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyView.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyView.java index 85ddc9fc9..a955ea679 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyView.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PluginDependencyView.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM - Initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java index e8e9d9a10..2b4261091 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/runtime/PreferenceStatsView.java @@ -28,12 +28,12 @@ import org.osgi.service.prefs.BackingStoreException; /** * Text view that dumps sizeof info and stats about the * Eclipse preferences tree. - * + * * @since 3.0 */ public class PreferenceStatsView extends SpyView { - // The JFace widget used for showing the Element Tree info. + // The JFace widget used for showing the Element Tree info. protected TextViewer viewer; private IAction updateAction; diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnreferencedFilesAction.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnreferencedFilesAction.java index fa3791ddd..1ced47414 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnreferencedFilesAction.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnreferencedFilesAction.java @@ -1,15 +1,17 @@ /******************************************************************************* * Copyright (c) 2005, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.core.tools.search; +import org.eclipse.search.ui.text.TextSearchQueryProvider; + import java.util.Iterator; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.CoreException; @@ -52,7 +54,7 @@ public class FindUnreferencedFilesAction implements IObjectActionDelegate { } else if (resource instanceof IFile) { String name = resource.getName(); IRunnableContext context = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - ISearchQuery query = DefaultTextSearchQueryProvider.getPreferred().createQuery(name); + ISearchQuery query = TextSearchQueryProvider.getPreferred().createQuery(name); NewSearchUI.runQueryInForeground(context, query); ISearchResult result = query.getSearchResult(); if (result instanceof AbstractTextSearchResult) { @@ -62,7 +64,7 @@ public class FindUnreferencedFilesAction implements IObjectActionDelegate { } } } - + } @Override diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembers.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembers.java index b41c489ab..53daff110 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembers.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembers.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembersAction.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembersAction.java index bd368692d..97b02a280 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembersAction.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedMembersAction.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchQuery.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchQuery.java index 666e82e57..758946ff1 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchQuery.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchQuery.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -17,7 +17,7 @@ import org.eclipse.search.ui.ISearchQuery; import org.eclipse.search.ui.ISearchResult; /** - * + * */ public class FindUnusedSearchQuery implements ISearchQuery { diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResult.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResult.java index 7bc03ff32..38ecf8d62 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResult.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResult.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -20,7 +20,7 @@ import org.eclipse.search.ui.ISearchQuery; import org.eclipse.search.ui.text.*; /** - * + * */ public class FindUnusedSearchResult extends AbstractTextSearchResult implements IResultReporter { diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java index d9e04432a..76023c20d 100644 --- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java +++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/search/FindUnusedSearchResultPage.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -26,7 +26,7 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.IShowInTargetList; /** - * + * */ public class FindUnusedSearchResultPage extends AbstractTextSearchViewPage implements ISearchResultPage, IAdaptable { |