Index: /applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.core.prefs (revision 21236) +++ /applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.core.prefs (revision 21236) @@ -0,0 +1,258 @@ +#Wed May 12 12:21:49 MSD 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=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +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=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_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=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=4 +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.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=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true Index: /applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- /applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.ui.prefs (revision 21235) +++ /applications/editors/josm/plugins/buildings_tools/.settings/org.eclipse.jdt.ui.prefs (revision 21236) @@ -1,3 +1,5 @@ -#Sat Jun 06 18:09:10 MSD 2009 +#Wed May 12 12:21:49 MSD 2010 eclipse.preferences.version=1 +formatter_profile=_BTProf +formatter_settings_version=11 org.eclipse.jdt.ui.text.custom_code_templates= Index: /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/AddressDialog.java =================================================================== --- /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/AddressDialog.java (revision 21235) +++ /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/AddressDialog.java (revision 21236) @@ -56,29 +56,23 @@ } - private static String nextHouseNum() - { + private static String nextHouseNum() { if (lhousenum==null) return ""; - try - { - Integer num = NumberFormat.getInstance().parse(lhousenum).intValue(); - if (inc) num=num+2; else num = num-2; - return num.toString(); - } catch (ParseException e) - { - return lhousenum; + try { + Integer num = NumberFormat.getInstance().parse(lhousenum).intValue(); + if (inc) num=num+2; else num = num-2; + return num.toString(); + } catch (ParseException e) { + return lhousenum; } } - public void saveValues() - { + public void saveValues() { lhousenum = housenum.getText(); lstreetname = streetname.getText(); inc = cincdec.getSelectedIndex() == 0; } - public String getHouseNum() - { + public String getHouseNum() { return housenum.getText(); } - public String getStreetName() - { + public String getStreetName() { return streetname.getText(); } Index: /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java =================================================================== --- /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java (revision 21235) +++ /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java (revision 21236) @@ -47,11 +47,9 @@ while (angconstraint>(Math.PI/4)) angconstraint-=Math.PI/4; } - public double getLength() - { + public double getLength() { return len; } - public void reset() - { + public void reset() { len = 0; en1=null; @@ -64,27 +62,22 @@ public EastNorth Point3() { return en3; } public EastNorth Point4() { return en4; } - private void updMetrics() - { + private void updMetrics() { meter = 2*Math.PI/(Math.cos(Math.toRadians(eastNorth2latlon(p1).lat())) * eqlen); reset(); } - public void setBase(EastNorth base) - { + public void setBase(EastNorth base) { node = null; p1 = base; updMetrics(); } - public void setBase(Node base) - { + public void setBase(Node base) { node = base; p1 = latlon2eastNorth(base.getCoor()); updMetrics(); } - public void setPlace(EastNorth p2,double width,double lenstep) - { + public void setPlace(EastNorth p2,double width,double lenstep) { double heading = p1.heading(p2); double hdang = 0; - if (angconstrainted) - { + if (angconstrainted) { hdang = Math.round((heading-angconstraint)/Math.PI*4); if (hdang>=8)hdang-=8; @@ -103,11 +96,9 @@ lwidth = width; Main.map.statusLine.setHeading(Math.toDegrees(heading)); - if (angconstrainted) - { + if (angconstrainted) { Main.map.statusLine.setAngle(hdang*45); } } - public void paint(Graphics2D g, MapView mv) - { + public void paint(Graphics2D g, MapView mv) { if (len == 0) return; GeneralPath b = new GeneralPath(); @@ -122,6 +113,5 @@ g.draw(b); } - public Way create() - { + public Way create() { if (len == 0) return null; Node n1; @@ -134,6 +124,5 @@ Node n4 = new Node(eastNorth2latlon(en4)); if (n1.getCoor().isOutSideWorld()||n2.getCoor().isOutSideWorld()|| - n3.getCoor().isOutSideWorld()||n4.getCoor().isOutSideWorld()) - { + n3.getCoor().isOutSideWorld()||n4.getCoor().isOutSideWorld()) { JOptionPane.showMessageDialog(Main.parent, tr("Cannot place building outside of the world.")); @@ -142,11 +131,9 @@ Way w = new Way(); w.addNode(n1); - if (lwidth>=0) - { + if (lwidth>=0) { w.addNode(n2); w.addNode(n3); w.addNode(n4); - } else - { + } else { w.addNode(n4); w.addNode(n3); Index: /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java =================================================================== --- /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java (revision 21235) +++ /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java (revision 21236) @@ -12,6 +12,5 @@ public class BuildingSizeAction extends JosmAction { - public BuildingSizeAction() - { + public BuildingSizeAction() { super(tr("Set buildings size"),"mapmode/building",tr("Set buildings size"), Shortcut.registerShortcut("edit:buildingsdialog", Index: /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java =================================================================== --- /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java (revision 21235) +++ /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java (revision 21236) @@ -45,26 +45,19 @@ setVisible(true); } - public double width() - { - try - { - return NumberFormat.getInstance().parse(twidth.getText()).doubleValue(); - } catch (ParseException e) - { + public double width() { + try { + return NumberFormat.getInstance().parse(twidth.getText()).doubleValue(); + } catch (ParseException e) { + return 0; + } + } + public double lenstep() { + try { + return NumberFormat.getInstance().parse(tlenstep.getText()).doubleValue(); + } catch (ParseException e) { return 0; } } - public double lenstep() - { - try - { - return NumberFormat.getInstance().parse(tlenstep.getText()).doubleValue(); - } catch (ParseException e) - { - return 0; - } - } - public boolean useAddr() - { + public boolean useAddr() { return caddr.isSelected(); } Index: /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java =================================================================== --- /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java (revision 21235) +++ /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java (revision 21236) @@ -21,9 +21,8 @@ } - public BuildingsToolsPlugin(PluginInformation info) - { + public BuildingsToolsPlugin(PluginInformation info) { super(info); Main.main.menu.editMenu.addSeparator(); - MainMenu.add(Main.main.menu.editMenu, new BuildingSizeAction()); + MainMenu.add(Main.main.menu.editMenu, new BuildingSizeAction()); } @Override public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { Index: /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java =================================================================== --- /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java (revision 21235) +++ /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java (revision 21236) @@ -58,24 +58,19 @@ Building building = new Building(); - public static void SetAddrDialog(boolean _useAddr) - { + public static void SetAddrDialog(boolean _useAddr) { useAddr = _useAddr; } - public static void SetSizes(double newwidth,double newlenstep) - { + public static void SetSizes(double newwidth,double newlenstep) { width = newwidth; lenstep = newlenstep; } - public static double getWidth() - { + public static double getWidth() { return width; } - public static double getLenStep() - { + public static double getLenStep() { return lenstep; } - public DrawBuildingAction(MapFrame mapFrame) - { + public DrawBuildingAction(MapFrame mapFrame) { super(tr("Draw buildings"),"building",tr("Draw buildings"), Shortcut.registerShortcut("mapmode:buildings", @@ -117,6 +112,5 @@ } catch(Exception e) {} } - private static void showAddrDialog(Way w) - { + private static void showAddrDialog(Way w) { AddressDialog dlg = new AddressDialog(); int answer = dlg.getValue(); @@ -133,4 +127,8 @@ @Override public void enterMode() { super.enterMode(); + if (getCurrentDataSet() == null) { + Main.map.selectSelectTool(false); + return; + } currCursor = cursorCrosshair; Main.map.mapView.addMouseListener(this); @@ -157,6 +155,5 @@ } - public void cancelDrawing() - { + public void cancelDrawing() { mode = Mode.None; if(Main.map == null || Main.map.mapView == null) @@ -172,28 +169,34 @@ } - private void ProcessMouseEvent(MouseEvent e) - { + private void ProcessMouseEvent(MouseEvent e) { mousePos = e.getPoint(); if (mode == Mode.None) return; Node n; - if (mode == Mode.Drawing) - { - if (e.isControlDown()) n = null; else n = Main.map.mapView.getNearestNode(mousePos); - if (n == null) + if (mode == Mode.Drawing) { + if (e.isControlDown()) { + n = null; + } else { + n = Main.map.mapView.getNearestNode(mousePos); + } + if (n == null) { p2 = latlon2eastNorth(Main.map.mapView.getLatLon(mousePos.x, mousePos.y)); - else + } else { p2 = latlon2eastNorth(n.getCoor()); + } building.setPlace(p2, width, e.isControlDown()?0:lenstep); Main.map.statusLine.setDist(building.getLength()); return; } - if (mode == Mode.DrawingWidth) - { - if (e.isControlDown()) n = null; else n = Main.map.mapView.getNearestNode(mousePos); - if (n == null) + if (mode == Mode.DrawingWidth) { + if (e.isControlDown()) { + n = null; + } else { + n = Main.map.mapView.getNearestNode(mousePos); + } + if (n == null) { p3 = latlon2eastNorth(Main.map.mapView.getLatLon(mousePos.x, mousePos.y)); - else + } else { p3 = latlon2eastNorth(n.getCoor()); - + } double mwidth = ((p3.east()-p2.east())*(p2.north()-p1.north())+ @@ -209,5 +212,5 @@ { if (mode == Mode.None) return; - if (building.getLength()==0)return; + if (building.getLength() == 0) return; g.setColor(selectedColor); @@ -226,10 +229,8 @@ Node n = Main.map.mapView.getNearestNode(mousePos); - if (n == null) - { + if (n == null) { p1 = latlon2eastNorth(Main.map.mapView.getLatLon(mousePos.x, mousePos.y)); building.setBase(p1); - } else - { + } else { p1 = latlon2eastNorth(n.getCoor()); building.setBase(n); @@ -239,11 +240,8 @@ } - private void drawingAdvance(MouseEvent e) - { + private void drawingAdvance(MouseEvent e) { ProcessMouseEvent(e); - if (building.getLength() > 0) - { - if (width == 0 && mode == Mode.Drawing) - { + if (building.getLength() > 0) { + if (width == 0 && mode == Mode.Drawing) { p2 = building.Point2(); mode = Mode.DrawingWidth; @@ -263,6 +261,5 @@ } - @Override public void mousePressed(MouseEvent e) - { + @Override public void mousePressed(MouseEvent e) { if (e.getButton() != MouseEvent.BUTTON1) return; if(!Main.map.mapView.isActiveLayerDrawable()) return; @@ -272,6 +269,5 @@ } - @Override public void mouseDragged(MouseEvent e) - { + @Override public void mouseDragged(MouseEvent e) { ProcessMouseEvent(e); updCursor(); @@ -279,9 +275,7 @@ } - @Override public void mouseReleased(MouseEvent e) - { + @Override public void mouseReleased(MouseEvent e) { if (e.getButton() != MouseEvent.BUTTON1) return; if(!Main.map.mapView.isActiveLayerDrawable()) return; - boolean dragged = true; if (drawStartPos != null) @@ -293,6 +287,5 @@ } - private void updCursor() - { + private void updCursor() { if (mousePos==null) return; Node n = Main.map.mapView.getNearestNode(mousePos); @@ -300,6 +293,5 @@ } - @Override public void mouseMoved(MouseEvent e) - { + @Override public void mouseMoved(MouseEvent e) { if(!Main.map.mapView.isActiveLayerDrawable()) return; ProcessMouseEvent(e); @@ -319,6 +311,5 @@ } - public void UpdateConstraint(Collection newSelection) - { + public void UpdateConstraint(Collection newSelection) { building.disableAngConstraint(); if (newSelection.size()!=2)return;