Changeset 25030 in osm for applications/editors/josm


Ignore:
Timestamp:
2011-01-12T07:53:25+01:00 (14 years ago)
Author:
mzdila
Message:

indent with spaces

Location:
applications/editors/josm/plugins/simplifyarea
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/simplifyarea/.settings/org.eclipse.jdt.core.prefs

    r21870 r25030  
    1 #Thu Jun 03 21:07:23 CEST 2010
     1#Wed Jan 12 07:52:11 CET 2011
    22eclipse.preferences.version=1
    33org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
    … …  
    1111org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
    1212org.eclipse.jdt.core.compiler.source=1.6
     13org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
     14org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
     15org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
     16org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
     17org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
     18org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
     19org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
     20org.eclipse.jdt.core.formatter.alignment_for_assignment=0
     21org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
     22org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
     23org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
     24org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
     25org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
     26org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
     27org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
     28org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
     29org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
     30org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
     31org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
     32org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
     33org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
     34org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
     35org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
     36org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
     37org.eclipse.jdt.core.formatter.blank_lines_after_package=1
     38org.eclipse.jdt.core.formatter.blank_lines_before_field=0
     39org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
     40org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
     41org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
     42org.eclipse.jdt.core.formatter.blank_lines_before_method=1
     43org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
     44org.eclipse.jdt.core.formatter.blank_lines_before_package=0
     45org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
     46org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
     47org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
     48org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
     49org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
     50org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
     51org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
     52org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
     53org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
     54org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
     55org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
     56org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
     57org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
     58org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
     59org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
     60org.eclipse.jdt.core.formatter.comment.format_block_comments=true
     61org.eclipse.jdt.core.formatter.comment.format_header=false
     62org.eclipse.jdt.core.formatter.comment.format_html=true
     63org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
     64org.eclipse.jdt.core.formatter.comment.format_line_comments=false
     65org.eclipse.jdt.core.formatter.comment.format_source_code=true
     66org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
     67org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
     68org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
     69org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
     70org.eclipse.jdt.core.formatter.comment.line_length=200
     71org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
     72org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
     73org.eclipse.jdt.core.formatter.compact_else_if=true
     74org.eclipse.jdt.core.formatter.continuation_indentation=2
     75org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
     76org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
     77org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
     78org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
     79org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
     80org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
     81org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
     82org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
     83org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
     84org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
     85org.eclipse.jdt.core.formatter.indent_empty_lines=false
     86org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
     87org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
     88org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
     89org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
     90org.eclipse.jdt.core.formatter.indentation.size=4
     91org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
     92org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
     93org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
     94org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
     95org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
     96org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
     97org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
     98org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
     99org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
     100org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
     101org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
     102org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
     103org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
     104org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
     105org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
     106org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
     107org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
     108org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
     109org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
     110org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
     111org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
     112org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
     113org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
     114org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
     115org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
     116org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
     117org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
     118org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
     119org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
     120org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
     121org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
     122org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
     123org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
     124org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
     125org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
     126org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
     127org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
     128org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
     129org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
     130org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
     131org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
     132org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
     133org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
     134org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
     135org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
     136org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
     137org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
     138org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
     139org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
     140org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
     141org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
     142org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
     143org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
     144org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
     145org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
     146org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
     147org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
     148org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
     149org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
     150org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
     151org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
     152org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
     153org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
     154org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
     155org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
     156org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
     157org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
     158org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
     159org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
     160org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
     161org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
     162org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
     163org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
     164org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
     165org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
     166org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
     167org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
     168org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
     169org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
     170org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
     171org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
     172org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
     173org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
     174org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
     175org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
     176org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
     177org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
     178org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
     179org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
     180org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
     181org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
     182org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
     183org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
     184org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
     185org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
     186org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
     187org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
     188org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
     189org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
     190org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
     191org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
     192org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
     193org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
     194org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
     195org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
     196org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
     197org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
     198org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
     199org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
     200org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
     201org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
     202org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
     203org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
     204org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
     205org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
     206org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
     207org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
     208org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
     209org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
     210org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
     211org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
     212org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
     213org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
     214org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
     215org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
     216org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
     217org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
     218org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
     219org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
     220org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
     221org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
     222org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
     223org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
     224org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
     225org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
     226org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
     227org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
     228org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
     229org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
     230org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
     231org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
     232org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
     233org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
     234org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
     235org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
     236org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
     237org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
     238org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
     239org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
     240org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
     241org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
     242org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
     243org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
     244org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
     245org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
     246org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
     247org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
     248org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
     249org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
     250org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
     251org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
     252org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
     253org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
     254org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
     255org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
     256org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
     257org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
     258org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
     259org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
     260org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
     261org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
     262org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
     263org.eclipse.jdt.core.formatter.join_lines_in_comments=true
     264org.eclipse.jdt.core.formatter.join_wrapped_lines=true
     265org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
     266org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
     267org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
     268org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
     269org.eclipse.jdt.core.formatter.lineSplit=200
     270org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
     271org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
     272org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
     273org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
     274org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
     275org.eclipse.jdt.core.formatter.tabulation.char=space
     276org.eclipse.jdt.core.formatter.tabulation.size=4
     277org.eclipse.jdt.core.formatter.use_on_off_tags=false
     278org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true
     279org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
     280org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

  • applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java

    r25007 r25030  
    7676                Main.parent,
    7777                "<html>" + trn("The selected way has nodes outside of the downloaded data region.", "The selected ways have nodes outside of the downloaded data region.", getCurrentDataSet().getSelectedWays().size())
    78                         + "<br>" + tr("This can lead to nodes being deleted accidentally.") + "<br>" + tr("Do you want to delete them anyway?") + "</html>",
     78                + "<br>" + tr("This can lead to nodes being deleted accidentally.") + "<br>" + tr("Do you want to delete them anyway?") + "</html>",
    7979                tr("Delete nodes outside of data regions?"), JOptionPane.WARNING_MESSAGE, null, // no special icon
    8080                options, options[0], null);
    … …  
    168168     *            the way to simplify
    169169     */
    170         private SequenceCommand simplifyWay(final Way w) {
     170    private SequenceCommand simplifyWay(final Way w) {
    171171        final double angleThreshold = Main.pref.getDouble("simplify-area.angle.threshold", 10);
    172172        final double angleFactor = Main.pref.getDouble("simplify-area.angle.factor", 1.0);
    … …  
    193193
    194194        while (true) {
    195                 Node prevNode = null;
    196                 LatLon coord1 = null;
    197                 LatLon coord2 = null;
    198 
    199                 double minWeight = Double.MAX_VALUE;
    200                 Node bestMatch = null;
    201 
    202                 for (int i = 0, len = nodes.size() + (closed ? 2 : 1); i < len; i++) {
    203                     final Node n = nodes.get(i % nodes.size());
    204                     final LatLon coord3 = n.getCoor();
    205 
    206                     if (coord1 != null) {
    207                         final double angleWeight = computeConvectAngle(coord1, coord2, coord3) / angleThreshold;
    208                         final double areaWeight = computeArea(coord1, coord2, coord3) / areaThreshold;
    209                         final double distanceWeight = Math.abs(crossTrackError(coord1, coord2, coord3)) / distanceThreshold;
    210 
    211                         final double weight = isRequiredNode(w, prevNode) ||
    212                                 !closed && i == len - 1 || // don't remove last node of the not closed way
    213                                 angleWeight > 1.0 || areaWeight > 1.0 || distanceWeight > 1.0 ? Double.MAX_VALUE :
    214                                 angleWeight * angleFactor + areaWeight * areaFactor + distanceWeight * distanceFactor;
    215 
    216                         if (weight < minWeight) {
    217                                 minWeight = weight;
    218                                 bestMatch = prevNode;
    219                         }
    220                     }
    221 
    222                     coord1 = coord2;
    223                     coord2 = coord3;
    224                     prevNode = n;
    225                 }
    226 
    227                 if (bestMatch == null) {
    228                         break;
    229                 }
    230 
    231                 nodes.remove(bestMatch);
     195            Node prevNode = null;
     196            LatLon coord1 = null;
     197            LatLon coord2 = null;
     198
     199            double minWeight = Double.MAX_VALUE;
     200            Node bestMatch = null;
     201
     202            for (int i = 0, len = nodes.size() + (closed ? 2 : 1); i < len; i++) {
     203                final Node n = nodes.get(i % nodes.size());
     204                final LatLon coord3 = n.getCoor();
     205
     206                if (coord1 != null) {
     207                    final double angleWeight = computeConvectAngle(coord1, coord2, coord3) / angleThreshold;
     208                    final double areaWeight = computeArea(coord1, coord2, coord3) / areaThreshold;
     209                    final double distanceWeight = Math.abs(crossTrackError(coord1, coord2, coord3)) / distanceThreshold;
     210
     211                    final double weight = isRequiredNode(w, prevNode) ||
     212                    !closed && i == len - 1 || // don't remove last node of the not closed way
     213                    angleWeight > 1.0 || areaWeight > 1.0 || distanceWeight > 1.0 ? Double.MAX_VALUE :
     214                        angleWeight * angleFactor + areaWeight * areaFactor + distanceWeight * distanceFactor;
     215
     216                    if (weight < minWeight) {
     217                        minWeight = weight;
     218                        bestMatch = prevNode;
     219                    }
     220                }
     221
     222                coord1 = coord2;
     223                coord2 = coord3;
     224                prevNode = n;
     225            }
     226
     227            if (bestMatch == null) {
     228                break;
     229            }
     230
     231            nodes.remove(bestMatch);
    232232        }
    233233
    … …  
    237237        final Map<Node, LatLon> coordMap = new HashMap<Node, LatLon>();
    238238        for (final Node n : nodes) {
    239                 coordMap.put(n, n.getCoor());
     239            coordMap.put(n, n.getCoor());
    240240        }
    241241
    … …  
    243243
    244244        while (true) {
    245                 double minDist = Double.MAX_VALUE;
    246                 Node node1 = null;
    247                 Node node2 = null;
    248 
    249                 for (int i = 0, len = nodes.size() + (closed ? 2 : 1); i < len; i++) {
    250                     final Node n1 = nodes.get(i % nodes.size());
    251                     final Node n2 = nodes.get((i + 1) % nodes.size());
    252 
    253                     if (isRequiredNode(w, n1) || isRequiredNode(w, n2)) {
    254                         continue;
    255                     }
    256 
    257                     final double dist = coordMap.get(n1).greatCircleDistance(coordMap.get(n2));
    258                     if (dist < minDist && dist < mergeThreshold) {
    259                         minDist = dist;
    260                         node1 = n1;
    261                         node2 = n2;
    262                     }
    263                 }
    264 
    265                 if (node1 == null || node2 == null) {
    266                         break;
    267                 }
    268 
    269 
    270                 final LatLon coord = coordMap.get(node1).getCenter(coordMap.get(node2));
    271                 coordMap.put(node1, coord);
    272                         moveCommandList.put(node1, new MoveCommand(node1, coord));
    273 
    274                         nodes.remove(node2);
    275                 coordMap.remove(node2);
    276                 moveCommandList.remove(node2);
     245            double minDist = Double.MAX_VALUE;
     246            Node node1 = null;
     247            Node node2 = null;
     248
     249            for (int i = 0, len = nodes.size() + (closed ? 2 : 1); i < len; i++) {
     250                final Node n1 = nodes.get(i % nodes.size());
     251                final Node n2 = nodes.get((i + 1) % nodes.size());
     252
     253                if (isRequiredNode(w, n1) || isRequiredNode(w, n2)) {
     254                    continue;
     255                }
     256
     257                final double dist = coordMap.get(n1).greatCircleDistance(coordMap.get(n2));
     258                if (dist < minDist && dist < mergeThreshold) {
     259                    minDist = dist;
     260                    node1 = n1;
     261                    node2 = n2;
     262                }
     263            }
     264
     265            if (node1 == null || node2 == null) {
     266                break;
     267            }
     268
     269
     270            final LatLon coord = coordMap.get(node1).getCenter(coordMap.get(node2));
     271            coordMap.put(node1, coord);
     272            moveCommandList.put(node1, new MoveCommand(node1, coord));
     273
     274            nodes.remove(node2);
     275            coordMap.remove(node2);
     276            moveCommandList.remove(node2);
    277277        }
    278278
    … …  
    301301
    302302    public static double computeConvectAngle(final LatLon coord1, final LatLon coord2, final LatLon coord3) {
    303         final double angle =  Math.abs(heading(coord2, coord3) - heading(coord1, coord2));
    304         return Math.toDegrees(angle < Math.PI ? angle : 2 * Math.PI - angle);
     303        final double angle =  Math.abs(heading(coord2, coord3) - heading(coord1, coord2));
     304        return Math.toDegrees(angle < Math.PI ? angle : 2 * Math.PI - angle);
    305305    }
    306306
    … …  
    314314
    315315        final double q = p * (p - a) * (p - b) * (p - c); // I found this negative in one case (:-o) when nodes were in line on a small area
    316                 return q < 0.0 ? 0.0 : Math.sqrt(q);
     316        return q < 0.0 ? 0.0 : Math.sqrt(q);
    317317    }
    318318
    … …  
    327327    public static double heading(final LatLon a, final LatLon b) {
    328328        double hd = Math.atan2(sin(toRadians(a.lon() - b.lon())) * cos(toRadians(b.lat())),
    329                         cos(toRadians(a.lat())) * sin(toRadians(b.lat())) -
    330                         sin(toRadians(a.lat())) * cos(toRadians(b.lat())) * cos(toRadians(a.lon() - b.lon())));
     329                cos(toRadians(a.lat())) * sin(toRadians(b.lat())) -
     330                sin(toRadians(a.lat())) * cos(toRadians(b.lat())) * cos(toRadians(a.lon() - b.lon())));
    331331        hd %= 2 * Math.PI;
    332332        if (hd < 0) {
Note: See TracChangeset for help on using the changeset viewer.