Made formatting uniform - commit for logicui

diff --git a/LogicUI/.settings/org.eclipse.jdt.core.prefs b/LogicUI/.settings/org.eclipse.jdt.core.prefs
index 2eeb2bb..ded5573 100644 (file)
--- a/LogicUI/.settings/org.eclipse.jdt.core.prefs
+++ b/LogicUI/.settings/org.eclipse.jdt.core.prefs
@@ -10,3 +10,347 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
 org.eclipse.jdt.core.compiler.release=enabled\r
 org.eclipse.jdt.core.compiler.source=10\r
+org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false\r
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647\r
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r
+org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false\r
+org.eclipse.jdt.core.formatter.align_with_spaces=false\r
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16\r
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0\r
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16\r
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r
+org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16\r
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0\r
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16\r
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0\r
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16\r
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16\r
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16\r
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0\r
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0\r
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r
+org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0\r
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16\r
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0\r
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0\r
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1\r
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0\r
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1\r
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0\r
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line\r
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true\r
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false\r
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true\r
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true\r
+org.eclipse.jdt.core.formatter.comment.format_header=false\r
+org.eclipse.jdt.core.formatter.comment.format_html=true\r
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true\r
+org.eclipse.jdt.core.formatter.comment.format_source_code=true\r
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false\r
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false\r
+org.eclipse.jdt.core.formatter.comment.indent_tag_description=false\r
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert\r
+org.eclipse.jdt.core.formatter.comment.line_length=140\r
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r
+org.eclipse.jdt.core.formatter.compact_else_if=true\r
+org.eclipse.jdt.core.formatter.continuation_indentation=2\r
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off\r
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on\r
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false\r
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r
+org.eclipse.jdt.core.formatter.indent_empty_lines=false\r
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r
+org.eclipse.jdt.core.formatter.indentation.size=4\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true\r
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true\r
+org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never\r
+org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never\r
+org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never\r
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r
+org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never\r
+org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never\r
+org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never\r
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r
+org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never\r
+org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never\r
+org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never\r
+org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false\r
+org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false\r
+org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false\r
+org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false\r
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r
+org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never\r
+org.eclipse.jdt.core.formatter.lineSplit=140\r
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines\r
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines\r
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines\r
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines\r
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines\r
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines\r
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines\r
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines\r
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines\r
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines\r
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r
+org.eclipse.jdt.core.formatter.tabulation.char=tab\r
+org.eclipse.jdt.core.formatter.tabulation.size=4\r
+org.eclipse.jdt.core.formatter.use_on_off_tags=true\r
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true\r
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false\r
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true\r
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true\r
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true\r
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true\r
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r
+org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true\r
+org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true\r
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true\r
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter\r

diff --git a/LogicUI/.settings/org.eclipse.jdt.ui.prefs b/LogicUI/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644 (file)
index 0000000..3568362
--- /dev/null
+++ b/LogicUI/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1\r
+formatter_profile=_ERA-MI\r
+formatter_settings_version=16\r

diff --git a/LogicUI/src/era/mi/gui/LogicUI.java b/LogicUI/src/era/mi/gui/LogicUI.java
index 42b07d3..ac14c23 100644 (file)
--- a/LogicUI/src/era/mi/gui/LogicUI.java
+++ b/LogicUI/src/era/mi/gui/LogicUI.java
@@ -29,12 +29,12 @@ import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInpu
  */\r
 public class LogicUI\r
 {\r
-       private final Display                                           display;\r
-       private final Shell                                                     shell;\r
-       private final ZoomableCanvas                            canvas;\r
-       private final Set<BasicGUIComponent>            components;\r
-       private final Map<BasicGUIComponent, Point>     componentPositions;\r
-       private final Set<GUIWire>                                      wires;\r
+       private final Display display;\r
+       private final Shell shell;\r
+       private final ZoomableCanvas canvas;\r
+       private final Set<BasicGUIComponent> components;\r
+       private final Map<BasicGUIComponent, Point> componentPositions;\r
+       private final Set<GUIWire> wires;\r
 \r
        public LogicUI()\r
        {\r
@@ -56,9 +56,9 @@ public class LogicUI
                new ZoomableCanvasOverlay(canvas, null).enableScale();\r
                canvas.addListener(SWT.MouseDown, this::mouseDown);\r
        }\r
+\r
        /**\r
-        * Add a component to be drawn.\r
-        * Returns the given component for convenience.\r
+        * Add a component to be drawn. Returns the given component for convenience.\r
         * \r
         * @author Daniel Kirschten\r
         */\r
@@ -68,31 +68,36 @@ public class LogicUI
                componentPositions.put(component, new Point(x, y));\r
                return component;\r
        }\r
