From c13087a9473a93e1b2fe3d846260006d4f0b014c Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Mon, 2 Oct 2023 12:44:06 +0300 Subject: [PATCH] New branch --- .gitignore | 3 +- ...t_sample___sample_1_1_1_1_SNAPSHOT_war.xml | 14 -- ...sample_1_1_1_1_SNAPSHOT_war__exploded_.xml | 165 ------------------ .idea/codeStyles/Project.xml | 54 ++++++ .idea/codeStyles/codeStyleConfig.xml | 6 + .idea/compiler.xml | 25 +++ .idea/gradle.xml | 1 - .idea/jarRepositories.xml | 5 + .idea/modules.xml | 2 +- .idea/runConfigurations/MainForm.xml | 2 +- build.gradle | 88 ++++++---- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 53319 -> 56177 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 26 ++- gradlew.bat | 6 - settings.gradle | 9 + .../java/biz/redsoft/sample/MainForm.java | 45 +++++ 18 files changed, 227 insertions(+), 231 deletions(-) delete mode 100644 .idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war.xml delete mode 100644 .idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war__exploded_.xml create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 src/main/java/biz/redsoft/sample/MainForm.java diff --git a/.gitignore b/.gitignore index 2eda6cf..76ca9c8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ gen .idea/workspace.xml .idea/misc.xml ncore-properties-local.xml -*.iml \ No newline at end of file +*.iml +/out \ No newline at end of file diff --git a/.idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war.xml b/.idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war.xml deleted file mode 100644 index 508d863..0000000 --- a/.idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - $PROJECT_DIR$/build/libs - - - :war - :cleanWar - - - - - - - \ No newline at end of file diff --git a/.idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war__exploded_.xml b/.idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war__exploded_.xml deleted file mode 100644 index 4bfa5c9..0000000 --- a/.idea/artifacts/Gradle___biz_redsoft_sample___sample_1_1_1_1_SNAPSHOT_war__exploded_.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - $PROJECT_DIR$/build/libs/exploded/sample-1.1.1.1-SNAPSHOT.war - - - TWFuaWZlc3QtVmVyc2lvbjogMS4wDQoNCg== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..6ee9cd6 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,54 @@ + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..ea2f49f --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 51e227a..76fcf38 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -11,8 +11,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 0445e85..611e7c8 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -11,7 +11,6 @@ - diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index e423192..1e2bc4e 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -21,5 +21,10 @@