diff --git a/.classpath b/.classpath index 3cceca9..0067f81 100644 --- a/.classpath +++ b/.classpath @@ -1,8 +1,10 @@ - - - + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 3a21537..34ce075 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -9,3 +9,288 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.source=1.8 +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=next_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=next_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_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=false +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_after_type_annotation=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=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=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=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_lambda_arrow=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_lambda_arrow=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=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_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 +org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000..55229af --- /dev/null +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,62 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=false +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=false +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_Didier +formatter_settings_version=12 diff --git a/Siba.jar b/Siba.jar deleted file mode 100644 index cd71cd0..0000000 Binary files a/Siba.jar and /dev/null differ diff --git a/lib/commons-compress-1.10-sources.jar b/lib/commons-compress-1.10-sources.jar new file mode 100644 index 0000000..fd755c5 Binary files /dev/null and b/lib/commons-compress-1.10-sources.jar differ diff --git a/commons-compress-1.10.jar b/lib/commons-compress-1.10.jar similarity index 100% rename from commons-compress-1.10.jar rename to lib/commons-compress-1.10.jar diff --git a/lib/jgoodies-common-1.8.1.jar b/lib/jgoodies-common-1.8.1.jar new file mode 100644 index 0000000..f6a256e Binary files /dev/null and b/lib/jgoodies-common-1.8.1.jar differ diff --git a/jgoodies-forms-1.8.0-sources.jar b/lib/jgoodies-forms-1.8.0-sources.jar similarity index 100% rename from jgoodies-forms-1.8.0-sources.jar rename to lib/jgoodies-forms-1.8.0-sources.jar diff --git a/jgoodies-forms-1.8.0.jar b/lib/jgoodies-forms-1.8.0.jar similarity index 100% rename from jgoodies-forms-1.8.0.jar rename to lib/jgoodies-forms-1.8.0.jar diff --git a/src/siba/Siba.java b/src/org/dclermonte/siba/Siba.java similarity index 65% rename from src/siba/Siba.java rename to src/org/dclermonte/siba/Siba.java index 86eaa63..589a980 100644 --- a/src/siba/Siba.java +++ b/src/org/dclermonte/siba/Siba.java @@ -1,6 +1,6 @@ -package siba; +package org.dclermonte.siba; -import siba.gui.SibaGUI; +import org.dclermonte.siba.gui.SibaGUI; public class Siba { diff --git a/src/org/dclermonte/siba/cli/SibaCLI.java b/src/org/dclermonte/siba/cli/SibaCLI.java new file mode 100644 index 0000000..36a11bc --- /dev/null +++ b/src/org/dclermonte/siba/cli/SibaCLI.java @@ -0,0 +1,6 @@ +package org.dclermonte.siba.cli; + +public class SibaCLI +{ + +} diff --git a/src/org/dclermonte/siba/gui/AboutDialog.java b/src/org/dclermonte/siba/gui/AboutDialog.java new file mode 100644 index 0000000..2e238ab --- /dev/null +++ b/src/org/dclermonte/siba/gui/AboutDialog.java @@ -0,0 +1,73 @@ +package org.dclermonte.siba.gui; + +import java.awt.BorderLayout; +import java.awt.FlowLayout; + +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JPanel; +import javax.swing.border.EmptyBorder; +import java.awt.Color; +import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; +import javax.swing.JTextPane; +import java.awt.Font; + +public class AboutDialog extends JDialog +{ + + /** + * Launch the application. + */ + public static void main(String string) + { + try + { + AboutDialog dialog = new AboutDialog(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public AboutDialog() + { + getContentPane().setBackground(new Color(154, 205, 50)); + setBounds(100, 100, 450, 300); + getContentPane().setLayout(new BorderLayout()); + { + JPanel buttonPane = new JPanel(); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane, BorderLayout.SOUTH); + { + JButton okButton = new JButton("OK"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + setVisible(false); + dispose(); + } + }); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + } + + JPanel panel = new JPanel(); + panel.setBackground(new Color(0, 255, 255)); + getContentPane().add(panel, BorderLayout.CENTER); + + JTextPane txtpnSimpleBackupDveloppeur = new JTextPane(); + txtpnSimpleBackupDveloppeur.setBackground(new Color(0, 255, 255)); + txtpnSimpleBackupDveloppeur.setFont(new Font("Dialog", Font.BOLD, 14)); + txtpnSimpleBackupDveloppeur.setText("Simple Backup\n\nDéveloppeur Christian Pierre Momon et Didier Clermonté\n\nLicence ...... 2016"); + panel.add(txtpnSimpleBackupDveloppeur); + } + +} diff --git a/src/org/dclermonte/siba/gui/BackupPanel.java b/src/org/dclermonte/siba/gui/BackupPanel.java new file mode 100644 index 0000000..17578ff --- /dev/null +++ b/src/org/dclermonte/siba/gui/BackupPanel.java @@ -0,0 +1,119 @@ +package org.dclermonte.siba.gui; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.File; +import java.io.IOException; + +import javax.swing.JButton; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.SwingConstants; + +import com.jgoodies.forms.layout.ColumnSpec; +import com.jgoodies.forms.layout.FormLayout; +import com.jgoodies.forms.layout.FormSpecs; +import com.jgoodies.forms.layout.RowSpec; +import com.jgoodies.forms.layout.Sizes; + +import org.apache.commons.compress.archivers.ArchiveException; +import org.dclermonte.siba.model.*; + +public class BackupPanel extends JPanel +{ + private JTextField textField; + private JTextField textField_1; + + /** + * Create the panel. + */ + + public BackupPanel() + { + + JButton btnNewButton = new JButton("..."); + btnNewButton.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + final JFileChooser fc = new JFileChooser(); + fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + int returnVal = fc.showDialog(BackupPanel.this,"Répertoire à sauvegarder"); + if (returnVal == JFileChooser.APPROVE_OPTION){ + File file = fc.getSelectedFile(); + textField.setText(file.getPath()); + } + } + }); + setLayout(new FormLayout(new ColumnSpec[] { + ColumnSpec.decode("center:2dlu"), + new ColumnSpec(ColumnSpec.LEFT, Sizes.bounded(Sizes.PREFERRED, Sizes.constant("50dlu", true), Sizes.constant("52dlu", true)), 1), + new ColumnSpec(ColumnSpec.LEFT, Sizes.bounded(Sizes.PREFERRED, Sizes.constant("50dlu", true), Sizes.constant("90dlu", true)), 1), + ColumnSpec.decode("left:30dlu"),}, + new RowSpec[] { + RowSpec.decode("5dlu"), + RowSpec.decode("25px"), + FormSpecs.DEFAULT_ROWSPEC, + RowSpec.decode("25px"), + FormSpecs.RELATED_GAP_ROWSPEC, + FormSpecs.DEFAULT_ROWSPEC, + FormSpecs.RELATED_GAP_ROWSPEC, + FormSpecs.DEFAULT_ROWSPEC,})); + + JLabel lblNewLabel = new JLabel("Répertoire à sauvegarder"); + lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT); + lblNewLabel.setVerticalAlignment(SwingConstants.TOP); + add(lblNewLabel, "2, 2, left, center"); + + textField = new JTextField(); + add(textField, "3, 2, fill, default"); + textField.setColumns(10); + add(btnNewButton, "4, 2, left, top"); + + JButton btnNewButton_1 = new JButton("..."); + btnNewButton_1.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e1) { + final JFileChooser fc1 = new JFileChooser(); + fc1.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + int returnVal = fc1.showDialog(BackupPanel.this,"Répertoire de destination"); + if (returnVal == JFileChooser.APPROVE_OPTION){ + File file = fc1.getSelectedFile(); + textField_1.setText(file.getPath()); + } + } + }); + + JLabel lblRpertoireDeDestination = new JLabel("Répertoire de destination"); + lblRpertoireDeDestination.setVerticalAlignment(SwingConstants.TOP); + lblRpertoireDeDestination.setHorizontalAlignment(SwingConstants.LEFT); + add(lblRpertoireDeDestination, "2, 4, left, default"); + + textField_1 = new JTextField(); + add(textField_1, "3, 4, fill, default"); + textField_1.setColumns(10); + btnNewButton_1.setHorizontalAlignment(SwingConstants.RIGHT); + add(btnNewButton_1, "4, 4, left, top"); + + JButton btnNewButton_2 = new JButton("Backup"); + btnNewButton_2.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + try + { + SibaManager.backup(new File("/home/papou/logique_2/notes-de-cours2-S3.1.pdf")); + } + catch (ArchiveException | IOException e1) + { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } + }); + add(btnNewButton_2, "3, 8"); + + } + +} diff --git a/src/org/dclermonte/siba/gui/CheckPanel.java b/src/org/dclermonte/siba/gui/CheckPanel.java new file mode 100644 index 0000000..05522bb --- /dev/null +++ b/src/org/dclermonte/siba/gui/CheckPanel.java @@ -0,0 +1,70 @@ +package org.dclermonte.siba.gui; + +import javax.swing.JPanel; +import javax.swing.JLabel; +import javax.swing.JButton; +import javax.swing.JFileChooser; + +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.File; +import com.jgoodies.forms.layout.FormLayout; +import com.jgoodies.forms.layout.ColumnSpec; +import com.jgoodies.forms.layout.FormSpecs; +import com.jgoodies.forms.layout.RowSpec; +import com.jgoodies.forms.layout.Sizes; +import javax.swing.JTextField; + +public class CheckPanel extends JPanel +{ + private JTextField textField; + + /** + * Create the panel. + */ + public CheckPanel() + { + setLayout(new FormLayout(new ColumnSpec[] { + ColumnSpec.decode("2dlu"), + new ColumnSpec(ColumnSpec.LEFT, Sizes.bounded(Sizes.PREFERRED, Sizes.constant("50dlu", true), Sizes.constant("60dlu", true)), 1), + new ColumnSpec(ColumnSpec.LEFT, Sizes.bounded(Sizes.PREFERRED, Sizes.constant("50dlu", true), Sizes.constant("100dlu", true)), 1), + ColumnSpec.decode("30dlu"),}, + new RowSpec[] { + FormSpecs.LINE_GAP_ROWSPEC, + RowSpec.decode("25px"), + FormSpecs.RELATED_GAP_ROWSPEC, + FormSpecs.DEFAULT_ROWSPEC,})); + + JLabel lblNewLabel = new JLabel("Sauvegarde à vérifier"); + add(lblNewLabel, "2, 2, left, center"); + + JButton btnNewButton = new JButton("..."); + btnNewButton.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + repertoireChoisi(); + } + }); + + textField = new JTextField(); + add(textField, "3, 2, fill, default"); + textField.setColumns(10); + add(btnNewButton, "4, 2, left, top"); + + JButton btnNewButton_1 = new JButton("Check"); + add(btnNewButton_1, "3, 4"); + + } + + final void repertoireChoisi() { + final JFileChooser fc = new JFileChooser(); + fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + int returnVal = fc.showDialog(CheckPanel.this,"Sauvegarde à vérifier"); + if (returnVal == JFileChooser.APPROVE_OPTION){ + File file = fc.getSelectedFile(); + textField.setText(file.getPath());} + } + + } + + diff --git a/src/siba/gui/SibaGUI.java b/src/org/dclermonte/siba/gui/SibaGUI.java similarity index 60% rename from src/siba/gui/SibaGUI.java rename to src/org/dclermonte/siba/gui/SibaGUI.java index 00ba86c..3637e85 100644 --- a/src/siba/gui/SibaGUI.java +++ b/src/org/dclermonte/siba/gui/SibaGUI.java @@ -1,4 +1,4 @@ -package siba.gui; +package org.dclermonte.siba.gui; import java.awt.EventQueue; @@ -8,6 +8,15 @@ import java.awt.Font; import javax.swing.JTabbedPane; import java.awt.BorderLayout; import javax.swing.JPanel; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JMenu; +import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; +import javax.swing.JPopupMenu; +import java.awt.Component; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; public class SibaGUI @@ -56,6 +65,7 @@ public class SibaGUI JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP); frmSimpleBackup.getContentPane().add(tabbedPane, BorderLayout.CENTER); + JPanel panel = new BackupPanel(); panel.setBackground(new Color(152, 251, 152)); tabbedPane.addTab("BackUp", null, panel, null); @@ -69,5 +79,30 @@ public class SibaGUI frmSimpleBackup.setTitle("Simple Backup"); frmSimpleBackup.setBounds(100, 100, 450, 300); frmSimpleBackup.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + + JMenuBar menuBar = new JMenuBar(); + frmSimpleBackup.setJMenuBar(menuBar); + + JMenuItem mntmNewMenuItem_1 = new JMenuItem("Sortir"); + mntmNewMenuItem_1.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + frmSimpleBackup.dispose(); + } + }); + menuBar.add(mntmNewMenuItem_1); + + JMenu mnNewMenu = new JMenu("Help"); + mnNewMenu.setBackground(new Color(127, 255, 212)); + mnNewMenu.setOpaque(true); + menuBar.add(mnNewMenu); + + JMenuItem mntmNewMenuItem_2 = new JMenuItem("About"); + mntmNewMenuItem_2.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + AboutDialog.main(""); + } + }); + mnNewMenu.add(mntmNewMenuItem_2); } + } diff --git a/src/siba/model/SibaModel.java b/src/org/dclermonte/siba/model/SibaManager.java similarity index 62% rename from src/siba/model/SibaModel.java rename to src/org/dclermonte/siba/model/SibaManager.java index ecda28a..ce6a94a 100644 --- a/src/siba/model/SibaModel.java +++ b/src/org/dclermonte/siba/model/SibaManager.java @@ -1,4 +1,4 @@ -package siba.model; +package org.dclermonte.siba.model; import java.io.File; import java.io.FileInputStream; @@ -14,30 +14,37 @@ import java.util.LinkedList; import java.util.List; import org.apache.commons.compress.archivers.ArchiveException; +import org.apache.commons.compress.archivers.ArchiveOutputStream; import org.apache.commons.compress.archivers.ArchiveStreamFactory; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.utils.IOUtils; -public class SibaModel +public class SibaManager { -public static File backup(File repertoireAsauvegarder){ - File sauvegarde = new File(""); - return sauvegarde; +public static File backup(File toto) throws ArchiveException, IOException{ + File output = new File("/home/papou/output.tgz"); + final OutputStream out = new FileOutputStream("/home/papou/output.tgz"); + ArchiveOutputStream os = new ArchiveStreamFactory().createArchiveOutputStream(ArchiveStreamFactory.TAR, out); + os.putArchiveEntry(new TarArchiveEntry(toto)); + IOUtils.copy(new FileInputStream(toto), os); + os.closeArchiveEntry(); + os.close(); + return output; } -public static File md5(File repertoireAsauvegarder) throws IOException{ - File sauvegarde = new File(repertoireAsauvegarder.getName()+"md5"); +public static File md5(File directoryToSave) throws IOException{ + File saved = new File(directoryToSave.getName()+"md5"); try - { byte[] byterepertoireAsauvegarder = repertoireAsauvegarder.toString().getBytes() ; + { byte[] bytedirectoryToSave = directoryToSave.toString().getBytes() ; byte[] hash = null; - MessageDigest md = MessageDigest.getInstance("MD5"); - hash = md.digest(byterepertoireAsauvegarder); + MessageDigest messageDigest = MessageDigest.getInstance("MD5"); + hash = messageDigest.digest(bytedirectoryToSave); StringBuilder hashString = new StringBuilder(); - for (int i = 0; i < hash.length; i++) + for (int index = 0; index < hash.length; index++) { - String hex = Integer.toHexString(hash[i]); + String hex = Integer.toHexString(hash[index]); if (hex.length() == 1) { hashString.append('0'); @@ -46,9 +53,9 @@ public static File md5(File repertoireAsauvegarder) throws IOException{ else hashString.append(hex.substring(hex.length() - 2)); } - FileWriter ffw = new FileWriter(sauvegarde); - ffw.write(hashString.toString()); - ffw.close(); + FileWriter fileWriter = new FileWriter(saved); + fileWriter.write(hashString.toString()); + fileWriter.close(); } catch (NoSuchAlgorithmException e) { @@ -56,19 +63,19 @@ public static File md5(File repertoireAsauvegarder) throws IOException{ e.printStackTrace(); } - return sauvegarde; + return saved; } -public static void extract(File repertoireAdecompresser, File destination) throws IOException, ArchiveException{ +public static void extract(File directoryToUntar, File destination) throws IOException, ArchiveException{ File file = destination; final List untaredFiles = new LinkedList(); - InputStream is; + InputStream inputStream; try { - is = new FileInputStream(repertoireAdecompresser); + inputStream = new FileInputStream(directoryToUntar); - final TarArchiveInputStream debInputStream = (TarArchiveInputStream) new ArchiveStreamFactory().createArchiveInputStream("tar", is); + final TarArchiveInputStream debInputStream = (TarArchiveInputStream) new ArchiveStreamFactory().createArchiveInputStream("tar", inputStream); TarArchiveEntry entry = null; while ((entry = (TarArchiveEntry)debInputStream.getNextEntry()) != null) { final File outputFile = new File(file, entry.getName()); diff --git a/src/siba/cli/SibaCLI.java b/src/siba/cli/SibaCLI.java deleted file mode 100644 index 4f58aed..0000000 --- a/src/siba/cli/SibaCLI.java +++ /dev/null @@ -1,6 +0,0 @@ -package siba.cli; - -public class SibaCLI -{ - -} diff --git a/src/siba/gui/AboutDialog.java b/src/siba/gui/AboutDialog.java deleted file mode 100644 index 740fe67..0000000 --- a/src/siba/gui/AboutDialog.java +++ /dev/null @@ -1,61 +0,0 @@ -package siba.gui; - -import java.awt.BorderLayout; -import java.awt.FlowLayout; - -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JPanel; -import javax.swing.border.EmptyBorder; - -public class AboutDialog extends JDialog -{ - - private final JPanel contentPanel = new JPanel(); - - /** - * Launch the application. - */ - public static void main(String[] args) - { - try - { - AboutDialog dialog = new AboutDialog(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public AboutDialog() - { - setBounds(100, 100, 450, 300); - getContentPane().setLayout(new BorderLayout()); - contentPanel.setLayout(new FlowLayout()); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel, BorderLayout.CENTER); - { - JPanel buttonPane = new JPanel(); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane, BorderLayout.SOUTH); - { - JButton okButton = new JButton("OK"); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("Cancel"); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - } - -} diff --git a/src/siba/gui/BackupPanel.java b/src/siba/gui/BackupPanel.java deleted file mode 100644 index 0ed790d..0000000 --- a/src/siba/gui/BackupPanel.java +++ /dev/null @@ -1,63 +0,0 @@ -package siba.gui; - -import javax.swing.JPanel; -import javax.swing.JLabel; -import javax.swing.SwingConstants; -import javax.swing.JButton; -import javax.swing.JFileChooser; - -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.File; - -import javax.swing.filechooser.*; -import javax.swing.plaf.basic.BasicFileChooserUI; - -public class BackupPanel extends JPanel -{ - - /** - * Create the panel. - */ - public BackupPanel() - { - - JButton btnNewButton = new JButton("Choix du répertoire"); - btnNewButton.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - final JFileChooser fc = new JFileChooser(); - fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - int returnVal = fc.showDialog(BackupPanel.this,"Répertoire à sauvegarder"); - if (returnVal == JFileChooser.APPROVE_OPTION){ - File file = fc.getSelectedFile(); - System.out.println("Répertoire chosi " + file.getPath()); - } - } - }); - - JLabel lblNewLabel = new JLabel("Répertoire à sauvegarder"); - lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT); - lblNewLabel.setVerticalAlignment(SwingConstants.TOP); - add(lblNewLabel); - add(btnNewButton); - - JButton btnNewButton_1 = new JButton("Répertoire de destination"); - btnNewButton_1.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e1) { - final JFileChooser fc1 = new JFileChooser(); - fc1.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - int returnVal = fc1.showDialog(BackupPanel.this,"Répertoire de destination"); - if (returnVal == JFileChooser.APPROVE_OPTION){ - File file = fc1.getSelectedFile(); - System.out.println("Répertoire chosi " + file.getPath()); - } - } - }); - btnNewButton_1.setHorizontalAlignment(SwingConstants.LEADING); - add(btnNewButton_1); - - } - -} diff --git a/src/siba/gui/CheckPanel.java b/src/siba/gui/CheckPanel.java deleted file mode 100644 index 886a4b8..0000000 --- a/src/siba/gui/CheckPanel.java +++ /dev/null @@ -1,41 +0,0 @@ -package siba.gui; - -import javax.swing.JPanel; -import javax.swing.JLabel; -import javax.swing.JButton; -import javax.swing.JFileChooser; - -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.File; - -public class CheckPanel extends JPanel -{ - - /** - * Create the panel. - */ - public CheckPanel() - { - - JLabel lblNewLabel = new JLabel("Sauvegarde à vérifier"); - add(lblNewLabel); - - JButton btnNewButton = new JButton("Choix de la sauvegarde"); - btnNewButton.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - final JFileChooser fc = new JFileChooser(); - fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - int returnVal = fc.showDialog(CheckPanel.this,"Sauvegarde à vérifier"); - if (returnVal == JFileChooser.APPROVE_OPTION){ - File file = fc.getSelectedFile(); - System.out.println("Répertoire chosi " + file.getPath()); - } - } - }); - add(btnNewButton); - - } - -}