diff --git a/android/core/.settings/org.eclipse.jdt.core.prefs b/android/core/.settings/org.eclipse.jdt.core.prefs index d43062a7c..77d22ca73 100644 --- a/android/core/.settings/org.eclipse.jdt.core.prefs +++ b/android/core/.settings/org.eclipse.jdt.core.prefs @@ -1,260 +1,260 @@ -#Wed Dec 02 13:54:32 EST 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=18 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=18 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=36 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18 -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.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -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.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=2 -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_member=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_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=80 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +#Mon Feb 22 14:47:49 EST 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=18 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=36 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18 +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.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=0 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=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_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_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +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.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=2 +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_member=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_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/app/.settings/org.eclipse.jdt.core.prefs b/app/.settings/org.eclipse.jdt.core.prefs index 504b38329..b3b09b806 100644 --- a/app/.settings/org.eclipse.jdt.core.prefs +++ b/app/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Mon Feb 22 11:14:24 EST 2010 +#Mon Feb 22 14:47:49 EST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -68,7 +68,7 @@ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=18 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=18 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 @@ -87,14 +87,14 @@ org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declar org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 org.eclipse.jdt.core.formatter.blank_lines_before_method=1 org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=0 org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line diff --git a/app/.settings/org.eclipse.jdt.ui.prefs b/app/.settings/org.eclipse.jdt.ui.prefs index 86f3aa1c5..0ce006218 100644 --- a/app/.settings/org.eclipse.jdt.ui.prefs +++ b/app/.settings/org.eclipse.jdt.ui.prefs @@ -1,6 +1,6 @@ -#Mon Feb 22 11:14:24 EST 2010 +#Mon Feb 22 14:31:32 EST 2010 eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_processing formatter_settings_version=11 sp_cleanup.add_default_serial_version_id=true @@ -11,20 +11,20 @@ sp_cleanup.add_missing_methods=false sp_cleanup.add_missing_nls_tags=false sp_cleanup.add_missing_override_annotations=true sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=false +sp_cleanup.always_use_blocks=true sp_cleanup.always_use_parentheses_in_expressions=false sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_method_access=false sp_cleanup.convert_to_enhanced_for_loop=true -sp_cleanup.correct_indentation=false +sp_cleanup.correct_indentation=true sp_cleanup.format_source_code=true sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false +sp_cleanup.make_local_variable_final=true sp_cleanup.make_parameters_final=true -sp_cleanup.make_private_fields_final=false +sp_cleanup.make_private_fields_final=true sp_cleanup.make_type_abstract_if_missing_method=false sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=true +sp_cleanup.never_use_blocks=false sp_cleanup.never_use_parentheses_in_expressions=true sp_cleanup.on_save_use_additional_actions=true sp_cleanup.organize_imports=true @@ -34,12 +34,12 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class= sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=false +sp_cleanup.remove_trailing_whitespaces_ignore_empty=true sp_cleanup.remove_unnecessary_casts=true sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_imports=true sp_cleanup.remove_unused_local_variables=false sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_members=false diff --git a/app/src/processing/app/tools/android/Android.java b/app/src/processing/app/tools/android/Android.java index b8326772c..978a132b9 100644 --- a/app/src/processing/app/tools/android/Android.java +++ b/app/src/processing/app/tools/android/Android.java @@ -26,9 +26,7 @@ import java.io.IOException; import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; - import javax.swing.JOptionPane; - import processing.app.Base; import processing.app.Editor; import processing.app.Platform; @@ -110,8 +108,7 @@ public class Android implements Tool { checkCore(); editor.setHandlers(new RunHandler(), new PresentHandler(), - new StopHandler(), new ExportHandler(), - new ExportAppHandler()); + new StopHandler(), new ExportHandler(), new ExportAppHandler()); build = new Build(editor); editor.statusNotice("Done loading Android tools."); } @@ -126,26 +123,21 @@ public class Android implements Tool { sdkPath = platform.getenv("ANDROID_SDK"); if (sdkPath == null) { Base - .showWarning( - "Android Tools Error", - "Before using Android mode, you must first set the\n" - + "ANDROID_SDK environment variable, and restart Processing.", - null); + .showWarning("Android Tools Error", + "Before using Android mode, you must first set the\n" + + "ANDROID_SDK environment variable, and restart Processing.", + null); return false; } // check to make sure the ANDROID_SDK variable is legit final File toolsFolder = new File(sdkPath, "tools"); if (!toolsFolder.exists()) { - Base - .showWarning( - "Android Tools Error", - "The ANDROID_SDK environment variable is set incorrectly,\n" - + "or the directory no longer exists. No tools folder was\n" - + "found in " + toolsFolder.getAbsolutePath() - + ".\n" - + "Please fix the location and restart Processing.", - null); + Base.showWarning("Android Tools Error", + "The ANDROID_SDK environment variable is set incorrectly,\n" + + "or the directory no longer exists. No tools folder was\n" + + "found in " + toolsFolder.getAbsolutePath() + ".\n" + + "Please fix the location and restart Processing.", null); return false; } @@ -181,19 +173,13 @@ public class Android implements Tool { return true; } } - Base - .showWarning( - "Android Tools Error", - "You need to add the tools folder of the Android SDK\n" - + "to your PATH environment variable and restart Processing.\n" - + "The folder is: " + toolsFolder.getAbsolutePath() - + ".", null); + Base.showWarning("Android Tools Error", + "You need to add the tools folder of the Android SDK\n" + + "to your PATH environment variable and restart Processing.\n" + + "The folder is: " + toolsFolder.getAbsolutePath() + ".", null); } catch (final IOException e) { - Base - .showWarning( - "Android Tools Error", - "Error while trying to check the PATH for the Android tools.", - e); + Base.showWarning("Android Tools Error", + "Error while trying to check the PATH for the Android tools.", e); } return false; } @@ -224,11 +210,10 @@ public class Android implements Tool { if (sdkPath == null) { final int result = Base.showYesNoQuestion(editor, "Android SDK", - ANDROID_SDK_PRIMARY, - ANDROID_SDK_SECONDARY); + ANDROID_SDK_PRIMARY, ANDROID_SDK_SECONDARY); if (result == JOptionPane.YES_OPTION) { final File folder = Base.selectFolder(SELECT_ANDROID_SDK_FOLDER, - null, editor); + null, editor); if (folder != null) { sdkPath = findAndroidTool(folder.getAbsolutePath()); if (sdkPath != null) { @@ -276,7 +261,7 @@ public class Android implements Tool { // // String[] cmd = { "echo", "$PATH" }; // try { - // Pavarotti p = new Pavarotti(cmd); + // ProcessHelper p = new ProcessHelper(cmd); // int result = p.waitFor(); // if (result == 0) { // PApplet.println(p.getOutputLines()); @@ -325,8 +310,8 @@ public class Android implements Tool { // will probably fail, however it happily returns "device" in other cases // when the debug bridge is clearly unhappy. /* - * try { System.out.print("adb get state: "); Pavarotti p = new - * Pavarotti(new String[] { "adb", "get-state" }); p.waitFor(); + * try { System.out.print("adb get state: "); ProcessHelper p = new + * ProcessHelper(new String[] { "adb", "get-state" }); p.waitFor(); * p.printLines(); } catch (Exception e) { e.printStackTrace(); } */ return true; @@ -365,7 +350,7 @@ public class Android implements Tool { PApplet.saveStream(target, url.openStream()); } catch (final Exception e) { Base.showWarning("Download Error", - "Could not download Android core.zip", e); + "Could not download Android core.zip", e); return false; } } @@ -388,31 +373,22 @@ public class Android implements Tool { */ static protected boolean resetServer(final Editor editor) { try { - final Pavarotti killer = new Pavarotti(new String[] { - "adb", "kill-server" }); + final ProcessHelper killer = new ProcessHelper("adb", "kill-server"); // don't really care about this result... - killer.waitFor(); - killer.printLines(); - + killer.execute(true, false); Thread.sleep(1000); // just take a quick break so that the server can die // ...we only care about whether it was able to start successfully. - final Pavarotti starter = new Pavarotti(new String[] { - "adb", "start-server" }); - final int result = starter.waitFor(); - starter.printLines(); - if (result == 0) { + final ProcessHelper starter = new ProcessHelper("adb", "start-server"); + if (starter.execute(true, false) == 0) { return true; } - killer.printLines(); // okay maybe now we care about these - starter.printLines(); // something to confuse the user a bit + System.err.println(killer.getStderr()); // okay maybe now we care about these + System.err.println(starter.getStderr()); // something to confuse the user a bit editor.statusError("Could not start Android debug server."); - } catch (final IOException e) { editor.statusError(e); - } catch (final InterruptedException e) { - e.printStackTrace(); } return false; } @@ -442,7 +418,6 @@ public class Android implements Tool { // emulatorProcess.destroy(); emulatorProcess.exitValue(); emulatorProcess = null; - } catch (final IllegalThreadStateException itse) { // not done yet, let's continue } @@ -559,7 +534,7 @@ public class Android implements Tool { // //adb get-state // try { // System.out.print("(installAndRun) adb get state: "); - // Pavarotti p = new Pavarotti(new String[] { "adb", "get-state" }); + // ProcessHelper p = new ProcessHelper(new String[] { "adb", "get-state" }); // p.waitFor(); // p.printLines(); // } catch (Exception e) { @@ -628,38 +603,12 @@ public class Android implements Tool { // while launching, will say 'error: device offline' // when not running, will say 'error: device not found' - final String[] cmd = new String[] { "adb", "-s", device, "jdwp" // come - // and - // play! - }; - final Pavarotti p = new Pavarotti(cmd); - // Process p = Runtime.getRuntime().exec(cmd); - - // System.out.println(); // System.out.print("Checking for JDWP connection: "); - // System.out.println(PApplet.join(cmd, " ")); - - // StringRedirectThread error = new - // StringRedirectThread(p.getErrorStream()); - // StringRedirectThread output = new - // StringRedirectThread(p.getInputStream()); - - final int result = p.waitFor(); - if (result == 0) { + final ProcessHelper p = new ProcessHelper("adb", "-s", device, "jdwp"); + if (p.execute() == 0) { return true; - // error.finish(); - // output.finish(); } - - p.printLines(); - /* - * // for (String err : error.getLines()) { for (String err : - * p.getErrorLines()) { if (err.length() != 0) { - * System.err.println("err: " + err); } } // for (String out : - * output.getLines()) { for (String out : p.getOutputLines()) { if - * (out.length() != 0) { System.out.println("out: " + out); } } - */ - + p.dump(); try { Thread.sleep(1000); } catch (final InterruptedException ie) { @@ -672,7 +621,7 @@ public class Android implements Tool { } protected String getJdwpPort(final String device) { - final long timeout = System.currentTimeMillis() + 30 * 1000; // 15 sec + final long timeout = System.currentTimeMillis() + 30 * 1000; try { while (System.currentTimeMillis() < timeout) { @@ -683,33 +632,9 @@ public class Android implements Tool { // while launching, will say 'error: device offline' // when not running, will say 'error: device not found' - final String[] cmd = new String[] { "adb", "-s", device, "jdwp" // come - // and - // play! - }; - final Pavarotti p = new Pavarotti(cmd); - final int result = p.waitFor(); - - // for (String err : p.getErrorLines()) { - // if (err.length() != 0) { - // System.err.println("err: " + err); - // } - // } - // for (String out : p.getOutputLines()) { - // if (out.length() != 0) { - // System.out.println("out: " + out); - // } - // } - - if (result == 0) { - final String[] lines = p.getOutputLines(); - // PApplet.println(lines); - // String last = lines[lines.length - 1]; - // if (last.trim().length() == 0) { - // last = lines[lines.length - 2]; - // } - // //System.out.println("last is " + last); - // return last.trim(); + final ProcessHelper p = new ProcessHelper("adb", "-s", device, "jdwp"); + if (p.execute() == 0) { + final String[] lines = p.getStdout().split("\n"); for (int i = lines.length - 1; i >= 0; --i) { final String s = lines[i].trim(); if (s.length() != 0) { @@ -717,15 +642,9 @@ public class Android implements Tool { } } return null; - - } else { - for (final String err : p.getErrorLines()) { - if (err.length() != 0) { - System.err.println("err: " + err); - } - } } + p.dump(); try { Thread.sleep(1000); } catch (final InterruptedException ie) { @@ -747,61 +666,42 @@ public class Android implements Tool { // Device.sendMenuButton(device); // wake up // Device.sendHomeButton(device); // kill any running app - final String[] cmd = new String[] { "adb", "-s", device, - // "wait-for-device", - "install", "-r", // safe to always use -r switch - build.getPathForAPK("debug") }; - final Process p = Runtime.getRuntime().exec(cmd); + final ProcessHelper p = new ProcessHelper("adb", "-s", device, // "wait-for-device", + "install", "-r", // safe to always use -r switch + build.getPathForAPK("debug")); System.out.println(); System.out.print("Install command: "); - System.out.println(PApplet.join(cmd, " ")); + System.out.println(p.getCommand()); - final StringRedirectThread error = new StringRedirectThread(p - .getErrorStream()); - final StringRedirectThread output = new StringRedirectThread(p - .getInputStream()); - - final int result = p.waitFor(); + final int result = p.execute(); if (result != 0) { - for (final String err : error.getLines()) { - System.err.println(err); - } + p.dump(); // editor.statusNotice("“adb install” returned " + result + "."); // System.out.println("Could not install the sketch."); editor.statusError("Could not install the sketch."); - System.out.println("“adb install” returned " + result + "."); + System.err.println("“adb install” returned " + result + "."); return false; - } else { - String errorMsg = null; - for (final String out : output.getLines()) { - if (out.startsWith("Failure")) { - // String[] stuff = PApplet.match(out, "\\[(.*)\\]"); - // if (stuff != null) { - // errorMsg = stuff[1]; - // } else { - errorMsg = out.substring(8); - // } - System.err.println(out); - } else { - System.out.println(out); - } - } - if (errorMsg == null) { - editor.statusNotice("Done installing."); - return true; - + } + String errorMsg = null; + for (final String out : p.getStdout().split("\n")) { + if (out.startsWith("Failure")) { + errorMsg = out.substring(8); + System.err.println(out); } else { - editor.statusError("Error while installing " + errorMsg); + System.out.println(out); } } + if (errorMsg == null) { + editor.statusNotice("Done installing."); + return true; + } + editor.statusError("Error while installing " + errorMsg); } catch (final IOException e) { editor.statusError(e); - } catch (final InterruptedException e) { } - return false; } @@ -815,22 +715,21 @@ public class Android implements Tool { final String lastPort = getJdwpPort(device); // "am start -a android.intent.action.MAIN -n com.android.browser/.BrowserActivity" - final Process p = Runtime.getRuntime() - .exec( - new String[] { - "adb", - "-s", - device, - // "-d", // this is for a single USB device - "shell", - "am", - "start", // kick things off - // -D causes a hang with - // "waiting for the debugger to attach" - // "-D", // debug - "-e", "debug", "true", "-a", "android.intent.action.MAIN", - "-c", "android.intent.category.LAUNCHER", "-n", - build.getPackageName() + "/." + build.getClassName() }); + final Process p = Runtime.getRuntime().exec( + new String[] { + "adb", + "-s", + device, + // "-d", // this is for a single USB device + "shell", + "am", + "start", // kick things off + // -D causes a hang with + // "waiting for the debugger to attach" + // "-D", // debug + "-e", "debug", "true", "-a", "android.intent.action.MAIN", "-c", + "android.intent.category.LAUNCHER", "-n", + build.getPackageName() + "/." + build.getClassName() }); final int result = p.waitFor(); if (result != 0) { editor.statusError("Could not start the sketch."); @@ -884,25 +783,15 @@ public class Android implements Tool { // while launching, will say 'error: device offline' // when not running, will say 'error: device not found' - // adb -s emulator-5566 -d forward tcp:29882 jdwp:736 - // jdb -connect com.sun.jdi.SocketAttach:hostname=localhost,port=29882 - final String[] cmd = new String[] { - "adb", "-s", device, "forward", "tcp:" + ADB_SOCKET_PORT, - "jdwp:" + port }; // PApplet.println(cmd); - final Pavarotti fwd = new Pavarotti(cmd); - // StringRedirectThread error = new - // StringRedirectThread(p.getErrorStream()); - // StringRedirectThread output = new - // StringRedirectThread(p.getInputStream()); + final ProcessHelper fwd = new ProcessHelper("adb", "-s", device, + "forward", "tcp:" + + ADB_SOCKET_PORT, + "jdwp:" + port); // System.out.println("waiting for forward"); - fwd.printCommand(); - final int result = fwd.waitFor(); - fwd.printLines(); - // System.out.println("done with forward"); - - if (result != 0) { + System.out.println(fwd.getCommand()); + if (fwd.execute(true) != 0) { editor.statusError("Could not connect for debugging."); return false; } diff --git a/app/src/processing/app/tools/android/Build.java b/app/src/processing/app/tools/android/Build.java index 94e352667..fa085ddf5 100644 --- a/app/src/processing/app/tools/android/Build.java +++ b/app/src/processing/app/tools/android/Build.java @@ -9,12 +9,10 @@ import java.io.PrintWriter; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DefaultLogger; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; - import processing.app.Base; import processing.app.Editor; import processing.app.Sketch; @@ -27,7 +25,7 @@ public class Build { static String basePackage = "processing.android.test"; - Editor editor; + private final Editor editor; String className; @@ -83,22 +81,26 @@ public class Build { final Sketch sketch = editor.getSketch(); // Create the 'android' build folder, and move any existing version out. - androidFolder = new File(sketch.getFolder(), "android"); + try { + androidFolder = createAndroidBuildFolder(sketch); + } catch (final IOException e) { + editor.statusError(e); + return false; + } if (androidFolder.exists()) { final Date mod = new Date(androidFolder.lastModified()); final File dest = new File(sketch.getFolder(), "android." + dateFormat.format(mod)); final boolean result = androidFolder.renameTo(dest); if (!result) { - int what = -1; - Pavarotti mv; + final int exitValue; + final ProcessHelper mv; try { - System.out + System.err .println("createProject renameTo() failed, resorting to mv/move instead."); - mv = new Pavarotti(new String[] { - "mv", androidFolder.getAbsolutePath(), dest.getAbsolutePath() }); - what = mv.waitFor(); - + mv = new ProcessHelper("mv", androidFolder.getAbsolutePath(), dest + .getAbsolutePath()); + exitValue = mv.execute(); } catch (final IOException e) { editor.statusError(e); return false; @@ -106,13 +108,13 @@ public class Build { e.printStackTrace(); return false; } - if (what != 0) { - mv.printLines(); + if (exitValue != 0) { + mv.dump(); Base.showWarning("Failed to rename", - "Could not rename the old “android” build folder.\n" - + "Please delete, close, or rename the folder\n" - + androidFolder.getAbsolutePath() + "\n" - + "and try again.", null); + "Could not rename the old “android” build folder.\n" + + "Please delete, close, or rename the folder\n" + + androidFolder.getAbsolutePath() + "\n" + "and try again.", + null); Base.openFolder(sketch.getFolder()); return false; } @@ -120,12 +122,9 @@ public class Build { } else { final boolean result = androidFolder.mkdirs(); if (!result) { - Base - .showWarning( - "Folders, folders, folders", - "Could not create the necessary folders to build.\n" - + "Perhaps you have some file permissions to sort out?", - null); + Base.showWarning("Folders, folders, folders", + "Could not create the necessary folders to build.\n" + + "Perhaps you have some file permissions to sort out?", null); return false; } } @@ -135,7 +134,7 @@ public class Build { try { final File javaFolder = mkdirs(srcFolder, getPackageName().replace('.', - '/')); + '/')); // File srcFile = new File(actualSrc, className + ".java"); final String buildPath = javaFolder.getAbsolutePath(); @@ -186,29 +185,29 @@ public class Build { return true; } - /* - * boolean ecjBuild() { //String primaryClassName = - * sketch.preprocess(buildPath, new Preproc()); + /** + * The Android dex util pukes on paths containing spaces, which will happen + * most of the time on Windows, since Processing sketches wind up in + * "My Documents". Therefore, build android in a temp file. * - * String androidClassPath = Android.sdkPath + - * "platforms/android-1.6/android.jar"; + * TODO: better would be to retrieve the 8.3 name for the sketch folder! * - * // compile the program. errors will happen as a RunnerException // that - * will bubble up to whomever called build(). Compiler compiler = new - * Compiler(); return compiler.compile(this, buildPath, primaryClassName, - * androidClassPath); } - */ - - /* - * // this calls exit(), so would need to do java -cp with the jar files from - * p5 boolean execAntCompile() { //java -cp ant.jar:ant-launcher.jar - * org.apache.tools.ant.Main -f - * ~/coconut/sketchbook/Brightness3/android/build.xml compile - * - * org.apache.tools.ant.Main.main(new String[] { "-f", - * buildFile.getAbsolutePath() }); // String[] cmd = "ant" // Pavarotti p = - * new Pavarotti(cmd); return true; } + * @param sketch + * @return A folder in which to build the android sketch + * @throws IOException */ + private File createAndroidBuildFolder(final Sketch sketch) throws IOException { + final File sketchFolder = sketch.getFolder(); + if (sketchFolder.getAbsolutePath().indexOf(' ') > -1) { + final File tmp = File.createTempFile("android", ".pde"); + if (!(tmp.delete() && tmp.mkdir())) { + throw new IOException("Cannot create temp dir " + tmp + + " to build android sketch"); + } + return tmp; + } + return new File(sketchFolder, "android"); + } /** * @param buildFile @@ -218,7 +217,8 @@ public class Build { */ boolean antBuild(final String target) { final Project p = new Project(); - p.setUserProperty("ant.file", buildFile.getAbsolutePath()); + p.setUserProperty("ant.file", buildFile.getAbsolutePath() + .replace('\\', '/')); // deals with a problem where javac error messages weren't coming through p.setUserProperty("build.compiler", "extJavac"); // p.setUserProperty("build.compiler.emacs", "true"); // does nothing @@ -226,17 +226,10 @@ public class Build { final DefaultLogger consoleLogger = new DefaultLogger(); consoleLogger.setErrorPrintStream(System.err); consoleLogger.setOutputPrintStream(System.out); - consoleLogger.setMessageOutputLevel(Project.MSG_INFO); + consoleLogger.setMessageOutputLevel(Project.MSG_WARN); p.addBuildListener(consoleLogger); final DefaultLogger errorLogger = new DefaultLogger(); - // errorLogger.setEmacsMode(true); // seems to do nothing - // ByteArrayOutputStream baos = new ByteArrayOutputStream(); - // PrintStream ps = new PrintStream(baos); - // //errorLogger.setErrorPrintStream(ps); - // errorLogger.setErrorPrintStream(new PrintStream(new - // ByteArrayOutputStream())); - // errorLogger.setOutputPrintStream(ps); final ByteArrayOutputStream errb = new ByteArrayOutputStream(); final PrintStream errp = new PrintStream(errb); errorLogger.setErrorPrintStream(errp); @@ -254,7 +247,7 @@ public class Build { p.addReference("ant.projectHelper", helper); helper.parse(p, buildFile); // p.executeTarget(p.getDefaultTarget()); - p.executeTarget("debug"); + p.executeTarget(target); editor.statusNotice("Finished building sketch."); return true; @@ -284,7 +277,7 @@ public class Build { // String sketchPath = sketch.getFolder().getAbsolutePath(); final int offset = javacIndex + javacPrefix.length() + 1; final String[] pieces = PApplet.match(line.substring(offset), - "^(.+):([0-9]+):\\s+(.+)$"); + "^(.+):([0-9]+):\\s+(.+)$"); if (pieces != null) { // PApplet.println(pieces); String fileName = pieces[1]; @@ -294,8 +287,7 @@ public class Build { // PApplet.println("looking for " + fileName + " line " + // lineNumber); final RunnerException rex = sketch.placeException(pieces[3], - fileName, - lineNumber); + fileName, lineNumber); if (rex != null) { rex.hideStackTrace(); editor.statusError(rex); @@ -311,30 +303,44 @@ public class Build { // PApplet.println(errorLines); /* - * // System.out.println("ex was " + e.getException()); // - * System.out.println("cause was " + e.getCause()); - * - * // // Try to place the error within the code. // Location location = - * e.getLocation(); // //System.out.println("location is " + location); // - * if (location != null) { // String filename = location.getFileName(); // - * int line = location.getLineNumber(); // - * System.out.println("file/line: " + filename + ", " + line); String - * errorOutput = new String(baos.toByteArray()); String[] errorLines = - * errorOutput.split(System.getProperty("line.separator")); if - * (errorLines.length > 0) { Sketch sketch = editor.getSketch(); String - * sketchPath = sketch.getFolder().getAbsolutePath(); // emacs syntax, - * needs conversion to java syntax //String regexp = - * "^\\s-*\\[[^]]*\\]\\s-*\\(.+\\):\\([0-9]+\\):"; String regexp = - * "^(.+):([0-9]+):(.+)$"; // this works fine String[] pieces = - * PApplet.match(errorLines[2], regexp); if (pieces != null) { - * PApplet.println(pieces); } else { PApplet.println("nuthin"); - * PApplet.println(errorLines); } //String[] pieces = - * PApplet.match(errorLines[0], "(.*\.java):(\\d+):(.*)$"); //if - * (errorLines[0].startsWith(sketchPath)) { // String[] pieces = - * PApplet.split(errorLines[0], ':'); //} // RunnerException rex = // - * sketch.placeException(e.getMessage(), filename, line); // if (rex != - * null) { // editor.statusError(rex); // } else { // - * editor.statusError(e); // } // } else { } + // System.out.println("ex was " + e.getException()); + // System.out.println("cause was " + e.getCause()); + + // // Try to place the error within the code. + // Location location = e.getLocation(); + // //System.out.println("location is " + location); + // if (location != null) { + // String filename = location.getFileName(); + // int line = location.getLineNumber(); + // System.out.println("file/line: " + filename + ", " + line); + String errorOutput = new String(baos.toByteArray()); + String[] errorLines = errorOutput.split(System.getProperty("line.separator")); + if (errorLines.length > 0) { + Sketch sketch = editor.getSketch(); + String sketchPath = sketch.getFolder().getAbsolutePath(); + // emacs syntax, needs conversion to java syntax + //String regexp = "^\\s-*\\[[^]]*\\]\\s-*\\(.+\\):\\([0-9]+\\):"; + String regexp = "^(.+):([0-9]+):(.+)$"; // this works fine + String[] pieces = PApplet.match(errorLines[2], regexp); + if (pieces != null) { + PApplet.println(pieces); + } else { + PApplet.println("nuthin"); + PApplet.println(errorLines); + } + //String[] pieces = PApplet.match(errorLines[0], "(.*\.java):(\\d+):(.*)$"); + //if (errorLines[0].startsWith(sketchPath)) { + // String[] pieces = PApplet.split(errorLines[0], ':'); + //} + // RunnerException rex = + // sketch.placeException(e.getMessage(), filename, line); + // if (rex != null) { + // editor.statusError(rex); + // } else { + // editor.statusError(e); + // } + // } else { + } */ editor.statusError(e); } @@ -358,6 +364,7 @@ public class Build { class Preproc extends PdePreprocessor { + @Override public int writeImports(final PrintStream out) { out.println("package " + getPackageName() + ";"); out.println(); @@ -365,12 +372,14 @@ public class Build { return 2 + super.writeImports(out); } + @Override public String[] getCoreImports() { return new String[] { "processing.android.core.*", // "processing.android.opengl.*", // temporary "processing.android.xml.*" }; } + @Override public String[] getDefaultImports() { return new String[] { // Currently, no additional imports for Android APIs, @@ -532,7 +541,8 @@ public class Build { } /** This recommended to be a string resource so that it can be localized. */ - void writeResValuesStrings(final File file, final String className) { + private static void writeResValuesStrings(final File file, + final String className) { final PrintWriter writer = PApplet.createWriter(file); writer.println(""); writer.println(""); @@ -552,7 +562,7 @@ public class Build { final File exportSettings = new File(libraryFolder, "export.txt"); final HashMap exportTable = Base .readSettings(exportSettings); - final String androidList = (String) exportTable.get("android"); + final String androidList = exportTable.get("android"); String exportList[] = null; if (androidList != null) { exportList = PApplet.splitTokens(androidList, ", "); @@ -578,8 +588,8 @@ public class Build { // As of r4 of the Android SDK, it looks like .zip files // are ignored in the libs folder, so rename to .jar String exportFilename = exportFile.getName(); - exportFilename = exportFilename - .substring(0, exportFilename.length() - 4) + exportFilename = exportFilename.substring(0, + exportFilename.length() - 4) + ".jar"; Base.copyFile(exportFile, new File(libsFolder, exportFilename)); @@ -589,7 +599,7 @@ public class Build { } else { Base.copyFile(exportFile, - new File(assetsFolder, exportFile.getName())); + new File(assetsFolder, exportFile.getName())); } } } diff --git a/app/src/processing/app/tools/android/Device.java b/app/src/processing/app/tools/android/Device.java index 08525c446..0c25a49a2 100644 --- a/app/src/processing/app/tools/android/Device.java +++ b/app/src/processing/app/tools/android/Device.java @@ -22,7 +22,6 @@ package processing.app.tools.android; import java.io.IOException; - import processing.app.Base; import processing.core.PApplet; @@ -93,22 +92,10 @@ public class Device { } protected boolean exists() throws IOException { - final String[] cmd = { Android.toolName, "list", "avds" }; - // Process p = Runtime.getRuntime().exec(cmd); - // StringRedirectThread error = new - // StringRedirectThread(p.getErrorStream()); - // StringRedirectThread output = new - // StringRedirectThread(p.getInputStream()); - final Pavarotti p = new Pavarotti(cmd); - + final ProcessHelper p = new ProcessHelper(Android.toolName, "list", "avds"); try { - final int result = p.waitFor(); - // System.out.println("res is " + result); - if (result == 0) { - // String[] lines = output.getLines(); - final String[] lines = p.getOutputLines(); - // PApplet.println(lines); - for (final String line : lines) { + if (p.execute() == 0) { + for (final String line : p.getStdout().split("\n")) { final String[] m = PApplet.match(line, "\\s+Name:\\s+(\\S+)"); // PApplet.println(m); if (m != null) { @@ -118,49 +105,27 @@ public class Device { } } } else { - p.printLines(); + p.dump(); } } catch (final InterruptedException ie) { } - return false; } protected boolean create() throws IOException { - // not using "-s", width + "x" + height, because that can be specified - // on startup, which will be easier to do for Processing apps anyway. - final String[] cmd = { - Android.toolName, "create", "avd", "-n", name, "-t", target, "-c", "64M" }; - final Pavarotti p = new Pavarotti(cmd); - // Process p = Runtime.getRuntime().exec(cmd); - // StringRedirectThread error = new - // StringRedirectThread(p.getErrorStream()); - // StringRedirectThread output = new - // StringRedirectThread(p.getInputStream()); + final ProcessHelper p = new ProcessHelper(Android.toolName, "create", + "avd", "-n", name, "-t", target, + "-c", "64M"); try { - final int result = p.waitFor(); - if (result == 0) { - // mumble the result into the console - // PApplet.println(output.getLines()); - // for (String s : output.getLines()) { - for (final String s : p.getOutputLines()) { - System.out.println(s); - } + if (p.execute(true, false) == 0) { return true; - - } else { - System.out.println("Attempted: '" + PApplet.join(cmd, " ") + "'"); - // Include the stdout stuff since lots of these tools die with an - // error, but use stdout to print their sadness instead of stderr - // for (String s : output.getLines()) { - for (final String s : p.getOutputLines()) { - System.out.println(s); - } - for (final String s : p.getErrorLines()) { - System.err.println(s); - } } + System.out.println("Attempted: '" + + PApplet.join(new String[] { + Android.toolName, "create", "avd", "-n", name, "-t", target, "-c", + "64M" }, " ") + "'"); + p.dump(); } catch (final InterruptedException ie) { } @@ -227,74 +192,68 @@ public class Device { // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . static protected String[] list() throws IOException { - final String[] cmd = { "adb", "devices" }; - final Pavarotti p = new Pavarotti(cmd); - // Process p = Runtime.getRuntime().exec(cmd); - // StringRedirectThread error = new - // StringRedirectThread(p.getErrorStream()); - // StringRedirectThread output = new - // StringRedirectThread(p.getInputStream()); - + final ProcessHelper p = new ProcessHelper("adb", "devices"); try { - final int result = p.waitFor(); - if (result == 0) { - String[] lines = p.getOutputLines(); - // First line starts "List of devices", last line is blank. + final int result = p.execute(false); + if (result != 0) { + System.err.println(p.getStderr()); + return null; + } + final String[] lines = p.getStdout().split("\n"); + // First line starts "List of devices" - // when an emulator is started with a debug port, then it shows up - // in the list of devices. + // when an emulator is started with a debug port, then it shows up + // in the list of devices. - // List of devices attached - // HT91MLC00031 device - // emulator-5554 offline + // List of devices attached + // HT91MLC00031 device + // emulator-5554 offline - // List of devices attached - // HT91MLC00031 device - // emulator-5554 device + // List of devices attached + // HT91MLC00031 device + // emulator-5554 device - // for (String s : lines) { - // System.out.println("Device.list(): '" + s + "."); - // } + // for (String s : lines) { + // System.out.println("Device.list(): '" + s + "."); + // } - if (lines == null || lines.length == 0) { - // result was 0, so we're ok, but this is odd. - System.out.println("No devices found."); - return new String[] {}; - } + if (lines.length == 0) { + // result was 0, so we're ok, but this is odd. + System.out.println("No devices found."); + return new String[] {}; + } - if (lines[0].startsWith("* daemon not running. starting it now *")) { - // just pretend he didn't say that. - lines = PApplet.subset(lines, 1); - } + int startIndex = 0; - if (lines[0].startsWith("* daemon started successfully *")) { - // ignore that too - lines = PApplet.subset(lines, 1); - } + if (lines[startIndex] + .startsWith("* daemon not running. starting it now *")) { + // just pretend he didn't say that. + startIndex++; + } - // might read "List of devices attached" - if (!lines[0].startsWith("List of devices") - || lines[lines.length - 1].trim().length() != 0) { - Base.showWarning("Android Error", ADB_DEVICES_ERROR, null); - } - String[] devices = new String[lines.length - 2]; - int deviceIndex = 0; - for (int i = 1; i < lines.length - 1; i++) { - final int tab = lines[i].indexOf('\t'); - if (tab != -1) { - devices[deviceIndex++] = lines[i].substring(0, tab); - } else if (lines[i].trim().length() != 0) { - System.out.println("Unknown “adb devices” response: " + lines[i]); - } - } - devices = PApplet.subset(devices, 0, deviceIndex); - return devices; + if (lines[startIndex].startsWith("* daemon started successfully *")) { + // ignore that too + startIndex++; + } - } else { - for (final String s : p.getErrorLines()) { - System.err.println(s); + // might read "List of devices attached" + if (!lines[startIndex].startsWith("List of devices")) { + Base.showWarning("Android Error", ADB_DEVICES_ERROR, null); + } + startIndex++; + String[] devices = new String[lines.length - startIndex]; + int deviceIndex = 0; + for (int i = startIndex; i < lines.length - 1; i++) { + final String line = lines[i]; + final int tab = line.indexOf('\t'); + if (tab != -1) { + devices[deviceIndex++] = line.substring(0, tab); + } else if (line.trim().length() != 0) { + System.out.println("Unknown “adb devices” response: " + line); } } + devices = PApplet.subset(devices, 0, deviceIndex); + return devices; } catch (final InterruptedException ie) { // ignored, just other thread fun } diff --git a/app/src/processing/app/tools/android/Pavarotti.java b/app/src/processing/app/tools/android/Pavarotti.java deleted file mode 100644 index 124dc64a8..000000000 --- a/app/src/processing/app/tools/android/Pavarotti.java +++ /dev/null @@ -1,107 +0,0 @@ -/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */ - -/* - Part of the Processing project - http://processing.org - - Copyright (c) 2009-10 Ben Fry and Casey Reas - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 - as published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -package processing.app.tools.android; - -import java.io.IOException; - -import processing.core.PApplet; - -/** - * Class to handle calling Runtime.exec() and stuffing input and error streams - * into String arrays that can be dealt with more easily. - */ -public class Pavarotti { - Process process; - - String[] cmd; - - StringRedirectThread error; - - StringRedirectThread output; - - public Pavarotti(final String[] cmd) throws IOException { - this.cmd = cmd; - - // ProcessBuilder pb = new ProcessBuilder(cmd); - // // Make sure the ANDROID_SDK variable is set - // Map env = pb.environment(); - // env.put("ANDROID_SDK", Android.sdkPath); - // // Also make sure that the tools are included in the PATH - // String path = env.get("PATH"); - // String toolsPath = Android.sdkPath + File.separator + "tools"; - // env.put("PATH", path + File.pathSeparator + toolsPath); - // System.out.println("path should be " + env.get("PATH")); - // process = pb.start(); - - process = Runtime.getRuntime().exec(cmd); - error = new StringRedirectThread(process.getErrorStream()); - output = new StringRedirectThread(process.getInputStream()); - } - - public void printCommand() { - System.out.println(PApplet.join(cmd, " ")); - } - - public void printArgs() { - PApplet.println(cmd); - } - - int waitFor() throws InterruptedException { - final int result = process.waitFor(); - error.finish(); - output.finish(); - return result; - } - - public String[] getErrorLines() { - return error.getLines(); - } - - public String[] getOutputLines() { - return output.getLines(); - } - - public void printErrorLines() { - for (final String err : getErrorLines()) { - // if (err.length() > 0) System.err.println("err: " + err); - if (err.length() > 0) { - System.err.println(err); - // System.err.println(err); - } - } - } - - public void printOutputLines() { - for (final String out : getOutputLines()) { - // if (out.length() > 0) System.out.println("out: " + out); - if (out.length() > 0) { - System.out.println(out); - // System.out.println(out); - } - } - } - - public void printLines() { - printOutputLines(); - printErrorLines(); - } -} \ No newline at end of file diff --git a/app/src/processing/app/tools/android/ProcessHelper.java b/app/src/processing/app/tools/android/ProcessHelper.java new file mode 100644 index 000000000..6dd13767f --- /dev/null +++ b/app/src/processing/app/tools/android/ProcessHelper.java @@ -0,0 +1,126 @@ +/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */ +/* + Part of the Processing project - http://processing.org + + Copyright (c) 2009-10 Ben Fry and Casey Reas + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 + as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +package processing.app.tools.android; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.io.Writer; +import java.util.concurrent.CountDownLatch; +import processing.core.PApplet; + +/** + * Class to handle calling Runtime.exec() and stuffing output and error streams + * into String lists that can be dealt with more easily. + */ +class ProcessHelper { + private final String[] cmd; + private final StringWriter stdout = new StringWriter(); + private final StringWriter stderr = new StringWriter(); + + public ProcessHelper(final String... cmd) throws IOException { + this.cmd = cmd; + } + + public String getCommand() { + return PApplet.join(cmd, " "); + } + + public int execute() throws InterruptedException, IOException { + return execute(false); + } + + public int execute(final boolean tee) throws InterruptedException, + IOException { + return execute(tee, tee); + } + + public int execute(final boolean teeOut, final boolean teeErr) + throws InterruptedException, IOException { + final long startTime = System.currentTimeMillis(); + + final Process process = Runtime.getRuntime().exec(cmd); + // The latch is decremented by the StringRedirectingThread when it exhausts its stream + final CountDownLatch latch = new CountDownLatch(2); + new StringRedirectThread(process.getInputStream(), stdout, latch, + teeOut ? System.out : null).start(); + new StringRedirectThread(process.getErrorStream(), stderr, latch, + teeErr ? System.err : null).start(); + + final int result = process.waitFor(); + latch.await(); + System.err.println((System.currentTimeMillis() - startTime) + "ms: " + + PApplet.join(cmd, " ")); + return result; + } + + public String getStderr() { + return stderr.toString(); + } + + public String getStdout() { + return stdout.toString(); + } + + public void dump() { + System.out.println(getStdout()); + System.err.println(getStderr()); + } + + static class StringRedirectThread extends Thread { + private final BufferedReader in; + private final PrintWriter out; + private final CountDownLatch latch; + private final PrintWriter tee; + + public StringRedirectThread(final InputStream in, final Writer out, + final CountDownLatch latch, + final OutputStream tee) { + this.in = new BufferedReader(new InputStreamReader(in)); + this.out = new PrintWriter(out, true); + this.latch = latch; + this.tee = tee == null ? null : new PrintWriter(tee); + } + + @Override + public void run() { + try { + String line; + while ((line = in.readLine()) != null) { + if (line.trim().length() == 0) { + continue; + } + out.println(line); + if (tee != null) { + tee.println(line); + } + } + } catch (final IOException e) { + e.printStackTrace(); + } finally { + latch.countDown(); + } + } + } +} \ No newline at end of file diff --git a/app/src/processing/app/tools/android/StringRedirectThread.java b/app/src/processing/app/tools/android/StringRedirectThread.java deleted file mode 100644 index ec3458da0..000000000 --- a/app/src/processing/app/tools/android/StringRedirectThread.java +++ /dev/null @@ -1,66 +0,0 @@ -package processing.app.tools.android; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringWriter; - -import processing.core.PApplet; - -// if you start a thread in the constructor, then you should be final - jdf -public final class StringRedirectThread extends Thread { - private final Reader in; - - private final StringWriter out; - - private boolean finished; - - private static final int BUFFER_SIZE = 2048; - - public StringRedirectThread(final InputStream in) { - this.in = new InputStreamReader(in); - this.out = new StringWriter(); - setPriority(Thread.MAX_PRIORITY - 1); - start(); // [fry] - } - - @Override - public void run() { - try { - final char[] cbuf = new char[BUFFER_SIZE]; - int count; - while ((count = in.read(cbuf, 0, BUFFER_SIZE)) >= 0) { - out.write(cbuf, 0, count); - // had to add the flush() here.. maybe shouldn't be using writer? [fry] - out.flush(); - } - out.flush(); - - } catch (final IOException exc) { - exc.printStackTrace(); - } - finished = true; - } - - public void finish() { - while (!finished) { - try { - Thread.sleep(50); - } catch (final InterruptedException e) { - } - } - } - - public boolean isFinished() { - return finished; - } - - public String getString() { - return (finished) ? out.toString() : null; - } - - public String[] getLines() { - return finished ? PApplet.split(out.toString(), '\n') : null; - } -} \ No newline at end of file diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs index 3e3f717c6..89a8ddd79 100644 --- a/core/.settings/org.eclipse.jdt.core.prefs +++ b/core/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Mon Feb 22 11:13:12 EST 2010 +#Mon Feb 22 14:47:49 EST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.compliance=1.5 @@ -9,7 +9,7 @@ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=18 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=18 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 @@ -28,14 +28,14 @@ org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declar org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 org.eclipse.jdt.core.formatter.blank_lines_before_method=1 org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=0 org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line diff --git a/net/.settings/org.eclipse.jdt.core.prefs b/net/.settings/org.eclipse.jdt.core.prefs index 7b4eb6772..a8809f77f 100644 --- a/net/.settings/org.eclipse.jdt.core.prefs +++ b/net/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Mon Feb 22 11:13:12 EST 2010 +#Mon Feb 22 14:47:49 EST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1 org.eclipse.jdt.core.compiler.compliance=1.3 @@ -9,7 +9,7 @@ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=18 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=18 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 @@ -28,14 +28,14 @@ org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declar org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 org.eclipse.jdt.core.formatter.blank_lines_before_method=1 org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=0 org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line diff --git a/opengl/.settings/org.eclipse.jdt.core.prefs b/opengl/.settings/org.eclipse.jdt.core.prefs index ce8a341c6..b6bc83ebd 100644 --- a/opengl/.settings/org.eclipse.jdt.core.prefs +++ b/opengl/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Mon Feb 22 11:13:12 EST 2010 +#Mon Feb 22 14:47:49 EST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 org.eclipse.jdt.core.compiler.compliance=1.4 @@ -9,7 +9,7 @@ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=18 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=18 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 @@ -28,14 +28,14 @@ org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declar org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 org.eclipse.jdt.core.formatter.blank_lines_before_method=1 org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=0 org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line diff --git a/pdf/.settings/org.eclipse.jdt.core.prefs b/pdf/.settings/org.eclipse.jdt.core.prefs index 806e5e6c4..939f6e790 100644 --- a/pdf/.settings/org.eclipse.jdt.core.prefs +++ b/pdf/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Mon Feb 22 11:13:12 EST 2010 +#Mon Feb 22 14:47:49 EST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1 @@ -14,7 +14,7 @@ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=18 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=18 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 @@ -33,14 +33,14 @@ org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declar org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 org.eclipse.jdt.core.formatter.blank_lines_before_method=1 org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=0 org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line