+\r
        /**\r
-        * Add a graphical wire between the given connection points of the given components.\r
-        * The given components have to be added and the given connection points have to be connected logically first.\r
+        * Add a graphical wire between the given connection points of the given components. The given components have to be added and the given\r
+        * connection points have to be connected logically first.\r
         * \r
         * @author Daniel Kirschten\r
         */\r
-       public void addWire(BasicGUIComponent component1, int component1ConnectionIndex, BasicGUIComponent component2, int component2ConnectionIndex, Point... path)\r
+       public void addWire(BasicGUIComponent component1, int component1ConnectionIndex, BasicGUIComponent component2,\r
+                       int component2ConnectionIndex, Point... path)\r
        {\r
-               wires.add(new GUIWire(canvas::redrawThreadsafe, component1, component1ConnectionIndex, componentPositions.get(component1), component2, component2ConnectionIndex, componentPositions.get(component2), path));\r
+               wires.add(new GUIWire(canvas::redrawThreadsafe, component1, component1ConnectionIndex, componentPositions.get(component1),\r
+                               component2, component2ConnectionIndex, componentPositions.get(component2), path));\r
        }\r
+\r
        private void drawComponent(GeneralGC gc, BasicGUIComponent component)\r
        {\r
                TranslatedGC tgc = new TranslatedGC(gc, componentPositions.get(component));\r
                component.render(tgc);\r
                tgc.setBackground(display.getSystemColor(SWT.COLOR_BLUE));\r
        }\r
