diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..c40d9e31ece672c7ebf1e342f4c37c8b4324c4f1
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,281 @@
+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_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+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_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+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.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+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=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_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_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+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_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=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_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+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_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 7279228defdbf5e72938e172b331c88f19f5cc65..c460c240e2319f031972909ab1e54c95421a743a 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,5 +1,7 @@
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_ExplorViz
+formatter_settings_version=12
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/src/explorviz/hpc_monitoring/reader/MessageDistributer.java b/src/explorviz/hpc_monitoring/reader/MessageDistributer.java
index a5451deeeb550454b36bb555565cc309ae5c038f..ebe0af3ed970c4719d9c19776da4882fe196325b 100644
--- a/src/explorviz/hpc_monitoring/reader/MessageDistributer.java
+++ b/src/explorviz/hpc_monitoring/reader/MessageDistributer.java
@@ -1,5 +1,7 @@
package explorviz.hpc_monitoring.reader;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -25,6 +27,9 @@ public class MessageDistributer implements EventHandler<ByteArrayEvent> {
private final TIntObjectHashMap<String> stringRegistry = new TIntObjectHashMap<String>(
64);
+ private final List<byte[]> waitingForStringMessages = new ArrayList<byte[]>(
+ 1024);
+
private byte[] unreadBytes = null;
private final RingBuffer<RecordEvent> ringBuffer;
@@ -76,123 +81,180 @@ public class MessageDistributer implements EventHandler<ByteArrayEvent> {
final int clazzId = UnsafeBits.getInt(b, offset);
offset += 4;
- IRecord record = null;
-
switch (clazzId) {
- case 0: {
- if ((readSize - offset) < (8 + 4 + 8 + 4 + 4)) {
- return createUnreadBytesArray(b, readSize, offset, true);
- }
+ case TraceMetadata.CLAZZ_ID: {
+ if ((readSize - offset) < TraceMetadata.BYTE_LENGTH) {
+ return createUnreadBytesArray(b, readSize, offset, true);
+ }
- final long traceId = UnsafeBits.getLong(b, offset);
- offset += 8;
- final int hostnameId = UnsafeBits.getInt(b, offset);
- offset += 4;
- final long parentTraceId = UnsafeBits.getLong(b, offset);
- offset += 8;
- final int parentOrderId = UnsafeBits.getInt(b, offset);
- offset += 4;
- final int applicationId = UnsafeBits.getInt(b, offset);
- offset += 4;
-
- record = new TraceMetadata(traceId,
- getStringFromRegistry(hostnameId), parentTraceId,
- parentOrderId, getStringFromRegistry(applicationId));
- break;
- }
- case 1: {
- if ((readSize - offset) < (8 + 8 + 4 + 4)) {
- return createUnreadBytesArray(b, readSize, offset, true);
+ offset = readInTraceMetadata(b, offset);
+ break;
}
+ case BeforeOperationEvent.CLAZZ_ID: {
+ if ((readSize - offset) < BeforeOperationEvent.BYTE_LENGTH) {
+ return createUnreadBytesArray(b, readSize, offset, true);
+ }
- final long timestamp = UnsafeBits.getLong(b, offset);
- offset += 8;
- final long traceId = UnsafeBits.getLong(b, offset);
- offset += 8;
- final int orderIndex = UnsafeBits.getInt(b, offset);
- offset += 4;
- final int operationId = UnsafeBits.getInt(b, offset);
- offset += 4;
-
- record = new BeforeOperationEvent(timestamp, traceId,
- orderIndex, getStringFromRegistry(operationId));
- break;
- }
- case 2: {
- if ((readSize - offset) < (8 + 8 + 4 + 4 + 4)) {
- return createUnreadBytesArray(b, readSize, offset, true);
+ offset = readInBeforeOperationEvent(b, offset);
+ break;
}
+ case AfterFailedOperationEvent.CLAZZ_ID: {
+ if ((readSize - offset) < AfterFailedOperationEvent.BYTE_LENGTH) {
+ return createUnreadBytesArray(b, readSize, offset, true);
+ }
- final long timestamp = UnsafeBits.getLong(b, offset);
- offset += 8;
- final long traceId = UnsafeBits.getLong(b, offset);
- offset += 8;
- final int orderIndex = UnsafeBits.getInt(b, offset);
- offset += 4;
- final int operationId = UnsafeBits.getInt(b, offset);
- offset += 4;
- final int causeId = UnsafeBits.getInt(b, offset);
- offset += 4;
-
- record = new AfterFailedOperationEvent(timestamp, traceId,
- orderIndex, getStringFromRegistry(operationId),
- getStringFromRegistry(causeId));
- break;
- }
- case 3: {
- if ((readSize - offset) < (8 + 8 + 4 + 4)) {
- return createUnreadBytesArray(b, readSize, offset, true);
+ offset = readInAfterFailedOperationEvent(b, offset);
+ break;
}
+ case AfterOperationEvent.CLAZZ_ID: {
+ if ((readSize - offset) < AfterOperationEvent.BYTE_LENGTH) {
+ return createUnreadBytesArray(b, readSize, offset, true);
+ }
- final long timestamp = UnsafeBits.getLong(b, offset);
- offset += 8;
- final long traceId = UnsafeBits.getLong(b, offset);
- offset += 8;
- final int orderIndex = UnsafeBits.getInt(b, offset);
- offset += 4;
- final int operationId = UnsafeBits.getInt(b, offset);
- offset += 4;
-
- record = new AfterOperationEvent(timestamp, traceId,
- orderIndex, getStringFromRegistry(operationId));
- break;
- }
- case 4: {
- if ((readSize - offset) < (4 + 4)) {
- return createUnreadBytesArray(b, readSize, offset, true);
+ offset = readInAfterOperationEvent(b, offset);
+ break;
}
+ case 4: {
+ if ((readSize - offset) < (4 + 4)) {
+ return createUnreadBytesArray(b, readSize, offset, true);
+ }
- final int mapId = UnsafeBits.getInt(b, offset);
- offset += 4;
- final int stringLength = UnsafeBits.getInt(b, offset);
- offset += 4;
+ final int mapId = UnsafeBits.getInt(b, offset);
+ offset += 4;
+ final int stringLength = UnsafeBits.getInt(b, offset);
+ offset += 4;
- if ((readSize - offset) < stringLength) {
- return createUnreadBytesArray(b, readSize, offset - 8, true);
- }
+ if ((readSize - offset) < stringLength) {
+ return createUnreadBytesArray(b, readSize, offset - 8,
+ true);
+ }
- final byte[] stringBytes = new byte[stringLength];
- System.arraycopy(b, offset, stringBytes, 0, stringLength);
- final String string = new String(stringBytes);
- offset += stringLength;
+ final byte[] stringBytes = new byte[stringLength];
+ System.arraycopy(b, offset, stringBytes, 0, stringLength);
+ final String string = new String(stringBytes);
+ offset += stringLength;
- addToRegistry(mapId, string);
+ addToRegistry(mapId, string);
- break;
- }
- default: {
- System.out.println("unknown class id " + clazzId
- + " at offset " + (offset - 4));
- return null;
- }
+ break;
+ }
+ default: {
+ System.out.println("unknown class id " + clazzId
+ + " at offset " + (offset - 4));
+ return null;
+ }
}
-
- putInRingBuffer(record);
}
return null;
}
+ private int readInTraceMetadata(final byte[] b, int offset) {
+ final long traceId = UnsafeBits.getLong(b, offset);
+ offset += 8;
+ final int hostnameId = UnsafeBits.getInt(b, offset);
+ offset += 4;
+ final long parentTraceId = UnsafeBits.getLong(b, offset);
+ offset += 8;
+ final int parentOrderId = UnsafeBits.getInt(b, offset);
+ offset += 4;
+ final int applicationId = UnsafeBits.getInt(b, offset);
+ offset += 4;
+
+ final String hostname = getStringFromRegistry(hostnameId);
+ final String application = getStringFromRegistry(applicationId);
+
+ if ((hostname != null) && (application != null)) {
+ putInRingBuffer(new TraceMetadata(traceId, hostname, parentTraceId,
+ parentOrderId, application));
+ } else {
+ final byte[] message = new byte[4 + TraceMetadata.BYTE_LENGTH];
+ System.arraycopy(b, offset - TraceMetadata.BYTE_LENGTH - 4,
+ message, 0, TraceMetadata.BYTE_LENGTH + 4);
+ putInWaitingMessages(message);
+ }
+ return offset;
+ }
+
+ private int readInBeforeOperationEvent(final byte[] b, int offset) {
+ final long timestamp = UnsafeBits.getLong(b, offset);
+ offset += 8;
+ final long traceId = UnsafeBits.getLong(b, offset);
+ offset += 8;
+ final int orderIndex = UnsafeBits.getInt(b, offset);
+ offset += 4;
+ final int operationId = UnsafeBits.getInt(b, offset);
+ offset += 4;
+
+ final String operation = getStringFromRegistry(operationId);
+
+ if (operation != null) {
+ putInRingBuffer(new BeforeOperationEvent(timestamp, traceId,
+ orderIndex, operation));
+ } else {
+ final byte[] message = new byte[4 + BeforeOperationEvent.BYTE_LENGTH];
+ System.arraycopy(b, offset - BeforeOperationEvent.BYTE_LENGTH - 4,
+ message, 0, BeforeOperationEvent.BYTE_LENGTH + 4);
+ putInWaitingMessages(message);
+ }
+ return offset;
+ }
+
+ private int readInAfterFailedOperationEvent(final byte[] b, int offset) {
+ final long timestamp = UnsafeBits.getLong(b, offset);
+ offset += 8;
+ final long traceId = UnsafeBits.getLong(b, offset);
+ offset += 8;
+ final int orderIndex = UnsafeBits.getInt(b, offset);
+ offset += 4;
+ final int operationId = UnsafeBits.getInt(b, offset);
+ offset += 4;
+ final int causeId = UnsafeBits.getInt(b, offset);
+ offset += 4;
+
+ final String operation = getStringFromRegistry(operationId);
+ final String cause = getStringFromRegistry(causeId);
+
+ if ((operation != null) && (cause != null)) {
+ putInRingBuffer(new AfterFailedOperationEvent(timestamp, traceId,
+ orderIndex, operation, cause));
+ } else {
+ final byte[] message = new byte[4 + AfterFailedOperationEvent.BYTE_LENGTH];
+ System.arraycopy(b, offset - AfterFailedOperationEvent.BYTE_LENGTH
+ - 4, message, 0, AfterFailedOperationEvent.BYTE_LENGTH + 4);
+ putInWaitingMessages(message);
+ }
+ return offset;
+ }
+
+ private int readInAfterOperationEvent(final byte[] b, int offset) {
+ final long timestamp = UnsafeBits.getLong(b, offset);
+ offset += 8;
+ final long traceId = UnsafeBits.getLong(b, offset);
+ offset += 8;
+ final int orderIndex = UnsafeBits.getInt(b, offset);
+ offset += 4;
+ final int operationId = UnsafeBits.getInt(b, offset);
+ offset += 4;
+
+ final String operation = getStringFromRegistry(operationId);
+ if (operation != null) {
+ putInRingBuffer(new AfterOperationEvent(timestamp, traceId,
+ orderIndex, operation));
+ } else {
+ final byte[] message = new byte[4 + AfterOperationEvent.BYTE_LENGTH];
+ System.arraycopy(b, offset - AfterOperationEvent.BYTE_LENGTH - 4,
+ message, 0, AfterOperationEvent.BYTE_LENGTH + 4);
+ putInWaitingMessages(message);
+ }
+
+ return offset;
+ }
+
+ private void putInWaitingMessages(final byte[] message) {
+ waitingForStringMessages.add(message);
+ }
+
private byte[] createUnreadBytesArray(final byte[] b, final int readSize,
int offset, final boolean withClazzId) {
if (withClazzId) {
@@ -214,28 +276,42 @@ public class MessageDistributer implements EventHandler<ByteArrayEvent> {
public void addToRegistry(final int key, final String value) {
stringRegistry.put(key, value);
-
- System.out.println("put key " + key + " value " + value);
- synchronized (this) {
- notifyAll();
- }
+ // System.out.println("put key " + key + " value " + value);
+
+ checkWaitingMessages();
}
- private String getStringFromRegistry(final int id) {
- String result = stringRegistry.get(id);
- while (result == null) {
- try {
- synchronized (this) {
- System.out.println("waiting for " + id);
- this.wait();
- }
- } catch (final InterruptedException e) {
- e.printStackTrace();
+ private void checkWaitingMessages() {
+ final List<byte[]> localWaitingList = new ArrayList<byte[]>();
+ for (final byte[] waitingMessage : waitingForStringMessages) {
+ localWaitingList.add(waitingMessage);
+ }
+ waitingForStringMessages.clear();
+
+ for (final byte[] waitingMessage : localWaitingList) {
+ final int waitingMessageClazzId = UnsafeBits.getInt(waitingMessage,
+ 0);
+ switch (waitingMessageClazzId) {
+ case TraceMetadata.CLAZZ_ID:
+ readInTraceMetadata(waitingMessage, 4);
+ break;
+ case BeforeOperationEvent.CLAZZ_ID:
+ readInBeforeOperationEvent(waitingMessage, 4);
+ break;
+ case AfterFailedOperationEvent.CLAZZ_ID:
+ readInAfterFailedOperationEvent(waitingMessage, 4);
+ break;
+ case AfterOperationEvent.CLAZZ_ID:
+ readInAfterOperationEvent(waitingMessage, 4);
+ break;
+ default:
+ break;
}
- result = stringRegistry.get(id);
}
+ }
- return result;
+ private String getStringFromRegistry(final int id) {
+ return stringRegistry.get(id);
}
}
diff --git a/src/explorviz/hpc_monitoring/record/TraceMetadata.java b/src/explorviz/hpc_monitoring/record/TraceMetadata.java
index 0a26170e3d81bd8374f034c8f0067624ae998513..7b1f8c723dd8ea5c71757915fefb2143eac953af 100644
--- a/src/explorviz/hpc_monitoring/record/TraceMetadata.java
+++ b/src/explorviz/hpc_monitoring/record/TraceMetadata.java
@@ -1,44 +1,48 @@
package explorviz.hpc_monitoring.record;
public class TraceMetadata implements IRecord {
- private final long traceId;
- private final String hostname;
- private final long parentTraceId;
- private final int parentOrderId;
- private final String application;
-
- public TraceMetadata(final long traceId, final String hostname,
- final long parentTraceId, final int parentOrderId,
- final String application) {
- this.traceId = traceId;
- this.hostname = hostname;
- this.parentTraceId = parentTraceId;
- this.parentOrderId = parentOrderId;
- this.application = application;
- }
-
- public long getLoggingTimestamp() {
- throw new UnsupportedOperationException();
- }
-
- public long getTraceId() {
- return traceId;
- }
-
- public String getHostname() {
- return hostname;
- }
-
- public long getParentTraceId() {
- return parentTraceId;
- }
-
- public int getParentOrderId() {
- return parentOrderId;
- }
-
- public String getApplication() {
- return application;
- }
+ public static final int BYTE_LENGTH = 8 + 4 + 8 + 4 + 4;
+
+ public static final int CLAZZ_ID = 0;
+
+ private final long traceId;
+ private final String hostname;
+ private final long parentTraceId;
+ private final int parentOrderId;
+ private final String application;
+
+ public TraceMetadata(final long traceId, final String hostname,
+ final long parentTraceId, final int parentOrderId,
+ final String application) {
+ this.traceId = traceId;
+ this.hostname = hostname;
+ this.parentTraceId = parentTraceId;
+ this.parentOrderId = parentOrderId;
+ this.application = application;
+ }
+
+ public long getLoggingTimestamp() {
+ throw new UnsupportedOperationException();
+ }
+
+ public long getTraceId() {
+ return traceId;
+ }
+
+ public String getHostname() {
+ return hostname;
+ }
+
+ public long getParentTraceId() {
+ return parentTraceId;
+ }
+
+ public int getParentOrderId() {
+ return parentOrderId;
+ }
+
+ public String getApplication() {
+ return application;
+ }
}
diff --git a/src/explorviz/hpc_monitoring/record/events/normal/AfterFailedOperationEvent.java b/src/explorviz/hpc_monitoring/record/events/normal/AfterFailedOperationEvent.java
index 16bf14e6cf7fe90c50912ddc11b1afd7a1f5cbc4..c6c2996a96a57307e441befe994f7c94b2d9e2e4 100644
--- a/src/explorviz/hpc_monitoring/record/events/normal/AfterFailedOperationEvent.java
+++ b/src/explorviz/hpc_monitoring/record/events/normal/AfterFailedOperationEvent.java
@@ -3,17 +3,20 @@ package explorviz.hpc_monitoring.record.events.normal;
import explorviz.hpc_monitoring.record.events.AbstractOperationEvent;
public class AfterFailedOperationEvent extends AbstractOperationEvent {
- private final String cause;
+ public static final int BYTE_LENGTH = 8 + 8 + 4 + 4 + 4;
+ public static final int CLAZZ_ID = 2;
- public AfterFailedOperationEvent(final long timestamp, final long traceId,
- final int orderIndex, final String operationSignature,
- final String cause) {
- super(timestamp, traceId, orderIndex, operationSignature);
+ private final String cause;
- this.cause = cause;
- }
+ public AfterFailedOperationEvent(final long timestamp, final long traceId,
+ final int orderIndex, final String operationSignature,
+ final String cause) {
+ super(timestamp, traceId, orderIndex, operationSignature);
- public String getCause() {
- return cause;
- }
+ this.cause = cause;
+ }
+
+ public String getCause() {
+ return cause;
+ }
}
diff --git a/src/explorviz/hpc_monitoring/record/events/normal/AfterOperationEvent.java b/src/explorviz/hpc_monitoring/record/events/normal/AfterOperationEvent.java
index 453cf1865ef7aef89685b10509e069d9309b7ee1..c49ad89a130a762b442db0c396cf30a16b4ddd9e 100644
--- a/src/explorviz/hpc_monitoring/record/events/normal/AfterOperationEvent.java
+++ b/src/explorviz/hpc_monitoring/record/events/normal/AfterOperationEvent.java
@@ -3,8 +3,11 @@ package explorviz.hpc_monitoring.record.events.normal;
import explorviz.hpc_monitoring.record.events.AbstractOperationEvent;
public class AfterOperationEvent extends AbstractOperationEvent {
- public AfterOperationEvent(final long timestamp, final long traceId,
- final int orderIndex, final String operationSignature) {
- super(timestamp, traceId, orderIndex, operationSignature);
- }
+ public static final int BYTE_LENGTH = 8 + 8 + 4 + 4;
+ public static final int CLAZZ_ID = 3;
+
+ public AfterOperationEvent(final long timestamp, final long traceId,
+ final int orderIndex, final String operationSignature) {
+ super(timestamp, traceId, orderIndex, operationSignature);
+ }
}
diff --git a/src/explorviz/hpc_monitoring/record/events/normal/BeforeOperationEvent.java b/src/explorviz/hpc_monitoring/record/events/normal/BeforeOperationEvent.java
index d4d18c115fb0422297bfa084c4d55c8faa69001e..ca971e5382c61318adde4c22caed8e9bbffceddb 100644
--- a/src/explorviz/hpc_monitoring/record/events/normal/BeforeOperationEvent.java
+++ b/src/explorviz/hpc_monitoring/record/events/normal/BeforeOperationEvent.java
@@ -3,8 +3,11 @@ package explorviz.hpc_monitoring.record.events.normal;
import explorviz.hpc_monitoring.record.events.AbstractOperationEvent;
public class BeforeOperationEvent extends AbstractOperationEvent {
- public BeforeOperationEvent(final long timestamp, final long traceId,
- final int orderIndex, final String operationSignature) {
- super(timestamp, traceId, orderIndex, operationSignature);
- }
+ public static final int BYTE_LENGTH = 8 + 8 + 4 + 4;
+ public static final int CLAZZ_ID = 1;
+
+ public BeforeOperationEvent(final long timestamp, final long traceId,
+ final int orderIndex, final String operationSignature) {
+ super(timestamp, traceId, orderIndex, operationSignature);
+ }
}