diff --git a/.classpath b/.classpath index fd6b265..82b4893 100644 --- a/.classpath +++ b/.classpath @@ -36,15 +36,15 @@ + - - + + - diff --git a/.idea/$CACHE_FILE$ b/.idea/$CACHE_FILE$ new file mode 100644 index 0000000..ce7a03d --- /dev/null +++ b/.idea/$CACHE_FILE$ @@ -0,0 +1,26 @@ + + + + + + + + + EncapsulationJava + + + Inheritance issuesJava + + + Java + + + + + Android + + + + + + \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..1645b0c --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +spring-fx-app \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..705ec63 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..63e9001 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..3a81037 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml new file mode 100644 index 0000000..6fec8f4 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml new file mode 100644 index 0000000..9eb8596 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml new file mode 100644 index 0000000..f3f3738 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml new file mode 100644 index 0000000..f19f6eb --- /dev/null +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jfoenix_jfoenix_8_0_7.xml b/.idea/libraries/Maven__com_jfoenix_jfoenix_8_0_7.xml new file mode 100644 index 0000000..f4e5b5a --- /dev/null +++ b/.idea/libraries/Maven__com_jfoenix_jfoenix_8_0_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml new file mode 100644 index 0000000..b8581a6 --- /dev/null +++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__de_jensd_fontawesomefx_8_9.xml b/.idea/libraries/Maven__de_jensd_fontawesomefx_8_9.xml new file mode 100644 index 0000000..fb51068 --- /dev/null +++ b/.idea/libraries/Maven__de_jensd_fontawesomefx_8_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__eu_hansolo_colors_1_4.xml b/.idea/libraries/Maven__eu_hansolo_colors_1_4.xml new file mode 100644 index 0000000..b20ef8e --- /dev/null +++ b/.idea/libraries/Maven__eu_hansolo_colors_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__eu_hansolo_tilesfx_1_6_5.xml b/.idea/libraries/Maven__eu_hansolo_tilesfx_1_6_5.xml new file mode 100644 index 0000000..648249e --- /dev/null +++ b/.idea/libraries/Maven__eu_hansolo_tilesfx_1_6_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__gn_GNAvatarView_v1_0_rc.xml b/.idea/libraries/Maven__gn_GNAvatarView_v1_0_rc.xml new file mode 100644 index 0000000..baa05a1 --- /dev/null +++ b/.idea/libraries/Maven__gn_GNAvatarView_v1_0_rc.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__gn_GNButton_v1_1_0.xml b/.idea/libraries/Maven__gn_GNButton_v1_1_0.xml new file mode 100644 index 0000000..05d731d --- /dev/null +++ b/.idea/libraries/Maven__gn_GNButton_v1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__gn_GNCalendar_v1_0.xml b/.idea/libraries/Maven__gn_GNCalendar_v1_0.xml new file mode 100644 index 0000000..25655f5 --- /dev/null +++ b/.idea/libraries/Maven__gn_GNCalendar_v1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__gn_GNCarousel_v2_1_5.xml b/.idea/libraries/Maven__gn_GNCarousel_v2_1_5.xml new file mode 100644 index 0000000..db83d5a --- /dev/null +++ b/.idea/libraries/Maven__gn_GNCarousel_v2_1_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__gn_GNDecorator_v2_1_2_alpha.xml b/.idea/libraries/Maven__gn_GNDecorator_v2_1_2_alpha.xml new file mode 100644 index 0000000..2ffc4a4 --- /dev/null +++ b/.idea/libraries/Maven__gn_GNDecorator_v2_1_2_alpha.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_typhon0_AnimateFX_1_2_1.xml b/.idea/libraries/Maven__io_github_typhon0_AnimateFX_1_2_1.xml new file mode 100644 index 0000000..e39c62e --- /dev/null +++ b/.idea/libraries/Maven__io_github_typhon0_AnimateFX_1_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml b/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml new file mode 100644 index 0000000..ff49512 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml new file mode 100644 index 0000000..e74f3ab --- /dev/null +++ b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml new file mode 100644 index 0000000..059f88f --- /dev/null +++ b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000..d411041 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_12.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_12.xml new file mode 100644 index 0000000..ec857e4 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_12.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_12.xml new file mode 100644 index 0000000..767dbf7 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml new file mode 100644 index 0000000..b3d3858 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml new file mode 100644 index 0000000..1083023 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml new file mode 100644 index 0000000..fe93f54 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml new file mode 100644 index 0000000..889bf4f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml new file mode 100644 index 0000000..4d16d46 --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_controlsfx_controlsfx_8_40_14.xml b/.idea/libraries/Maven__org_controlsfx_controlsfx_8_40_14.xml new file mode 100644 index 0000000..6958924 --- /dev/null +++ b/.idea/libraries/Maven__org_controlsfx_controlsfx_8_40_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..f58bbc1 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml new file mode 100644 index 0000000..78dbe45 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml new file mode 100644 index 0000000..159204f --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml new file mode 100644 index 0000000..af41e3b --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml new file mode 100644 index 0000000..0bf8cf2 --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml new file mode 100644 index 0000000..c4c54d6 --- /dev/null +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml new file mode 100644 index 0000000..087b2a4 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml new file mode 100644 index 0000000..6545f77 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_4_RELEASE.xml new file mode 100644 index 0000000..cf900a4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_4_RELEASE.xml new file mode 100644 index 0000000..1f7cd0d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_4_RELEASE.xml new file mode 100644 index 0000000..093c9f8 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_4_RELEASE.xml new file mode 100644 index 0000000..b844df9 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_4_RELEASE.xml new file mode 100644 index 0000000..69a8086 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_4_RELEASE.xml new file mode 100644 index 0000000..d6a7d75 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_4_RELEASE.xml new file mode 100644 index 0000000..ee6fc74 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_1_6_RELEASE.xml new file mode 100644 index 0000000..4c53933 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_1_6_RELEASE.xml new file mode 100644 index 0000000..9affe15 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_1_6_RELEASE.xml new file mode 100644 index 0000000..78eb291 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_1_6_RELEASE.xml new file mode 100644 index 0000000..143f040 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_1_6_RELEASE.xml new file mode 100644 index 0000000..279c319 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_6_RELEASE.xml new file mode 100644 index 0000000..b3e41fd --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_1_6_RELEASE.xml new file mode 100644 index 0000000..b189322 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml new file mode 100644 index 0000000..9f44657 --- /dev/null +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml new file mode 100644 index 0000000..7e63769 --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..4361200 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..9acf8ea --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.project b/.project index 80e5991..589afb5 100644 --- a/.project +++ b/.project @@ -16,12 +16,12 @@ - org.eclipse.m2e.core.maven2Builder + org.springframework.ide.eclipse.boot.validation.springbootbuilder - org.springframework.ide.eclipse.boot.validation.springbootbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs index 96b30f9..f897a7f 100644 --- a/.settings/org.eclipse.m2e.core.prefs +++ b/.settings/org.eclipse.m2e.core.prefs @@ -1,4 +1,4 @@ -activeProfiles=pom.xml +activeProfiles= eclipse.preferences.version=1 resolveWorkspaceProjects=true version=1 diff --git a/README.md b/README.md index 78c5e86..233063d 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,203 @@ TreeTable支持 ![](https://imgconvert.csdnimg.cn/aHR0cHM6Ly93d3cucGRhaS50ZWNoL19pbWFnZXMvc3ByaW5nL3NwcmluZ2Jvb3QtamF2YWZ4LWFwcC03LnBuZw?x-oss-process=image/format,png) +### 如何部署 +> 收到几个开发问如何进行运行和部署，统一回复下： + ++ 安装jar到本地的maven库 + +![](https://www.pdai.tech/_images/spring/springboot-javafx-app-10.png) + +具体执行maven安装的脚本如下（这里D:\git\github\springboot-javafx-app-demo是我本地的项目目录，需要改成你自己的）： + +```bash +mvn install:install-file -DgroupId=gn -DartifactId=GNCalendar -Dversion=v1.0 -Dpackaging=jar -Dfile=D:\git\github\springboot-javafx-app-demo\lib\GNCalendar-1.0-alpha.jar + +mvn install:install-file -DgroupId=gn -DartifactId=GNButton -Dversion=v1.1.0 -Dpackaging=jar -Dfile=D:\git\github\springboot-javafx-app-demo\lib\GNButton-1.1.0.jar + +mvn install:install-file -DgroupId=gn -DartifactId=GNCarousel -Dversion=v2.1.5 -Dpackaging=jar -Dfile=D:\git\github\springboot-javafx-app-demo\lib\GNCarousel-2.1.5.jar + +mvn install:install-file -DgroupId=gn -DartifactId=GNDecorator -Dversion=v2.1.2-alpha -Dpackaging=jar -Dfile=D:\git\github\springboot-javafx-app-demo\lib\GNDecorator-2.1.2-alpha.jar + +mvn install:install-file -DgroupId=gn -DartifactId=GNAvatarView -Dversion=v1.0-rc -Dpackaging=jar -Dfile=D:\git\github\springboot-javafx-app-demo\lib\GNAvatarView-1.0-rc.jar + +``` + +在这里执行： + +![](https://www.pdai.tech/_images/spring/springboot-javafx-app-8.png) + + ++ 编译的maven插件 + +![](https://www.pdai.tech/_images/spring/springboot-javafx-app-9.png) + + ++ pom.xml如下 + +```xml + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.4.RELEASE + + + com.example + spring-fx-app + 0.0.1-SNAPSHOT + spring-fx-app + Demo project for Spring Boot + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter + + + + + gn + GNAvatarView + v1.0-rc + + + gn + GNButton + v1.1.0 + + + gn + GNCalendar + v1.0 + + + gn + GNCarousel + v2.1.5 + + + gn + GNDecorator + v2.1.2-alpha + + + + + io.github.typhon0 + AnimateFX + 1.2.1 + + + + org.controlsfx + controlsfx + 8.40.14 + + + + de.jensd + fontawesomefx + 8.9 + + + + com.jfoenix + jfoenix + 8.0.7 + + + + eu.hansolo + tilesfx + 1.6.5 + + + + eu.hansolo + colors + 1.4 + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + + + + + com.zenjava + javafx-maven-plugin + 8.8.3 + + pdai + com.pdai.javafx.app.SpringFxAppApplication + true + + + + + + +``` + ++ 以jar运行为例： + +```bash +D:\git\github\springboot-javafx-app-demo>java -jar D:\git\github\springboot-javafx-app-demo\target\jfx\native\spring-fx-app-0.0.1-SNAPSHOT\app\spring-fx-app-0.0.1-SNAPSHOT-jfx.jar + + . ____ _ __ _ _ + /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ +( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \ + \\/ ___)| |_)| | | | | || (_| | ) ) ) ) + ' |____| .__|_| |_|_| |_\__, | / / / / + =========|_|==============|___/=/_/_/_/ + :: Spring Boot :: (v2.1.4.RELEASE) + +2020-07-01 06:27:46.091 INFO 144952 --- [onPool-worker-1] o.s.boot.SpringApplication : Starting application on pdai with PID 144952 (started by pdai in D:\git\github\springboot-javafx-app-demo) +2020-07-01 06:27:46.099 INFO 144952 --- [onPool-worker-1] o.s.boot.SpringApplication : No active profile set, falling back to default profiles: default +2020-07-01 06:27:47.099 INFO 144952 --- [onPool-worker-1] o.s.boot.SpringApplication : Started application in 1.784 seconds (JVM running for 2.838) +2020-07-01 06:27:47.163 WARN 144952 --- [JavaFX-Launcher] javafx : Loading FXML document with JavaFX API of version 8.0.171 by JavaF +X runtime of version 8.0.65 +2020-07-01 06:27:51.932 WARN 144952 --- [JavaFX-Launcher] javafx : Loading FXML document with JavaFX API of version 8.0.171 by JavaF +X runtime of version 8.0.65 +2020-07-01 06:27:53.084 WARN 144952 --- [JavaFX-Launcher] javafx : Loading FXML document with JavaFX API of version 8.0.171 by JavaF +X runtime of version 8.0.65 +2020-07-01 06:27:54.166 WARN 144952 --- [JavaFX-Launcher] javafx : Loading FXML document with JavaFX API of version 8.0.171 by JavaF +X runtime of version 8.0.65 +2020-07-01 06:27:54.207 WARN 144952 --- [JavaFX-Launcher] javafx : Loading FXML document with JavaFX API of version 8.0.171 by JavaF +X runtime of version 8.0.65 +2020-07-01 06:27:54.263 WARN 144952 --- [JavaFX-Launcher] javafx : Loading FXML document with JavaFX API of version 8.0.171 by JavaF +X runtime of version 8.0.65 +2020-07-01 06:27:54.322 WARN 144952 --- [JavaFX-Launcher] javafx : Loading FXML document with JavaFX API of version 8.0.171 by JavaF +X runtime of version 8.0.65 +2020-07-01 06:27:56.569 WARN 144952 --- [lication Thread] javafx : Loading FXML document with JavaFX API of version 8.0.171 by JavaF +X runtime of version 8.0.65 +2020-07-01 06:27:56.590 WARN 144952 --- [lication Thread] javafx : Loading FXML document with JavaFX API of version 8.0.171 by JavaF +X runtime of version 8.0.65 +2020-07-01 06:27:56.694 WARN 144952 --- [lication Thread] javafx : Loading FXML document with JavaFX API of version 8.0.171 by JavaF +X runtime of version 8.0.65 +2020-07-01 06:27:56.707 WARN 144952 --- [lication Thread] javafx : Loading FXML document with JavaFX API of version 8.0.171 by JavaF +X runtime of version 8.0.65 +``` + ### 示例代码 @See https://github.com/realpdai/springboot-javafx-app-demo diff --git a/j b/j new file mode 100644 index 0000000..e69de29 diff --git a/pom.xml b/pom.xml index d0f363d..b25b3a4 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,36 @@ org.springframework.boot spring-boot-starter + + + + gn + GNAvatarView + v1.0-rc + + + gn + GNButton + v1.1.0 + + + gn + GNCalendar + v1.0 + + + gn + GNCarousel + v2.1.5 + + + gn + GNDecorator + v2.1.2-alpha + + io.github.typhon0 @@ -69,10 +99,21 @@ - - org.springframework.boot - spring-boot-maven-plugin - + + + + + + + com.zenjava + javafx-maven-plugin + 8.8.3 + + pdai + com.pdai.javafx.app.SpringFxAppApplication + true + + diff --git a/spring-fx-app.iml b/spring-fx-app.iml new file mode 100644 index 0000000..634a2fb --- /dev/null +++ b/spring-fx-app.iml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/pdai/javafx/app/SpringFxAppApplication.java b/src/main/java/com/pdai/javafx/app/SpringFxAppApplication.java index eb23117..cb54c96 100644 --- a/src/main/java/com/pdai/javafx/app/SpringFxAppApplication.java +++ b/src/main/java/com/pdai/javafx/app/SpringFxAppApplication.java @@ -1,11 +1,10 @@ package com.pdai.javafx.app; -import java.util.Arrays; - -import org.springframework.boot.autoconfigure.SpringBootApplication; - import com.pdai.javafx.app.fx.AbstractFxApplication; import com.pdai.javafx.app.fx.FxmlView; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import java.util.Arrays; /** * ClassName: SpringFxAppApplication
@@ -13,18 +12,16 @@ * Description: SpringFxAppApplication
* * Date: Apr 12, 2019 11:05:23 AM
- * + * * @author pdai * @version Apr 12, 2019 - * */ @SpringBootApplication public class SpringFxAppApplication extends AbstractFxApplication { - public static void main(String[] args) { - run(SpringFxAppApplication.class, - Arrays.asList(new FxmlView[] { FxmlView.MODULE_DASHBOARD, FxmlView.MODULE_PROFILE, FxmlView.MAIN }), - FxmlView.MAIN, args); - } - + public static void main(String[] args) { + run(SpringFxAppApplication.class, + Arrays.asList(new FxmlView[]{FxmlView.MODULE_DASHBOARD, FxmlView.MODULE_PROFILE, FxmlView.MAIN}), + FxmlView.MAIN, args); + } } diff --git a/src/main/resources/template/loader/loader.fxml b/src/main/resources/template/loader/loader.fxml index 768db1e..9932c5c 100644 --- a/src/main/resources/template/loader/loader.fxml +++ b/src/main/resources/template/loader/loader.fxml @@ -22,7 +22,7 @@ - + @@ -53,7 +53,7 @@