+\r
        private void mouseDown(Event e)\r
        {\r
-               if(e.button == 1)\r
+               if (e.button == 1)\r
                {\r
                        Point click = canvas.displayToWorldCoords(e.x, e.y);\r
-                       for(BasicGUIComponent component : components)\r
-                               if(component.getBounds().translate(componentPositions.get(component)).contains(click))\r
+                       for (BasicGUIComponent component : components)\r
+                               if (component.getBounds().translate(componentPositions.get(component)).contains(click))\r
                                {\r
-                                       if(component.clicked(click.x, click.y))\r
+                                       if (component.clicked(click.x, click.y))\r
                                                canvas.redraw();\r
                                        break;\r
                                }\r
@@ -100,41 +105,42 @@ public class LogicUI
        }\r
 \r
        /**\r
-        * Start the simulation timeline, and open the UI shell.\r
-        * Returns when the shell is closed.\r
+        * Start the simulation timeline, and open the UI shell. Returns when the shell is closed.\r
         */\r
        public void run()\r
        {\r
                AtomicBoolean running = new AtomicBoolean(true);\r
                Thread simulationThread = new Thread(() ->\r
                {\r
-                       while(running.get())\r
+                       while (running.get())\r
                        {\r
-                               //always execute to keep timeline from "hanging behind" for too long\r
+                               // always execute to keep timeline from "hanging behind" for too long\r
                                Simulation.TIMELINE.executeUpTo(System.currentTimeMillis(), System.currentTimeMillis() + 10);\r
                                long sleepTime;\r
-                               if(Simulation.TIMELINE.hasNext())\r
+                               if (Simulation.TIMELINE.hasNext())\r
                                        sleepTime = Simulation.TIMELINE.nextEventTime() - System.currentTimeMillis();\r
                                else\r
                                        sleepTime = 10;\r
                                try\r
                                {\r
-                                       if(sleepTime > 0)\r
+                                       if (sleepTime > 0)\r
                                                Thread.sleep(sleepTime);\r
-                               } catch(InterruptedException e)\r
-                               {} //it is normal execution flow to be interrupted\r
+                               }\r
+                               catch (InterruptedException e)\r
+                               {\r
+                               } // it is normal execution flow to be interrupted\r
                        }\r
                });\r
                simulationThread.start();\r
                Simulation.TIMELINE.addEventAddedListener(event ->\r
                {\r
-                       if(event.getTiming() <= System.currentTimeMillis())\r
+                       if (event.getTiming() <= System.currentTimeMillis())\r
                                simulationThread.interrupt();\r
                });\r
 \r
                shell.open();\r
-               while(!shell.isDisposed())\r
-                       if(!display.readAndDispatch())\r
+               while (!shell.isDisposed())\r
+                       if (!display.readAndDispatch())\r
                                display.sleep();\r
                running.set(false);\r
                simulationThread.interrupt();\r

diff --git a/LogicUI/src/era/mi/gui/components/BasicGUIComponent.java b/LogicUI/src/era/mi/gui/components/BasicGUIComponent.java
index 45f4a64..daebd43 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/BasicGUIComponent.java
+++ b/LogicUI/src/era/mi/gui/components/BasicGUIComponent.java
@@ -11,30 +11,32 @@ public interface BasicGUIComponent
         * Render this component to the given gc, at coordinates (0, 0).\r
         */\r
        public void render(GeneralGC gc);\r
+\r
        /**\r
-        * Returns the bounds of this component.\r
-        * Used for calculating which component is clicked.\r
+        * Returns the bounds of this component. Used for calculating which component is clicked.\r
         */\r
        public Rectangle getBounds();\r
+\r
        /**\r
-        * Called when this component is clicked. Relative coordinates of the click are given.\r
-        * Returns true if this component has to be redrawn.\r
+        * Called when this component is clicked. Relative coordinates of the click are given. Returns true if this component has to be redrawn.\r
         */\r
        public default boolean clicked(double x, double y)\r
        {\r
                return false;\r
        }\r
 \r
-       //TODO this code will be replaced by code in BasicComponent.\r
+       // TODO this code will be replaced by code in BasicComponent.\r
        /**\r
-        * Returns how many wire arrays are connected to this component.\r
-        * (Connections are static - they can't be removed and no new ones can be added)\r
+        * Returns how many wire arrays are connected to this component. (Connections are static - they can't be removed and no new ones can be\r
+        * added)\r
         */\r
        public int getConnectedWireArraysCount();\r
+\r
        /**\r
         * Returns the n-th wire array connected to this component.\r
         */\r
        public WireArray getConnectedWireArray(int connectionIndex);\r
+\r
        /**\r
         * Returns relative coordinates where the n-th wire array is connected to this component.\r
         */\r

diff --git a/LogicUI/src/era/mi/gui/components/GUIAndGate.java b/LogicUI/src/era/mi/gui/components/GUIAndGate.java
index 6ad327a..a08d123 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIAndGate.java
+++ b/LogicUI/src/era/mi/gui/components/GUIAndGate.java
@@ -16,10 +16,10 @@ public class GUIAndGate extends AndGate implements BasicGUIComponent
 {\r
        private static final String LABEL = "&";\r
 \r
-       private final int                               inputCount;\r
-       private final double                    height;\r
-       private final List<WireArray>   connectedWireArrays;\r
-       private final List<Point>               wireArrayConnectionPoints;\r
+       private final int inputCount;\r
+       private final double height;\r
+       private final List<WireArray> connectedWireArrays;\r
+       private final List<Point> wireArrayConnectionPoints;\r
 \r
        public GUIAndGate(int processTime, WireArray out, WireArray... in)\r
        {\r
@@ -34,7 +34,7 @@ public class GUIAndGate extends AndGate implements BasicGUIComponent
                {\r
                        connectedWireArraysModifiable.addAll(Arrays.asList(in));\r
                        double inputHeight = 5;\r
-                       for(int i = 0; i < inputCount; i ++, inputHeight += 10)\r
+                       for (int i = 0; i < inputCount; i++, inputHeight += 10)\r
                                wireArrayConnectionPointsModifiable.add(new Point(0, inputHeight));\r
                }\r
 \r
@@ -50,6 +50,7 @@ public class GUIAndGate extends AndGate implements BasicGUIComponent
        {\r
                return new Rectangle(0, 0, 20, height);\r
        }\r
+\r
        @Override\r
        public void render(GeneralGC gc)\r
        {\r
@@ -67,11 +68,13 @@ public class GUIAndGate extends AndGate implements BasicGUIComponent
        {\r
                return connectedWireArrays.size();\r
        }\r
+\r
        @Override\r
        public WireArray getConnectedWireArray(int connectionIndex)\r
        {\r
                return connectedWireArrays.get(connectionIndex);\r
        }\r
+\r
        @Override\r
        public Point getWireArrayConnectionPoint(int connectionI)\r
        {\r

diff --git a/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
index 9af3940..a4d0c23 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
+++ b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
@@ -28,9 +28,9 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
                bitNames = Collections.unmodifiableMap(bitNamesModifiable);\r
        }\r
 \r
-       private final WireArray                 wa;\r
-       private final List<WireArray>   connectedWireArrays;\r
-       private final List<Point>               wireArrayConnectionPoints;\r
+       private final WireArray wa;\r
+       private final List<WireArray> connectedWireArrays;\r
+       private final List<Point> wireArrayConnectionPoints;\r
 \r
        public GUIManualSwitch(WireArray output)\r
        {\r
@@ -53,6 +53,7 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
        {\r
                return new Rectangle(0, 0, 20, 15);\r
        }\r
+\r
        @Override\r
        public void render(GeneralGC gc)\r
        {\r
@@ -65,6 +66,7 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
                gc.drawText(label, 10 - textExtent.x / 2, 7.5 - textExtent.y / 2, true);\r
                gc.setFont(oldFont);\r
        }\r
+\r
        @Override\r
        public boolean clicked(double x, double y)\r
        {\r
@@ -77,11 +79,13 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
        {\r
                return connectedWireArrays.size();\r
        }\r
+\r
        @Override\r
        public WireArray getConnectedWireArray(int connectionIndex)\r
        {\r
                return connectedWireArrays.get(connectionIndex);\r
        }\r
+\r
        @Override\r
        public Point getWireArrayConnectionPoint(int connectionI)\r
        {\r

diff --git a/LogicUI/src/era/mi/gui/components/GUIMerger.java b/LogicUI/src/era/mi/gui/components/GUIMerger.java
index cc23ceb..1bf8c80 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIMerger.java
+++ b/LogicUI/src/era/mi/gui/components/GUIMerger.java
@@ -13,10 +13,10 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 \r
 public class GUIMerger extends Merger implements BasicGUIComponent\r
 {\r
-       private final int                               inputCount;\r
-       private final double                    height;\r
-       private final List<WireArray>   connectedWireArrays;\r
-       private final List<Point>               wireArrayConnectionPoints;\r
+       private final int inputCount;\r
+       private final double height;\r
+       private final List<WireArray> connectedWireArrays;\r
+       private final List<Point> wireArrayConnectionPoints;\r
 \r
        public GUIMerger(WireArray union, WireArray... inputs)\r
        {\r
@@ -31,7 +31,7 @@ public class GUIMerger extends Merger implements BasicGUIComponent
                {\r
                        connectedWireArraysModifiable.addAll(Arrays.asList(inputs));\r
                        double inputHeight = 0;\r
-                       for(int i = 0; i < inputCount; i ++, inputHeight += 10)\r
+                       for (int i = 0; i < inputCount; i++, inputHeight += 10)\r
                                wireArrayConnectionPointsModifiable.add(new Point(0, inputHeight));\r
                }\r
 \r
@@ -47,11 +47,12 @@ public class GUIMerger extends Merger implements BasicGUIComponent
        {\r
                return new Rectangle(0, 0, 20, height);\r
        }\r
+\r
        @Override\r
        public void render(GeneralGC gc)\r
        {\r
                double inputHeight = 0;\r
-               for(int i = 0; i < inputCount; i ++, inputHeight += 10)\r
+               for (int i = 0; i < inputCount; i++, inputHeight += 10)\r
                        gc.drawLine(0, inputHeight, 10, inputHeight);\r
                gc.drawLine(10, 0, 10, height);\r
                gc.drawLine(10, height / 2, 20, height / 2);\r
@@ -62,11 +63,13 @@ public class GUIMerger extends Merger implements BasicGUIComponent
        {\r
                return connectedWireArrays.size();\r
        }\r
+\r
        @Override\r
        public WireArray getConnectedWireArray(int connectionIndex)\r
        {\r
                return connectedWireArrays.get(connectionIndex);\r
        }\r
+\r
        @Override\r
        public Point getWireArrayConnectionPoint(int connectionI)\r
        {\r

diff --git a/LogicUI/src/era/mi/gui/components/GUIMux.java b/LogicUI/src/era/mi/gui/components/GUIMux.java
index 64adc7d..e753b14 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIMux.java
+++ b/LogicUI/src/era/mi/gui/components/GUIMux.java
@@ -13,16 +13,16 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 \r
 public class GUIMux extends Mux implements BasicGUIComponent\r
 {\r
-       private final double                    height;\r
-       private final List<WireArray>   connectedWireArrays;\r
-       private final List<Point>               wireArrayConnectionPoints;\r
+       private final double height;\r
+       private final List<WireArray> connectedWireArrays;\r
+       private final List<Point> wireArrayConnectionPoints;\r
 \r
        public GUIMux(int processTime, WireArray out, WireArray select, WireArray... inputs)\r
        {\r
                super(processTime, out, select, inputs);\r
 \r
                double height = inputs.length * 5;\r
-               if(height < 10)\r
+               if (height < 10)\r
                        height = 10;\r
                this.height = height;\r
 \r
@@ -39,7 +39,7 @@ public class GUIMux extends Mux implements BasicGUIComponent
                        connectedWireArraysModifiable.addAll(Arrays.asList(inputs));\r
                        double inputHeightIncrement = (height + 20) / inputs.length;\r
                        double inputHeight = inputHeightIncrement / 2;\r
-                       for(int i = 0; i < inputs.length; i ++, inputHeight += inputHeightIncrement)\r
+                       for (int i = 0; i < inputs.length; i++, inputHeight += inputHeightIncrement)\r
                                wireArrayConnectionPointsModifiable.add(new Point(0, inputHeight));\r
                }\r
 \r
@@ -52,25 +52,25 @@ public class GUIMux extends Mux implements BasicGUIComponent
        {\r
                return new Rectangle(0, 0, 20, height + 20);\r
        }\r
+\r
        @Override\r
        public void render(GeneralGC gc)\r
        {\r
-               gc.drawPolygon(new double[] {\r
-                               0, 0,\r
-                               20, 10,\r
-                               20, height + 10,\r
-                               0, height + 20});\r
+               gc.drawPolygon(new double[] { 0, 0, 20, 10, 20, height + 10, 0, height + 20 });\r
        }\r
+\r
        @Override\r
        public int getConnectedWireArraysCount()\r
        {\r
                return connectedWireArrays.size();\r
        }\r
+\r
        @Override\r
        public WireArray getConnectedWireArray(int connectionIndex)\r
        {\r
                return connectedWireArrays.get(connectionIndex);\r
        }\r
+\r
        @Override\r
        public Point getWireArrayConnectionPoint(int connectionI)\r
        {\r

diff --git a/LogicUI/src/era/mi/gui/components/GUINotGate.java b/LogicUI/src/era/mi/gui/components/GUINotGate.java
index 24702fc..71e1d13 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUINotGate.java
+++ b/LogicUI/src/era/mi/gui/components/GUINotGate.java
@@ -13,10 +13,10 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 \r
 public class GUINotGate extends NotGate implements BasicGUIComponent\r
 {\r
-       private static final String LABEL = "\u22651";//>=1\r
+       private static final String LABEL = "\u22651";// >=1\r
 \r
-       private final List<WireArray>   connectedWireArrays;\r
-       private final List<Point>               wireArrayConnectionPoints;\r
+       private final List<WireArray> connectedWireArrays;\r
+       private final List<Point> wireArrayConnectionPoints;\r
 \r
        public GUINotGate(int processTime, WireArray in, WireArray out)\r
        {\r
@@ -40,6 +40,7 @@ public class GUINotGate extends NotGate implements BasicGUIComponent
        {\r
                return new Rectangle(0, 0, 20, 10);\r
        }\r
+\r
        @Override\r
        public void render(GeneralGC gc)\r
        {\r
@@ -58,11 +59,13 @@ public class GUINotGate extends NotGate implements BasicGUIComponent
        {\r
                return connectedWireArrays.size();\r
        }\r
+\r
        @Override\r
        public WireArray getConnectedWireArray(int connectionIndex)\r
        {\r
                return connectedWireArrays.get(connectionIndex);\r
        }\r
+\r
        @Override\r
        public Point getWireArrayConnectionPoint(int connectionI)\r
        {\r

diff --git a/LogicUI/src/era/mi/gui/components/GUIOrGate.java b/LogicUI/src/era/mi/gui/components/GUIOrGate.java
index e3ff8f3..039dbe3 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIOrGate.java
+++ b/LogicUI/src/era/mi/gui/components/GUIOrGate.java
@@ -14,12 +14,12 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 \r
 public class GUIOrGate extends OrGate implements BasicGUIComponent\r
 {\r
-       private static final String LABEL = "\u22651";//>=1\r
+       private static final String LABEL = "\u22651";// >=1\r
 \r
-       private final int                               inputCount;\r
-       private final double                    height;\r
-       private final List<WireArray>   connectedWireArrays;\r
-       private final List<Point>               wireArrayConnectionPoints;\r
+       private final int inputCount;\r
+       private final double height;\r
+       private final List<WireArray> connectedWireArrays;\r
+       private final List<Point> wireArrayConnectionPoints;\r
 \r
        public GUIOrGate(int processTime, WireArray out, WireArray... in)\r
        {\r
@@ -34,7 +34,7 @@ public class GUIOrGate extends OrGate implements BasicGUIComponent
                {\r
                        connectedWireArraysModifiable.addAll(Arrays.asList(in));\r
                        double inputHeight = 5;\r
-                       for(int i = 0; i < inputCount; i ++, inputHeight += 10)\r
+                       for (int i = 0; i < inputCount; i++, inputHeight += 10)\r
                                wireArrayConnectionPointsModifiable.add(new Point(0, inputHeight));\r
                }\r
 \r
@@ -50,6 +50,7 @@ public class GUIOrGate extends OrGate implements BasicGUIComponent
        {\r
                return new Rectangle(0, 0, 20, height);\r
        }\r
+\r
        @Override\r
        public void render(GeneralGC gc)\r
        {\r
@@ -67,11 +68,13 @@ public class GUIOrGate extends OrGate implements BasicGUIComponent
        {\r
                return connectedWireArrays.size();\r
        }\r
+\r
        @Override\r
        public WireArray getConnectedWireArray(int connectionIndex)\r
        {\r
                return connectedWireArrays.get(connectionIndex);\r
        }\r
+\r
        @Override\r
        public Point getWireArrayConnectionPoint(int connectionI)\r
        {\r

diff --git a/LogicUI/src/era/mi/gui/components/GUISplitter.java b/LogicUI/src/era/mi/gui/components/GUISplitter.java
index 23d8364..c39e428 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUISplitter.java
+++ b/LogicUI/src/era/mi/gui/components/GUISplitter.java
@@ -13,10 +13,10 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 \r
 public class GUISplitter extends Splitter implements BasicGUIComponent\r
 {\r
-       private final int                               outputCount;\r
-       private final double                    height;\r
-       private final List<WireArray>   connectedWireArrays;\r
-       private final List<Point>               wireArrayConnectionPoints;\r
+       private final int outputCount;\r
+       private final double height;\r
+       private final List<WireArray> connectedWireArrays;\r
+       private final List<Point> wireArrayConnectionPoints;\r
 \r
        public GUISplitter(WireArray input, WireArray... outputs)\r
        {\r
@@ -34,7 +34,7 @@ public class GUISplitter extends Splitter implements BasicGUIComponent
                {\r
                        connectedWireArraysModifiable.addAll(Arrays.asList(outputs));\r
                        double outputHeight = 0;\r
-                       for(int i = 0; i < outputCount; i ++, outputHeight += 10)\r
+                       for (int i = 0; i < outputCount; i++, outputHeight += 10)\r
                                wireArrayConnectionPointsModifiable.add(new Point(20, outputHeight));\r
                }\r
 \r
@@ -47,13 +47,14 @@ public class GUISplitter extends Splitter implements BasicGUIComponent
        {\r
                return new Rectangle(0, 0, 20, height);\r
        }\r
+\r
        @Override\r
        public void render(GeneralGC gc)\r
        {\r
                gc.drawLine(0, height / 2, 10, height / 2);\r
                gc.drawLine(10, 0, 10, height);\r
                double outputHeight = 0;\r
-               for(int i = 0; i < outputCount; i ++, outputHeight += 10)\r
+               for (int i = 0; i < outputCount; i++, outputHeight += 10)\r
                        gc.drawLine(10, outputHeight, 20, outputHeight);\r
        }\r
 \r
@@ -62,11 +63,13 @@ public class GUISplitter extends Splitter implements BasicGUIComponent
        {\r
                return connectedWireArrays.size();\r
        }\r
+\r
        @Override\r
        public WireArray getConnectedWireArray(int connectionIndex)\r
        {\r
                return connectedWireArrays.get(connectionIndex);\r
        }\r
+\r
        @Override\r
        public Point getWireArrayConnectionPoint(int connectionI)\r
        {\r

diff --git a/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java b/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java
index e1b462e..e5890d7 100644 (file)
--- a/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java
+++ b/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java
@@ -11,9 +11,9 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 \r
 public class RSLatchGUIExample\r
 {\r
-       private static final int        WIRE_DELAY      = 10;\r
-       private static final int        OR_DELAY        = 50;\r
-       private static final int        NOT_DELAY       = 50;\r
+       private static final int WIRE_DELAY = 10;\r
+       private static final int OR_DELAY = 50;\r
+       private static final int NOT_DELAY = 50;\r
 \r
        public static void main(String[] args)\r
        {\r

diff --git a/LogicUI/src/era/mi/gui/wires/GUIWire.java b/LogicUI/src/era/mi/gui/wires/GUIWire.java
index 5d9a174..977b95f 100644 (file)
--- a/LogicUI/src/era/mi/gui/wires/GUIWire.java
+++ b/LogicUI/src/era/mi/gui/wires/GUIWire.java
@@ -13,19 +13,20 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 \r
 public class GUIWire\r
 {\r
-       private final WireArray wa;\r
-       private final double[]  path;\r
+       private final WireArray wa;\r
+       private final double[] path;\r
 \r
-       public GUIWire(Runnable redraw, BasicGUIComponent component1, int component1ConnectionIndex, Point component1Pos, BasicGUIComponent component2, int component2ConnectionIndex, Point component2Pos, Point... path)\r
+       public GUIWire(Runnable redraw, BasicGUIComponent component1, int component1ConnectionIndex, Point component1Pos,\r
+                       BasicGUIComponent component2, int component2ConnectionIndex, Point component2Pos, Point... path)\r
        {\r
                this.wa = component1.getConnectedWireArray(component1ConnectionIndex);\r
-               if(!Objects.equals(wa, component2.getConnectedWireArray(component2ConnectionIndex)))\r
+               if (!Objects.equals(wa, component2.getConnectedWireArray(component2ConnectionIndex)))\r
                        throw new IllegalArgumentException("Given connection points are not connected!");\r
                this.path = new double[path.length * 2 + 4];\r
                Point component1ConnectionPoint = component1.getWireArrayConnectionPoint(component1ConnectionIndex);\r
                this.path[0] = component1Pos.x + component1ConnectionPoint.x;\r
                this.path[1] = component1Pos.y + component1ConnectionPoint.y;\r
-               for(int srcI = 0, dstI = 2; srcI < path.length; srcI ++, dstI += 2)\r
+               for (int srcI = 0, dstI = 2; srcI < path.length; srcI++, dstI += 2)\r
                {\r
                        this.path[dstI + 0] = path[srcI].x;\r
                        this.path[dstI + 1] = path[srcI].y;\r
@@ -40,7 +41,7 @@ public class GUIWire
        public void render(GeneralGC gc)\r
        {\r
                Color oldFG = gc.getForeground();\r
-               if(wa.length == 1)\r
+               if (wa.length == 1)\r
                        gc.setForeground(gc.getDevice().getSystemColor(getSWTColorConstantForBit(wa.getValue())));\r
                gc.drawPolyline(path);\r
                gc.setForeground(oldFG);\r
@@ -48,19 +49,19 @@ public class GUIWire
 \r
        public static int getSWTColorConstantForBit(Bit bit)\r
        {\r
-               switch(bit)\r
+               switch (bit)\r
                {\r
-                       case ONE:\r
-                               return SWT.COLOR_GREEN;\r
-                       case ZERO:\r
-                               return SWT.COLOR_BLUE;\r
-                       case Z:\r
-                               return SWT.COLOR_BLACK;\r
-                       case U:\r
-                       case X:\r
-                               return SWT.COLOR_RED;\r
-                       default:\r
-                               throw new IllegalArgumentException("Unknown enum constant: " + bit);\r
+               case ONE:\r
+                       return SWT.COLOR_GREEN;\r
+               case ZERO:\r
+                       return SWT.COLOR_BLUE;\r
+               case Z:\r
+                       return SWT.COLOR_BLACK;\r
+               case U:\r
+               case X:\r
+                       return SWT.COLOR_RED;\r
+               default:\r
+                       throw new IllegalArgumentException("Unknown enum constant: " + bit);\r
                }\r
        }\r
 }
\ No newline at end of file

diff --git a/LogicUI/src/era/mi/gui/wires/WireConnectionPoint.java b/LogicUI/src/era/mi/gui/wires/WireConnectionPoint.java
index 50a275d..4b10f1c 100644 (file)
--- a/LogicUI/src/era/mi/gui/wires/WireConnectionPoint.java
+++ b/LogicUI/src/era/mi/gui/wires/WireConnectionPoint.java
@@ -10,8 +10,8 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 \r
 public class WireConnectionPoint implements BasicGUIComponent\r
 {\r
-       private final WireArray wa;\r
-       private final int               wiresCrossing;\r
+       private final WireArray wa;\r
+       private final int wiresCrossing;\r
 \r
        public WireConnectionPoint(WireArray wa, int wiresCrossing)\r
        {\r
@@ -23,26 +23,30 @@ public class WireConnectionPoint implements BasicGUIComponent
        public void render(GeneralGC gc)\r
        {\r
                Color oldBG = gc.getBackground();\r
-               if(wa.length == 1)\r
+               if (wa.length == 1)\r
                        gc.setBackground(gc.getDevice().getSystemColor(GUIWire.getSWTColorConstantForBit(wa.getValue())));\r
                gc.fillOval(-1, -1, 2, 2);\r
                gc.setBackground(oldBG);\r
        }\r
+\r
        @Override\r
        public Rectangle getBounds()\r
        {\r
                return new Rectangle(0, 0, 0, 0);\r
        }\r
+\r
        @Override\r
        public int getConnectedWireArraysCount()\r
        {\r
                return wiresCrossing;\r
        }\r
+\r
        @Override\r
        public WireArray getConnectedWireArray(int connectionIndex)\r
        {\r
                return wa;\r
        }\r
+\r
        @Override\r
        public Point getWireArrayConnectionPoint(int connectionIndex)\r
        {\r