diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a179bde3e4e772c29c0c85e53354aa54618..0000000000000000000000000000000000000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ -<component name="ProjectCodeStyleConfiguration"> - <state> - <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" /> - </state> -</component> \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index a2703e1441ee2a7b4d6afbb16033eef9b29aa774..0000000000000000000000000000000000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="CompilerConfiguration"> - <annotationProcessing> - <profile name="Maven default annotation processors profile" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <module name="Bachelor_application" /> - </profile> - </annotationProcessing> - <bytecodeTargetLevel> - <module name="Bachelor_application" target="8" /> - </bytecodeTargetLevel> - </component> -</project> \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba45445dc9f3afa66e6a149914dc39e3df6..0000000000000000000000000000000000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="Encoding"> - <file url="PROJECT" charset="UTF-8" /> - </component> -</project> \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 712ab9d985c20018a0c97b93d2148ac1ffe588a5..0000000000000000000000000000000000000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="RemoteRepositoriesConfiguration"> - <remote-repository> - <option name="id" value="central" /> - <option name="name" value="Central Repository" /> - <option name="url" value="https://repo.maven.apache.org/maven2" /> - </remote-repository> - <remote-repository> - <option name="id" value="central" /> - <option name="name" value="Maven Central repository" /> - <option name="url" value="https://repo1.maven.org/maven2" /> - </remote-repository> - <remote-repository> - <option name="id" value="jboss.community" /> - <option name="name" value="JBoss Community repository" /> - <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> - </remote-repository> - </component> -</project> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_1.xml deleted file mode 100644 index a1987aa774b02b87548440c3aef8033e31b056e0..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.13.1/jackson-core-2.13.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.13.1/jackson-core-2.13.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.13.1/jackson-core-2.13.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_api_api_common_2_1_3.xml b/.idea/libraries/Maven__com_google_api_api_common_2_1_3.xml deleted file mode 100644 index 1af145818b91755bc71baaebe955b3ddf6988a39..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_api_api_common_2_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.api:api-common:2.1.3"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/api-common/2.1.3/api-common-2.1.3.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/api-common/2.1.3/api-common-2.1.3-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/api-common/2.1.3/api-common-2.1.3-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_api_client_google_api_client_1_33_1.xml b/.idea/libraries/Maven__com_google_api_client_google_api_client_1_33_1.xml deleted file mode 100644 index d8b617a35b6684006a4f55b3244ea72045b391a8..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_api_client_google_api_client_1_33_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.api-client:google-api-client:1.33.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api-client/google-api-client/1.33.1/google-api-client-1.33.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api-client/google-api-client/1.33.1/google-api-client-1.33.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api-client/google-api-client/1.33.1/google-api-client-1.33.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_api_gax_2_11_0.xml b/.idea/libraries/Maven__com_google_api_gax_2_11_0.xml deleted file mode 100644 index 6bc88d23f78ccf78549e634c7c3b9b1375ee6dcf..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_api_gax_2_11_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.api:gax:2.11.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax/2.11.0/gax-2.11.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax/2.11.0/gax-2.11.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax/2.11.0/gax-2.11.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_api_gax_httpjson_0_96_0.xml b/.idea/libraries/Maven__com_google_api_gax_httpjson_0_96_0.xml deleted file mode 100644 index 99ee789a148562438ec42e97dd927ee24b32d6a7..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_api_gax_httpjson_0_96_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.api:gax-httpjson:0.96.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax-httpjson/0.96.0/gax-httpjson-0.96.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax-httpjson/0.96.0/gax-httpjson-0.96.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax-httpjson/0.96.0/gax-httpjson-0.96.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_api_grpc_proto_google_common_protos_2_7_2.xml b/.idea/libraries/Maven__com_google_api_grpc_proto_google_common_protos_2_7_2.xml deleted file mode 100644 index ec25dc0bb04377619136775b0a78833d5032c747..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_api_grpc_proto_google_common_protos_2_7_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.api.grpc:proto-google-common-protos:2.7.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-common-protos/2.7.2/proto-google-common-protos-2.7.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-common-protos/2.7.2/proto-google-common-protos-2.7.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-common-protos/2.7.2/proto-google-common-protos-2.7.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_api_grpc_proto_google_iam_v1_1_2_1.xml b/.idea/libraries/Maven__com_google_api_grpc_proto_google_iam_v1_1_2_1.xml deleted file mode 100644 index de9a27732d2cf93c3049d8f70c3217f56bf7095a..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_api_grpc_proto_google_iam_v1_1_2_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.api.grpc:proto-google-iam-v1:1.2.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-iam-v1/1.2.1/proto-google-iam-v1-1.2.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-iam-v1/1.2.1/proto-google-iam-v1-1.2.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-iam-v1/1.2.1/proto-google-iam-v1-1.2.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_apis_google_api_services_bigquery_v2_rev20220123_1_32_1.xml b/.idea/libraries/Maven__com_google_apis_google_api_services_bigquery_v2_rev20220123_1_32_1.xml deleted file mode 100644 index 5f52d22dddbb81e547f53bb3bf8d8ae0433ede89..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_apis_google_api_services_bigquery_v2_rev20220123_1_32_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.apis:google-api-services-bigquery:v2-rev20220123-1.32.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/apis/google-api-services-bigquery/v2-rev20220123-1.32.1/google-api-services-bigquery-v2-rev20220123-1.32.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/apis/google-api-services-bigquery/v2-rev20220123-1.32.1/google-api-services-bigquery-v2-rev20220123-1.32.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/apis/google-api-services-bigquery/v2-rev20220123-1.32.1/google-api-services-bigquery-v2-rev20220123-1.32.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_apis_google_api_services_storage_v1_rev20211201_1_32_1.xml b/.idea/libraries/Maven__com_google_apis_google_api_services_storage_v1_rev20211201_1_32_1.xml deleted file mode 100644 index 361daf1236c407e3a3c5a681787f27d32144dbae..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_apis_google_api_services_storage_v1_rev20211201_1_32_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.apis:google-api-services-storage:v1-rev20211201-1.32.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/apis/google-api-services-storage/v1-rev20211201-1.32.1/google-api-services-storage-v1-rev20211201-1.32.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/apis/google-api-services-storage/v1-rev20211201-1.32.1/google-api-services-storage-v1-rev20211201-1.32.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/apis/google-api-services-storage/v1-rev20211201-1.32.1/google-api-services-storage-v1-rev20211201-1.32.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_auth_google_auth_library_credentials_1_4_0.xml b/.idea/libraries/Maven__com_google_auth_google_auth_library_credentials_1_4_0.xml deleted file mode 100644 index 1ae1b83288d2bbd6d96e6d3a7823f89cebc8ed01..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_auth_google_auth_library_credentials_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.auth:google-auth-library-credentials:1.4.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-credentials/1.4.0/google-auth-library-credentials-1.4.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-credentials/1.4.0/google-auth-library-credentials-1.4.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-credentials/1.4.0/google-auth-library-credentials-1.4.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_auth_google_auth_library_oauth2_http_1_4_0.xml b/.idea/libraries/Maven__com_google_auth_google_auth_library_oauth2_http_1_4_0.xml deleted file mode 100644 index 792242958e132a9db590022baf55bd4884eb9894..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_auth_google_auth_library_oauth2_http_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.auth:google-auth-library-oauth2-http:1.4.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-oauth2-http/1.4.0/google-auth-library-oauth2-http-1.4.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-oauth2-http/1.4.0/google-auth-library-oauth2-http-1.4.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-oauth2-http/1.4.0/google-auth-library-oauth2-http-1.4.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_auto_value_auto_value_annotations_1_9.xml b/.idea/libraries/Maven__com_google_auto_value_auto_value_annotations_1_9.xml deleted file mode 100644 index e85a01b0fd449f1b8e6f1da92232f328a7c11de4..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_auto_value_auto_value_annotations_1_9.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.auto.value:auto-value-annotations:1.9"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/auto/value/auto-value-annotations/1.9/auto-value-annotations-1.9.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/auto/value/auto-value-annotations/1.9/auto-value-annotations-1.9-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/auto/value/auto-value-annotations/1.9/auto-value-annotations-1.9-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_cloud_google_cloud_bigquery_2_8_0.xml b/.idea/libraries/Maven__com_google_cloud_google_cloud_bigquery_2_8_0.xml deleted file mode 100644 index 2ef0ec10ad4f2a0af3e04a2d4594682a4863df5a..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_cloud_google_cloud_bigquery_2_8_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.cloud:google-cloud-bigquery:2.8.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-bigquery/2.8.0/google-cloud-bigquery-2.8.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-bigquery/2.8.0/google-cloud-bigquery-2.8.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-bigquery/2.8.0/google-cloud-bigquery-2.8.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_cloud_google_cloud_core_2_4_0.xml b/.idea/libraries/Maven__com_google_cloud_google_cloud_core_2_4_0.xml deleted file mode 100644 index e40288affd74796a52ed3b012e1f56ef0e5620f2..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_cloud_google_cloud_core_2_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.cloud:google-cloud-core:2.4.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-core/2.4.0/google-cloud-core-2.4.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-core/2.4.0/google-cloud-core-2.4.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-core/2.4.0/google-cloud-core-2.4.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_cloud_google_cloud_core_http_2_4_0.xml b/.idea/libraries/Maven__com_google_cloud_google_cloud_core_http_2_4_0.xml deleted file mode 100644 index 8f7c5726e7824b77ca5ed19cb18f1d0e1f4351e2..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_cloud_google_cloud_core_http_2_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.cloud:google-cloud-core-http:2.4.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-core-http/2.4.0/google-cloud-core-http-2.4.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-core-http/2.4.0/google-cloud-core-http-2.4.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-core-http/2.4.0/google-cloud-core-http-2.4.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_cloud_google_cloud_storage_2_4_0.xml b/.idea/libraries/Maven__com_google_cloud_google_cloud_storage_2_4_0.xml deleted file mode 100644 index 4aff0cfd810be370454f6a1fd48abd66dc00a019..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_cloud_google_cloud_storage_2_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.cloud:google-cloud-storage:2.4.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-storage/2.4.0/google-cloud-storage-2.4.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-storage/2.4.0/google-cloud-storage-2.4.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-storage/2.4.0/google-cloud-storage-2.4.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml deleted file mode 100644 index 1c380d0bd2fc132ee231d3e854e178a2fe182aee..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.code.findbugs:jsr305:3.0.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml deleted file mode 100644 index d376a88bb718ff740c0b131ab587e1caf45c3046..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.code.gson:gson:2.8.9"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.9/gson-2.8.9-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.9/gson-2.8.9-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_11_0.xml b/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_11_0.xml deleted file mode 100644 index 4eb3ba5f533a0826838d067818d961cbff40ab54..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_11_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.errorprone:error_prone_annotations:2.11.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml deleted file mode 100644 index 36e948e2e2c2938d8e57595d81118e7c01ea7d86..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.guava:failureaccess:1.0.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_31_0_1_jre.xml b/.idea/libraries/Maven__com_google_guava_guava_31_0_1_jre.xml deleted file mode 100644 index 08b28cc5511540c27f369d0b605918ee7f63f4d8..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_guava_guava_31_0_1_jre.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.guava:guava:31.0.1-jre"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml b/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml deleted file mode 100644 index 4e15702e5840b137a1dbddd0a71fe1dfe7518c73..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_http_client_google_http_client_1_41_2.xml b/.idea/libraries/Maven__com_google_http_client_google_http_client_1_41_2.xml deleted file mode 100644 index 34fc17f8b0698939c10e2b150daa216d5ebc7f5c..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_http_client_google_http_client_1_41_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.http-client:google-http-client:1.41.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client/1.41.2/google-http-client-1.41.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client/1.41.2/google-http-client-1.41.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client/1.41.2/google-http-client-1.41.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_http_client_google_http_client_apache_v2_1_41_2.xml b/.idea/libraries/Maven__com_google_http_client_google_http_client_apache_v2_1_41_2.xml deleted file mode 100644 index d9f5a2670a6587c7694db5ec8e882bd07146545c..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_http_client_google_http_client_apache_v2_1_41_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.http-client:google-http-client-apache-v2:1.41.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-apache-v2/1.41.2/google-http-client-apache-v2-1.41.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-apache-v2/1.41.2/google-http-client-apache-v2-1.41.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-apache-v2/1.41.2/google-http-client-apache-v2-1.41.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_http_client_google_http_client_appengine_1_41_2.xml b/.idea/libraries/Maven__com_google_http_client_google_http_client_appengine_1_41_2.xml deleted file mode 100644 index 806ae230452ec7e519c89ac15409509cf34c5ed7..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_http_client_google_http_client_appengine_1_41_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.http-client:google-http-client-appengine:1.41.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-appengine/1.41.2/google-http-client-appengine-1.41.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-appengine/1.41.2/google-http-client-appengine-1.41.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-appengine/1.41.2/google-http-client-appengine-1.41.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_http_client_google_http_client_gson_1_41_2.xml b/.idea/libraries/Maven__com_google_http_client_google_http_client_gson_1_41_2.xml deleted file mode 100644 index 3de7f63d2837b28a5fa29f322d7942131048dba7..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_http_client_google_http_client_gson_1_41_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.http-client:google-http-client-gson:1.41.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-gson/1.41.2/google-http-client-gson-1.41.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-gson/1.41.2/google-http-client-gson-1.41.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-gson/1.41.2/google-http-client-gson-1.41.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_http_client_google_http_client_jackson2_1_41_2.xml b/.idea/libraries/Maven__com_google_http_client_google_http_client_jackson2_1_41_2.xml deleted file mode 100644 index 61103e6d9500dcf7ee33d4f6ec1ff7088bb47f35..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_http_client_google_http_client_jackson2_1_41_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.http-client:google-http-client-jackson2:1.41.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-jackson2/1.41.2/google-http-client-jackson2-1.41.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-jackson2/1.41.2/google-http-client-jackson2-1.41.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/http-client/google-http-client-jackson2/1.41.2/google-http-client-jackson2-1.41.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml b/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml deleted file mode 100644 index bacaa4563601cba123b8c48d85ada6a6db0fc11c..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.j2objc:j2objc-annotations:1.3"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_1_33_0.xml b/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_1_33_0.xml deleted file mode 100644 index ac8342c72270e61eaa53e9bd54e9898cfa0fbc28..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_1_33_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.oauth-client:google-oauth-client:1.33.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/oauth-client/google-oauth-client/1.33.0/google-oauth-client-1.33.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/oauth-client/google-oauth-client/1.33.0/google-oauth-client-1.33.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/oauth-client/google-oauth-client/1.33.0/google-oauth-client-1.33.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_19_3.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_19_3.xml deleted file mode 100644 index 501f1cd8a4094648eb9543adc1098f313ed9a562..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_19_3.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.protobuf:protobuf-java:3.19.3"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_util_3_19_3.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_util_3_19_3.xml deleted file mode 100644 index 1822c7e7d83bf54f69e4832d4499919ced8e937e..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_util_3_19_3.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: com.google.protobuf:protobuf-java-util:3.19.3"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java-util/3.19.3/protobuf-java-util-3.19.3.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java-util/3.19.3/protobuf-java-util-3.19.3-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java-util/3.19.3/protobuf-java-util-3.19.3-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml deleted file mode 100644 index c88c2b719293bbf65ac64cbdae414614db15165b..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: commons-codec:commons-codec:1.15"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.15/commons-codec-1.15.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.15/commons-codec-1.15-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.15/commons-codec-1.15-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml deleted file mode 100644 index eab40b3297178f1368697ad576d5614a378e7575..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: commons-logging:commons-logging:1.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__io_grpc_grpc_context_1_44_0.xml b/.idea/libraries/Maven__io_grpc_grpc_context_1_44_0.xml deleted file mode 100644 index c19fae7d0685b3250d9993ea3628020b18e72beb..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__io_grpc_grpc_context_1_44_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: io.grpc:grpc-context:1.44.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/io/grpc/grpc-context/1.44.0/grpc-context-1.44.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/io/grpc/grpc-context/1.44.0/grpc-context-1.44.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/io/grpc/grpc-context/1.44.0/grpc-context-1.44.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__io_opencensus_opencensus_api_0_31_0.xml b/.idea/libraries/Maven__io_opencensus_opencensus_api_0_31_0.xml deleted file mode 100644 index 2398b2d9070a7f05b23f8cff38d0a357d22dc0fb..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__io_opencensus_opencensus_api_0_31_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: io.opencensus:opencensus-api:0.31.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-api/0.31.0/opencensus-api-0.31.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-api/0.31.0/opencensus-api-0.31.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-api/0.31.0/opencensus-api-0.31.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__io_opencensus_opencensus_contrib_http_util_0_31_0.xml b/.idea/libraries/Maven__io_opencensus_opencensus_contrib_http_util_0_31_0.xml deleted file mode 100644 index 70a6094c815ca6e444ba3817821b275393b75675..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__io_opencensus_opencensus_contrib_http_util_0_31_0.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: io.opencensus:opencensus-contrib-http-util:0.31.0"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-contrib-http-util/0.31.0/opencensus-contrib-http-util-0.31.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-contrib-http-util/0.31.0/opencensus-contrib-http-util-0.31.0-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-contrib-http-util/0.31.0/opencensus-contrib-http-util-0.31.0-sources.jar!/" /> - </SOURCES> - </library> -</component> \ 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 deleted file mode 100644 index e74f3ab28b28ba4a1bfd7d0a218614887cb496fc..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: javax.annotation:javax.annotation-api:1.3.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml deleted file mode 100644 index 63bee0e13b468d0ed0f23053d44aae739dec1278..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.apache.httpcomponents:httpclient:4.5.13"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_15.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_15.xml deleted file mode 100644 index c511a85ba88aad67233d19e0d2aa0a0d87fd2e16..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_15.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.apache.httpcomponents:httpcore:4.4.15"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_checkerframework_checker_compat_qual_2_5_5.xml b/.idea/libraries/Maven__org_checkerframework_checker_compat_qual_2_5_5.xml deleted file mode 100644 index a4c92eea06248aaeeddd599ef8a846a83e5959e0..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_checkerframework_checker_compat_qual_2_5_5.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.checkerframework:checker-compat-qual:2.5.5"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_checkerframework_checker_qual_3_21_1.xml b/.idea/libraries/Maven__org_checkerframework_checker_qual_3_21_1.xml deleted file mode 100644 index cffa2daa841c6f5e1b7d5523061ef0dd56117322..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_checkerframework_checker_qual_3_21_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.checkerframework:checker-qual:3.21.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.21.1/checker-qual-3.21.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.21.1/checker-qual-3.21.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.21.1/checker-qual-3.21.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_threeten_threetenbp_1_5_2.xml b/.idea/libraries/Maven__org_threeten_threetenbp_1_5_2.xml deleted file mode 100644 index 95e417def5d0e95690db0c885532a45611716741..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_threeten_threetenbp_1_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.threeten:threetenbp:1.5.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/threeten/threetenbp/1.5.2/threetenbp-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/threeten/threetenbp/1.5.2/threetenbp-1.5.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/threeten/threetenbp/1.5.2/threetenbp-1.5.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index e582eaaa74a2c1a8e0eca1696e0a3f4a0344ae5c..0000000000000000000000000000000000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="MavenProjectsManager"> - <option name="originalFiles"> - <list> - <option value="$PROJECT_DIR$/pom.xml" /> - </list> - </option> - </component> - <component name="ProjectKey"> - <option name="state" value="project://e2804f05-5315-4fc6-a121-c522a6c26470" /> - </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK"> - <output url="file://$PROJECT_DIR$/out" /> - </component> -</project> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 20d1c2835ee3a04f5fd6da24cb8a2bf5ff643ba1..0000000000000000000000000000000000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/Bachelor_application.iml" filepath="$PROJECT_DIR$/Bachelor_application.iml" /> - </modules> - </component> -</project> \ No newline at end of file diff --git a/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch deleted file mode 100644 index 2e30f5aba1219fa20c5f1ce15e272a23091a43d1..0000000000000000000000000000000000000000 --- a/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: .idea/.gitignore -=================================================================== -diff --git a/.idea/.gitignore b/.idea/.gitignore -deleted file mode 100644 ---- a/.idea/.gitignore (revision bf612e45b76fce5444faaa257112a1e684497c29) -+++ /dev/null (revision bf612e45b76fce5444faaa257112a1e684497c29) -@@ -1,8 +0,0 @@ --# Default ignored files --/shelf/ --/workspace.xml --# Editor-based HTTP Client requests --/httpRequests/ --# Datasource local storage ignored files --/dataSources/ --/dataSources.local.xml -Index: .idea/vcs.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/.idea/vcs.xml b/.idea/vcs.xml -new file mode 100644 ---- /dev/null (date 1645110263019) -+++ b/.idea/vcs.xml (date 1645110263019) -@@ -0,0 +1,6 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<project version="4"> -+ <component name="VcsDirectoryMappings"> -+ <mapping directory="" vcs="Git" /> -+ </component> -+</project> -\ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534fb27b68192f27f985d3879e173ec77adb8..0000000000000000000000000000000000000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="Palette2"> - <group name="Swing"> - <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> - </item> - <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> - </item> - <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> - <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> - <initial-values> - <property name="text" value="Button" /> - </initial-values> - </item> - <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="RadioButton" /> - </initial-values> - </item> - <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="CheckBox" /> - </initial-values> - </item> - <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="Label" /> - </initial-values> - </item> - <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> - </item> - <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> - <preferred-size width="-1" height="20" /> - </default-constraints> - </item> - <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> - </item> - <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> - </item> - </group> - </component> -</project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfbbc029bcab630581847471d7f238ec53..0000000000000000000000000000000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="Git" /> - </component> -</project> \ No newline at end of file diff --git a/src/main/java/com/application/GUI/InputPopUpWindow.java b/src/main/java/com/application/GUI/InputPopUpWindow.java index 545e799d67c88fd3f0e2501ad365955b2570bf8d..5a47e8bbfdc10440a9621c3c23c4bff8f3dd8129 100644 --- a/src/main/java/com/application/GUI/InputPopUpWindow.java +++ b/src/main/java/com/application/GUI/InputPopUpWindow.java @@ -2,7 +2,6 @@ package com.application.GUI; import com.application.DB.Constants; import com.application.DB.HelpingFunctions; -import com.application.Main; import javafx.application.Platform; import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -18,7 +17,6 @@ import java.util.Map; import static com.application.DB.Constants.*; import static com.application.DB.DB.getCurrentDrying; -import static com.application.DB.HelpingFunctions.LOADED_DATA; import static com.application.DB.HelpingFunctions.setLoadedData; import static com.application.GUI.LineChartFunctionality.*; import static com.application.Main.*; @@ -35,12 +33,6 @@ public class InputPopUpWindow { private static boolean err = false; - public static void exitDataThread(){ - Platform.exit(); - System.exit(0); - } - - public static void display() { Stage window = new Stage(); diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java index 501eb1460a43fc96348c1ab5cd5665ce87270337..837d2d409878991139f2215026c7260fc001ddf9 100644 --- a/src/main/java/com/application/GUI/LineChartFunctionality.java +++ b/src/main/java/com/application/GUI/LineChartFunctionality.java @@ -1,6 +1,7 @@ package com.application.GUI; import com.application.DB.Constants; +import com.application.DB.HelpingFunctions; import com.application.Main; import javafx.scene.chart.CategoryAxis; import javafx.scene.chart.LineChart; @@ -15,8 +16,13 @@ import org.checkerframework.checker.units.qual.A; import org.jblas.DoubleMatrix; import org.jblas.Solve; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; +import static com.application.GUI.LineChartFunctionality.getDataPointsXAxis; + public class LineChartFunctionality { private static LineChart<String, Number> lineChart; @@ -52,7 +58,7 @@ public class LineChartFunctionality { previousData = new ArrayList<>(); printRegression = true; - printRegressionConfidenceInterval = true; + printRegressionConfidenceInterval = false; printLiveData = true; printPreviousData = true; } @@ -65,19 +71,10 @@ public class LineChartFunctionality { */ public static void printGraphs() { - System.out.println("Graph size: " + getLineChart().getData().size()); - - - //clearLineChart(); getLineChart().getData().clear(); - //Collections.singleton(getLineChart().getData().setAll()); - //getLineChart().getData().setAll(); - - System.out.println("Graph size after clear: " + getLineChart().getData().size()); - //getLineChart().getData().remo - if(printLiveData){ - updateLineChart(getLiveDataSeries()); + if(printRegressionConfidenceInterval){ + updateLineChart(getRegressionSeriesConfidenceInterval()); } else { updateLineChart(new XYChart.Series<>()); } @@ -88,8 +85,8 @@ public class LineChartFunctionality { updateLineChart(new XYChart.Series<>()); } - if(printRegressionConfidenceInterval){ - updateLineChart(getRegressionSeriesConfidenceInterval()); + if(printLiveData){ + updateLineChart(getLiveDataSeries()); } else { updateLineChart(new XYChart.Series<>()); } @@ -433,19 +430,49 @@ public class LineChartFunctionality { public static void loadLiveData(Map<String, Number> userInput) throws Exception { + // Clears any data already there + getLiveDataSeries().getData().clear(); + + // Sets the livedata in series setLiveData(userInput); + + // Updates time left getTimeLeft(userInput.size()); - int index = 0; for (Map.Entry<String, Number> entryKwh : userInput.entrySet()) { + + // Finds the index value + int index = (int) (findDifference(HelpingFunctions.START_TIME, entryKwh.getKey()) / 10); + + // Gets kwh value Double kwhValue = entryKwh.getValue().doubleValue(); - // Connect the data to a series + // Connect the data to a series getLiveDataSeries().getData().add(new XYChart.Data<String, Number>(String.valueOf(index), kwhValue)); - index++; } } + private static long findDifference(String start_date, String end_date) { + // Defining a simple date format + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try{ + // try to convert the string to Date datatype + Date dateStart = dateFormat.parse(start_date); + Date dateEnd = dateFormat.parse(end_date); + + // Finds the difference in millis + long differenceMillis = dateEnd.getTime() - dateStart.getTime(); + + // Finds the difference in minutes + return (differenceMillis / (1000 * 60 )) % 60; + + } catch (Exception e) { + System.out.println(e.getMessage()); + } + return 0; + } + public static void getTimeLeft(int liveData){ int minutes = 0; int hours = 0; @@ -464,7 +491,7 @@ public class LineChartFunctionality { if(minutes == 60){NotificationPopUp.displayNotificationWindow("1 Hours Left!");} Main.setTimeLeftText(minutes + " min"); } - if(minutes == 0){ + if(minutes == 0 && getDataPointsXAxis() != 0){ NotificationPopUp.displayNotificationWindow("Drying Process Finished!"); } } diff --git a/src/main/java/com/application/GUI/ProgressCircleIndicator.java b/src/main/java/com/application/GUI/ProgressBar/ProgressCircleIndicator.java similarity index 99% rename from src/main/java/com/application/GUI/ProgressCircleIndicator.java rename to src/main/java/com/application/GUI/ProgressBar/ProgressCircleIndicator.java index 4ef8a946a9f2d0c579c57395673c734e2a80f5cf..435e13d205bd9ac9bb8c95afe9e9efb62678ba00 100644 --- a/src/main/java/com/application/GUI/ProgressCircleIndicator.java +++ b/src/main/java/com/application/GUI/ProgressBar/ProgressCircleIndicator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.application.GUI; +package com.application.GUI.ProgressBar; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/application/GUI/RingProgressIndicator.java b/src/main/java/com/application/GUI/ProgressBar/RingProgressIndicator.java similarity index 98% rename from src/main/java/com/application/GUI/RingProgressIndicator.java rename to src/main/java/com/application/GUI/ProgressBar/RingProgressIndicator.java index a7bb3d9f196094d7299ee5e073e6b0c32f626f60..c75a908d0770450eb0f72387fe3aa03a0239389a 100644 --- a/src/main/java/com/application/GUI/RingProgressIndicator.java +++ b/src/main/java/com/application/GUI/ProgressBar/RingProgressIndicator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.application.GUI; +package com.application.GUI.ProgressBar; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/application/GUI/RingProgressIndicatorSkin.java b/src/main/java/com/application/GUI/ProgressBar/RingProgressIndicatorSkin.java similarity index 99% rename from src/main/java/com/application/GUI/RingProgressIndicatorSkin.java rename to src/main/java/com/application/GUI/ProgressBar/RingProgressIndicatorSkin.java index d2193f859ca98bb00503fa65c547bd897cfbb4cb..cdc1f2710aec0b3ccdfa212a73f1c6bf4c0382c3 100644 --- a/src/main/java/com/application/GUI/RingProgressIndicatorSkin.java +++ b/src/main/java/com/application/GUI/ProgressBar/RingProgressIndicatorSkin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.application.GUI; +package com.application.GUI.ProgressBar; import javafx.animation.Animation; import javafx.animation.Interpolator; diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java index fedf56036e82856bc5f62a56a680d54e34341c2f..6c471af27349fe6233f842ae8932db3b8893d893 100644 --- a/src/main/java/com/application/Main.java +++ b/src/main/java/com/application/Main.java @@ -3,7 +3,7 @@ package com.application; import com.application.DB.HelpingFunctions; import com.application.GUI.InputPopUpWindow; import com.application.GUI.OutputPopUpWindow; -import com.application.GUI.RingProgressIndicator; +import com.application.GUI.ProgressBar.RingProgressIndicator; import com.application.GUI.LineChartFunctionality; import javafx.application.Application; @@ -17,7 +17,6 @@ import javafx.scene.layout.*; import javafx.scene.Scene; import javafx.stage.Stage; -import javax.naming.LimitExceededException; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; @@ -62,6 +61,11 @@ public class Main extends Application { launch(args); } + public static void exitApplication(){ + Platform.exit(); + System.exit(0); + } + /** * Initializes the application with all the different panes. * @@ -154,11 +158,15 @@ public class Main extends Application { Menu menuEdit = new Menu("Edit"); Menu menuHelp = new Menu("Help"); + MenuItem menuFileExit = new MenuItem("Exit"); + + + menuFileExit.setOnAction(event -> exitApplication()); + + menuFile.getItems().addAll(menuFileExit); // Adding the menus to the menubar - menuBar.getMenus().add(menuFile); - menuBar.getMenus().add(menuEdit); - menuBar.getMenus().add(menuHelp); + menuBar.getMenus().addAll(menuFile, menuEdit, menuHelp); // Returns the menubar return menuBar; @@ -221,7 +229,7 @@ public class Main extends Application { Button exitButton = new Button("Exit"); exitButton.setId("sideBarButtonExit"); - exitButton.setOnAction(e -> InputPopUpWindow.exitDataThread()); + exitButton.setOnAction(e -> exitApplication()); @@ -347,7 +355,7 @@ public class Main extends Application { Label regressionConfidenceIntervalText = new Label("View Regression Shadow"); CheckBox regressionConfidenceIntervalBox = new CheckBox(); - regressionConfidenceIntervalBox.setSelected(true); + regressionConfidenceIntervalBox.setSelected(false); regressionConfidenceIntervalBox.setOnAction(event -> { if(regressionConfidenceIntervalBox.isSelected()){ LineChartFunctionality.setPrintRegressionConfidenceInterval(true); diff --git a/src/main/resources/com.application/GUI/graphStyles.css b/src/main/resources/com.application/GUI/graphStyles.css index 455fbb9ab2596ef8f94c786b6088f4cfe4873912..2edbaf26f089d1c05e9c8d379d99545bb175f460 100644 --- a/src/main/resources/com.application/GUI/graphStyles.css +++ b/src/main/resources/com.application/GUI/graphStyles.css @@ -9,18 +9,18 @@ -fx-effect: null; } -.default-color0.chart-series-line{-fx-stroke: red; -fx-opacity: 1.0} +.default-color0.chart-earlier-data-line{-fx-stroke: black; -fx-opacity: 1.0} .default-color1.chart-series-line{-fx-stroke: green; -fx-opacity: 1.0} -.default-color2.chart-earlier-data-line{-fx-stroke: black; -fx-opacity: 0.1} +.default-color2.chart-series-line{-fx-stroke: red; -fx-opacity: 0.1} .default-color3.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color4.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color5.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color6.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color7.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color0.chart-line-symbol{-fx-background-color: red,red;} +.default-color0.chart-line-symbol{-fx-background-color: black,white;} .default-color1.chart-line-symbol{-fx-background-color: green,green;} -.default-color2.chart-line-symbol{-fx-background-color: black,white;} +.default-color2.chart-line-symbol{-fx-background-color: red,red;} .default-color3.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;} .default-color4.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;} .default-color5.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;} diff --git a/src/main/resources/com.application/sf-drying-optimization-1e234ad2b0f4.json b/src/main/resources/com.application/sf-drying-optimization-1e234ad2b0f4.json deleted file mode 100644 index 944459294ab7f3712fa6454b5ad78b677bf2b191..0000000000000000000000000000000000000000 --- a/src/main/resources/com.application/sf-drying-optimization-1e234ad2b0f4.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "service_account", - "project_id": "sf-drying-optimization", - "private_key_id": "1e234ad2b0f42caff46c54993f72e6ed7a6e47f5", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC9uUivxQCvsUYW\nM2GCJaioM4/KdHIhkgbtGFKtYacQcvJaE1z9RsgTBThWAYXblkigptJ9pCOPIpFR\naqDGujua7+bEm37eQ8pEAPiiSHqNWaevzSjS9OZ8vLD+0AdDy17HuL1KjnR6vJi6\nBRfVfvu3DtzxJbsUutxTwjDTUIZqg6QLeRja0sfa5r1lbqJ6o/uK99fYi3cuW9XW\nbK5czMROw+lNeVU9S2B/5EfezeD+Qtt0hPL6IVdz5oCtbQY9Sj/C+N+tyjPYYXKG\neEZhfvVZOmilIyTupXH+5CJfezxYP6Weg0nD8a6Zt71FSces82PufCU/swiEgh9/\n9zv+anPrAgMBAAECggEAJxcI6eY+OPTeiu51NbqKoHVXOBB7/3y13p33Uu/e2x3D\n31lD/I9b48dcjyPrL44sUqVskySBixlFNbAxhiCS7V5mfrXHEwaGozJMCCvEzGDf\nkvJDagu5fZPnJ+k2xfoeAiqHHdhyGWPIV/N6sKtkM5hlX241uJSzlrJZGwDpYQJ5\na2s5YIw+wLZ90Ybj/V7mvZ0UFLDJV6JztIg1pxSC0CTA7Fz6oZdwIKytBGcYSved\n8tkVPufkL7LtYoNZFrzkgPrTBpm0Teq+XUpCazIySEcOBySbdlhdhMf66nawY1Tx\nRsRUxTtWuFrtDl3XIFOv8C1iAtDiPA4b4Yb8sTR2eQKBgQDuz7xvxYeZdzyFWZlI\nQRVvJAYWT2p2bhImSA9I097B8mWtQ/TY5qankwFcuP+nu3u2MKYRszPrIt5eoH73\nMFi2cqMHOVmsx8JALG4vWlkNNKier06JnuJjH6hh5nQBU+cFuhkHIVfbjBnCiSz8\nizIZxeFG88JfqZFVBR6OIpYyzQKBgQDLYRLQGseonf8Rdv5oRLAL49Q+NnimC2Mo\n7io+DqlhbTFWxE0M6DUZO9C+MesHHSCmw3ZgqT6ykQPxCKZ6ZLQzQzDRqNi+4vy7\n2+BFwKqvUIJtMP0cLNMBRpsjmYMXQqhHGFAHuDsRyyKu0YTUayEB4/MBBnoqnC48\nygBudP5xlwKBgQDQTBu1dhqHTkxYl8UuE66paUdx8EURFYL5JwNF5581lcL/9PU8\ntzoHkh6vDKHZYJtQV3CSobcYUiqZaO41l1LZmHYAmBJStU4GgXp+DRT9gr/M4WXk\nfdRC11scQVFP0yn/gcnQwVGLqtDRMKsvgA3sEwAizfztSc781GFJYnuVxQKBgQCC\npQoDuqA1FcFLA8hrTGxWRvUJPc6Ew13gZhWmpZ5y4kTGevUP7H5nhkASXVifyjs2\nROtfLnkDFhqVFDx09Qm4wFm05KTPAlrdhmHsDNbYJXyTDdwZ5EVrVWLFHJDUOVKF\n0P1f6B2x0W6nJBoSpfqfD0IDj5iclJUzIYPjcK4eYwKBgFfUiZhVj4cWPb1k2MJf\nXC0LBmFgqiW9w4rXfyEXtRSRbO4661TvVHw66SF09hwzz/+MW2R7HLi1IWZNyRF3\nXw39WtI8bmUsLTJbH6gshanmu8cSPLBt82WlRd6gS+SMxyZ65wY/kt9adfIolefm\nICsfIETnkHRpwF3RurchKfjk\n-----END PRIVATE KEY-----\n", - "client_email": "svc-students-sf-drying-opt@sf-drying-optimization.iam.gserviceaccount.com", - "client_id": "106308201919438112497", - "auth_uri": "https://accounts.google.com/o/oauth2/auth", - "token_uri": "https://oauth2.googleapis.com/token", - "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", - "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/svc-students-sf-drying-opt%40sf-drying-optimization.iam.gserviceaccount.com" -} diff --git a/target/classes/com.application/GUI/graphStyles.css b/target/classes/com.application/GUI/graphStyles.css index 455fbb9ab2596ef8f94c786b6088f4cfe4873912..2edbaf26f089d1c05e9c8d379d99545bb175f460 100644 --- a/target/classes/com.application/GUI/graphStyles.css +++ b/target/classes/com.application/GUI/graphStyles.css @@ -9,18 +9,18 @@ -fx-effect: null; } -.default-color0.chart-series-line{-fx-stroke: red; -fx-opacity: 1.0} +.default-color0.chart-earlier-data-line{-fx-stroke: black; -fx-opacity: 1.0} .default-color1.chart-series-line{-fx-stroke: green; -fx-opacity: 1.0} -.default-color2.chart-earlier-data-line{-fx-stroke: black; -fx-opacity: 0.1} +.default-color2.chart-series-line{-fx-stroke: red; -fx-opacity: 0.1} .default-color3.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color4.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color5.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color6.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color7.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color0.chart-line-symbol{-fx-background-color: red,red;} +.default-color0.chart-line-symbol{-fx-background-color: black,white;} .default-color1.chart-line-symbol{-fx-background-color: green,green;} -.default-color2.chart-line-symbol{-fx-background-color: black,white;} +.default-color2.chart-line-symbol{-fx-background-color: red,red;} .default-color3.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;} .default-color4.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;} .default-color5.chart-line-symbol{-fx-background-color: rgba(0,168,355,0.3),white;} diff --git a/target/classes/com/application/GUI/InputPopUpWindow.class b/target/classes/com/application/GUI/InputPopUpWindow.class index 9842a47d800e544997e151418ed15de64d8ee3d9..5fe2e775768312ba384e0ac7373115fa70bfc89a 100644 Binary files a/target/classes/com/application/GUI/InputPopUpWindow.class and b/target/classes/com/application/GUI/InputPopUpWindow.class differ diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class index 57aee1313539f1ad355d32cb846c027cee1bed12..0c347f1e19491b0be62501e70eecf30edb8b9c8d 100644 Binary files a/target/classes/com/application/GUI/LineChartFunctionality.class and b/target/classes/com/application/GUI/LineChartFunctionality.class differ diff --git a/target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator$1.class b/target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator$1.class new file mode 100644 index 0000000000000000000000000000000000000000..cc876ec7fb2a9087f70cc0f1d324227c203f625b Binary files /dev/null and b/target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator$1.class differ diff --git a/target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator$StyleableProperties$1.class b/target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator$StyleableProperties$1.class new file mode 100644 index 0000000000000000000000000000000000000000..8b1c6d476a1a77417d26451de137601eca346a48 Binary files /dev/null and b/target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator$StyleableProperties$1.class differ diff --git a/target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator$StyleableProperties.class b/target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator$StyleableProperties.class new file mode 100644 index 0000000000000000000000000000000000000000..efdca8747a0fb19820f1505cb2b56e6057bdb2bf Binary files /dev/null and b/target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator$StyleableProperties.class differ diff --git a/target/classes/com/application/GUI/ProgressCircleIndicator.class b/target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator.class similarity index 53% rename from target/classes/com/application/GUI/ProgressCircleIndicator.class rename to target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator.class index f2a2a897c8389c67ee681fcc23c1f5a8f26e4975..d6b6e21281a800fb897622b2587a58284d4f8654 100644 Binary files a/target/classes/com/application/GUI/ProgressCircleIndicator.class and b/target/classes/com/application/GUI/ProgressBar/ProgressCircleIndicator.class differ diff --git a/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator$1.class b/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator$1.class new file mode 100644 index 0000000000000000000000000000000000000000..c458d509590c432d966678a0981d10c7ce05e511 Binary files /dev/null and b/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator$1.class differ diff --git a/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator$StyleableProperties$1.class b/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator$StyleableProperties$1.class new file mode 100644 index 0000000000000000000000000000000000000000..fcfefd29265e7b988dee178d088b67ee682d525c Binary files /dev/null and b/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator$StyleableProperties$1.class differ diff --git a/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator$StyleableProperties.class b/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator$StyleableProperties.class new file mode 100644 index 0000000000000000000000000000000000000000..a69cb0121e3e6fb32b4785e6cfe4eac289298c28 Binary files /dev/null and b/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator$StyleableProperties.class differ diff --git a/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator.class b/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator.class new file mode 100644 index 0000000000000000000000000000000000000000..bc589310fa7a59072db1fb51dcf235e4b50cf142 Binary files /dev/null and b/target/classes/com/application/GUI/ProgressBar/RingProgressIndicator.class differ diff --git a/target/classes/com/application/GUI/RingProgressIndicatorSkin.class b/target/classes/com/application/GUI/ProgressBar/RingProgressIndicatorSkin.class similarity index 72% rename from target/classes/com/application/GUI/RingProgressIndicatorSkin.class rename to target/classes/com/application/GUI/ProgressBar/RingProgressIndicatorSkin.class index 68574e9a1b22e916dd04365334201ee14fa7e573..72cfdf8a94140725b78a74eeec24b6e4983a4633 100644 Binary files a/target/classes/com/application/GUI/RingProgressIndicatorSkin.class and b/target/classes/com/application/GUI/ProgressBar/RingProgressIndicatorSkin.class differ diff --git a/target/classes/com/application/GUI/ProgressCircleIndicator$1.class b/target/classes/com/application/GUI/ProgressCircleIndicator$1.class deleted file mode 100644 index d0f6619ccfc51df20025bf53bd19d1be30a483a1..0000000000000000000000000000000000000000 Binary files a/target/classes/com/application/GUI/ProgressCircleIndicator$1.class and /dev/null differ diff --git a/target/classes/com/application/GUI/ProgressCircleIndicator$StyleableProperties$1.class b/target/classes/com/application/GUI/ProgressCircleIndicator$StyleableProperties$1.class deleted file mode 100644 index b2abd17a1f9d5237d8c693f2f3431d0bfa289b0c..0000000000000000000000000000000000000000 Binary files a/target/classes/com/application/GUI/ProgressCircleIndicator$StyleableProperties$1.class and /dev/null differ diff --git a/target/classes/com/application/GUI/ProgressCircleIndicator$StyleableProperties.class b/target/classes/com/application/GUI/ProgressCircleIndicator$StyleableProperties.class deleted file mode 100644 index 6ba268984e19383c6e9f0f15d192a63540fc1a5f..0000000000000000000000000000000000000000 Binary files a/target/classes/com/application/GUI/ProgressCircleIndicator$StyleableProperties.class and /dev/null differ diff --git a/target/classes/com/application/GUI/RingProgressIndicator$1.class b/target/classes/com/application/GUI/RingProgressIndicator$1.class deleted file mode 100644 index 45e87f705c61feeef1ec2e892e8517d527ae9e7a..0000000000000000000000000000000000000000 Binary files a/target/classes/com/application/GUI/RingProgressIndicator$1.class and /dev/null differ diff --git a/target/classes/com/application/GUI/RingProgressIndicator$StyleableProperties$1.class b/target/classes/com/application/GUI/RingProgressIndicator$StyleableProperties$1.class deleted file mode 100644 index f6f4608ba8c4728e9567d3828a3a5dcd43664fe5..0000000000000000000000000000000000000000 Binary files a/target/classes/com/application/GUI/RingProgressIndicator$StyleableProperties$1.class and /dev/null differ diff --git a/target/classes/com/application/GUI/RingProgressIndicator$StyleableProperties.class b/target/classes/com/application/GUI/RingProgressIndicator$StyleableProperties.class deleted file mode 100644 index a9481c06841d92100d649c3cc6af6a5d22a0626c..0000000000000000000000000000000000000000 Binary files a/target/classes/com/application/GUI/RingProgressIndicator$StyleableProperties.class and /dev/null differ diff --git a/target/classes/com/application/GUI/RingProgressIndicator.class b/target/classes/com/application/GUI/RingProgressIndicator.class deleted file mode 100644 index 1f080c004c95a0e44e6bdd514c01df9ffc7cef1e..0000000000000000000000000000000000000000 Binary files a/target/classes/com/application/GUI/RingProgressIndicator.class and /dev/null differ diff --git a/target/classes/com/application/Main$1WorkerThread.class b/target/classes/com/application/Main$1WorkerThread.class index 2e6f24c9e60fd26fd07531bdb7b2189fc12d020b..b1663172200e7bbc78759e7f6591fc0c346714b5 100644 Binary files a/target/classes/com/application/Main$1WorkerThread.class and b/target/classes/com/application/Main$1WorkerThread.class differ diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class index f118b6220aa918d8330fbdac3923da893dda2b49..2b75383dbd81ebb8c9fc02f5601c359dbd49e89a 100644 Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