From 1478cad2b22106548ec4966f12a4514a2b2d6d21 Mon Sep 17 00:00:00 2001 From: cugurlu Date: Mon, 25 Feb 2019 16:10:41 +0100 Subject: [PATCH 1/3] updateClientServer --- .../executionHistory/executionHistory.bin | Bin 61292 -> 61292 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/5.2.1/fileHashes/fileHashes.bin | Bin 19247 -> 19397 bytes .../.gradle/5.2.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../5.2.1/javaCompile/classAnalysis.bin | Bin 21132 -> 22141 bytes .../5.2.1/javaCompile/javaCompile.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes Client/.idea/compiler.xml | 9 + Client/.idea/modules.xml | 8 + Client/.idea/uiDesigner.xml | 124 +++++ Client/.idea/workspace.xml | 492 ++++++++++++++++-- Client/build.gradle | 37 +- Client/src/main/java/hello/Application.java | 34 +- Client/src/main/java/hello/Message.java | 8 +- Client/src/test/java/ApplicationTest.java | 16 + Client/src/test/java/MessageTest.java | 24 + .../executionHistory/executionHistory.bin | Bin 49669 -> 162998 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/5.2.1/fileHashes/fileHashes.bin | Bin 19097 -> 20097 bytes .../.gradle/5.2.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../5.2.1/fileHashes/resourceHashesCache.bin | Bin 0 -> 18599 bytes .../5.2.1/javaCompile/classAnalysis.bin | Bin 4500638 -> 7342058 bytes .../.gradle/5.2.1/javaCompile/jarAnalysis.bin | Bin 0 -> 19009 bytes .../5.2.1/javaCompile/javaCompile.lock | Bin 17 -> 17 bytes .../.gradle/5.2.1/javaCompile/taskHistory.bin | Bin 32036 -> 42895 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/outputFiles.bin | Bin 18965 -> 19181 bytes Server/.idea/workspace.xml | 406 ++++++++++++--- Server/build.gradle | 29 +- .../classes/java/main/hello/Greeting.class | Bin 610 -> 574 bytes Server/build/jacoco/test.exec | Bin 0 -> 33820 bytes .../tests/test/classes/ApplicationTest.html | 106 ++++ .../reports/tests/test/css/base-style.css | 179 +++++++ Server/build/reports/tests/test/css/style.css | 84 +++ Server/build/reports/tests/test/index.html | 133 +++++ Server/build/reports/tests/test/js/report.js | 194 +++++++ .../tests/test/packages/default-package.html | 103 ++++ .../test/TEST-ApplicationTest.xml | 8 + .../build/test-results/test/binary/output.bin | 1 + .../test-results/test/binary/output.bin.idx | Bin 0 -> 36 bytes .../test-results/test/binary/results.bin | Bin 0 -> 88 bytes Server/src/main/java/hello/Application.java | 3 +- Server/src/main/java/hello/Greeting.java | 8 +- Server/src/test/java/ApplicationTest.java | 6 + .../src/test/java/GreetingControllerTest.java | 14 + Server/src/test/java/GreetingTest.java | 15 + 46 files changed, 1895 insertions(+), 146 deletions(-) create mode 100644 Client/.idea/compiler.xml create mode 100644 Client/.idea/modules.xml create mode 100644 Client/.idea/uiDesigner.xml create mode 100644 Client/src/test/java/ApplicationTest.java create mode 100644 Client/src/test/java/MessageTest.java create mode 100644 Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin create mode 100644 Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin create mode 100644 Server/build/jacoco/test.exec create mode 100644 Server/build/reports/tests/test/classes/ApplicationTest.html create mode 100644 Server/build/reports/tests/test/css/base-style.css create mode 100644 Server/build/reports/tests/test/css/style.css create mode 100644 Server/build/reports/tests/test/index.html create mode 100644 Server/build/reports/tests/test/js/report.js create mode 100644 Server/build/reports/tests/test/packages/default-package.html create mode 100644 Server/build/test-results/test/TEST-ApplicationTest.xml create mode 100644 Server/build/test-results/test/binary/output.bin create mode 100644 Server/build/test-results/test/binary/output.bin.idx create mode 100644 Server/build/test-results/test/binary/results.bin create mode 100644 Server/src/test/java/ApplicationTest.java create mode 100644 Server/src/test/java/GreetingControllerTest.java create mode 100644 Server/src/test/java/GreetingTest.java diff --git a/Client/.gradle/5.2.1/executionHistory/executionHistory.bin b/Client/.gradle/5.2.1/executionHistory/executionHistory.bin index f9e51ec1a31d79698bf6798298dad0dfc7db90d8..53dceb73ca3fcd7251e7211e31622c9db3672c01 100644 GIT binary patch delta 162 zcmV;T0A2s=-UIC31F$J_A~#}ga(OgkX>?{}Z*F8_XJ>YFc5ZfeZ)afu0000000Pgm zaY!a25Gr9Vino=&c#in_0Jdg1rIUe_*${~Oty({yV$3R26w!!SyD+nmYuW)4brxA& zTn*4d-Uqb9ZPpNJ0qT=sZdtRhmq!5*lcw30NyXyAIH_xfcweVhvn+3-0h8fx>jEiu QlkssBlOURgvoD-IQ~iZUasU7T delta 98 zcmV-o0GXTt^S+lQ~M*)+cwGgu`Z=wOSADM>%voD-I EQ}nDU4gdfE diff --git a/Client/.gradle/5.2.1/executionHistory/executionHistory.lock b/Client/.gradle/5.2.1/executionHistory/executionHistory.lock index 962048073461197a1bac80d5cfe1d1c8187690e7..cb37681cd609582e6dc043a6252e824c38fdc3ea 100644 GIT binary patch literal 17 UcmZRU+&BHU`f0tH3=ohC05Wz2YXATM literal 17 UcmZRU+&BHU`f0tH3=rT405V?$Q~&?~ diff --git a/Client/.gradle/5.2.1/fileHashes/fileHashes.bin b/Client/.gradle/5.2.1/fileHashes/fileHashes.bin index 3e8590b0bc3231d64f6daaf1b7755e0be025da55..879989b2353e0d97ccab378cbdaa64e3a8ccd45a 100644 GIT binary patch delta 350 zcmZ2Kjq&Jo#tkMCnnK%`NXx6AmoH@i125D6P;mVIv9(`T1;#R^o&}RR8)49W|fFP{GNQWhJ{A4{lWaA->TdLQKyXD6R>_iXbeYm8jRX zed_*-z8^mswxwAvWnf^;RGAy}1)`aye{#M@nMA2rWNZxY1*d!LTMp-56Uc-pIwiUJ zuZIRBi^|+nI-51U*cj_kjh@3Q-EG*Ez0SKO|AwH}7kRL*j?EJwMl(MI(rAvkzHG+2 zUNNcD@l|V>>>a}AgLO<@YX;H5YJ{mHP%X!Jo}GU3s_E`}_r(p?Z3k)opJp%#tkMCg8bW;NXx6AmoH@i125Cbu@VZCr%D`{oGaPPSh-R0hxkT=1!8)} zKxs`NRs>;zmwNtw(u|Q$Th=zJH*?$%W?*2<6f%}$2Ajda!ZA7DqfDaiYsJQnExHfC g^am$S;ug3GR^;?pee+)r4Mr9rr^g1HHNDsv0Wbn7YybcN diff --git a/Client/.gradle/5.2.1/fileHashes/fileHashes.lock b/Client/.gradle/5.2.1/fileHashes/fileHashes.lock index 04b45d5d412f56a20476141daade51752780e55d..5b2c181c4b63409fc767f463f5556d76a8a4a4bb 100644 GIT binary patch literal 17 UcmZSXvkX|cCH=f10|XQR05Bv3M*si- literal 17 UcmZSXvkX|cCH=f10|dkZ05A~*Gynhq diff --git a/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin b/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin index 8bdc592f0bb9a6e0460003cc8f4cdcec9fd8c2d3..dc515f185dae360e73b0b60cd7d1e1a8bd8730d9 100644 GIT binary patch delta 253 zcmeBK%J_E;;|3E6M!w0W5(W-4?3y#vV-Me90E3VX|Dj;X7PZc@jfz(x;z2zy@spF6 zW#!-a_yek5Y;vr`YsSQlia*3R8tf3;?C9amwOPfxk5OqNP(>#QPsvEl$;sDqEGWpy zOinDx%+FIX1nFj){4r2_vZ1#a3y{MI;s^p6(~NcM6nsQ lWAX(*k;%b6%8cv5tUulyLP&Nw=jWBAR+LPh=xNS)5&(ahUjG09 delta 33 pcmeynhOuWU;|3E6M()X`5(bmkN<3zi+^G0Ne4&B(W=9WiE&$R<3#0%5 diff --git a/Client/.gradle/5.2.1/javaCompile/javaCompile.lock b/Client/.gradle/5.2.1/javaCompile/javaCompile.lock index bdecd1a786bf6f2f0ddaf23b41e438f82e711534..9ef821e4be64f960f8cfea37701699e673465b91 100644 GIT binary patch literal 17 UcmZQ>`KI$i`q~yt1_*Ej065+Ru>b%7 literal 17 UcmZQ>`KI$i`q~yt1_&?#065VEqyPW_ diff --git a/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 7bb84c98e56f0a8803ca49350da0f88199478d31..2a3f2f8b105b26038bdac60ea4bf94df8cae568d 100644 GIT binary patch literal 17 UcmZS1Vq0$%^=`KU0|d+l04mi46951J literal 17 UcmZS1Vq0$%^=`KU0|e9p04lcw^#A|> diff --git a/Client/.idea/compiler.xml b/Client/.idea/compiler.xml new file mode 100644 index 0000000..3d94435 --- /dev/null +++ b/Client/.idea/compiler.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Client/.idea/modules.xml b/Client/.idea/modules.xml new file mode 100644 index 0000000..cde60df --- /dev/null +++ b/Client/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Client/.idea/uiDesigner.xml b/Client/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/Client/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/.idea/workspace.xml b/Client/.idea/workspace.xml index 213c721..8e8f505 100644 --- a/Client/.idea/workspace.xml +++ b/Client/.idea/workspace.xml @@ -11,27 +11,96 @@ - + - + @@ -321,15 +245,6 @@ - - - - - - - - - @@ -351,12 +266,21 @@ + + + + + + + + + - + - + @@ -365,17 +289,17 @@ - + - + - + - + @@ -428,50 +352,47 @@ - + - - - - - - - - - - - - - - - + + - - + + + + + - + - - + + + + + + + + + - - + + - - - - + + + + diff --git a/Client/build.gradle b/OOPP/Client/build.gradle similarity index 62% rename from Client/build.gradle rename to OOPP/Client/build.gradle index 9a17529..feb783b 100644 --- a/Client/build.gradle +++ b/OOPP/Client/build.gradle @@ -13,6 +13,28 @@ apply plugin: 'idea' apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' apply plugin: 'jacoco' +//apply plugin: 'checkstyle' +// +//checkstyle { +// version = '7.8.1' +// config = 'checkstyle/checkstyle.xml' as File +//} +// +//checkstyleMain { +// source ='src/main/java' +//} +// +//checkstyleTest { +// source ='src/test/java' +//} +// +//tasks.withType(Checkstyle) { +// reports { +// xml.enabled false +// html.enabled true +// html.stylesheet resources.text.fromFile('config/xsl/checkstyle-custom.xsl') +// } +//} sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -31,7 +53,11 @@ repositories { } dependencies { - compile("org.springframework.boot:spring-boot-starter-web") + compile("org.springframework.boot:spring-boot-starter") + compile("org.springframework:spring-web") + compile("com.fasterxml.jackson.core:jackson-databind") + testCompile("junit:junit") + compile project(':Common') testCompile('org.springframework.boot:spring-boot-starter-test') testCompile( 'junit:junit:4.12', diff --git a/Pictures Group Members/.gitkeep b/OOPP/Client/build/resources/main/application.properties similarity index 100% rename from Pictures Group Members/.gitkeep rename to OOPP/Client/build/resources/main/application.properties diff --git a/OOPP/Client/build/resources/main/fxml/dashboard.fxml b/OOPP/Client/build/resources/main/fxml/dashboard.fxml new file mode 100644 index 0000000..e40f1e1 --- /dev/null +++ b/OOPP/Client/build/resources/main/fxml/dashboard.fxml @@ -0,0 +1,6 @@ + + + + + + diff --git a/OOPP/Client/build/resources/main/fxml/sample.fxml b/OOPP/Client/build/resources/main/fxml/sample.fxml new file mode 100644 index 0000000..f0dc2db --- /dev/null +++ b/OOPP/Client/build/resources/main/fxml/sample.fxml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + +