From ed15cb7317af8e37b9b33a9bf7a95684a0279de2 Mon Sep 17 00:00:00 2001 From: Dilini Peiris Date: Fri, 12 Jan 2018 00:25:55 +0530 Subject: [PATCH 1/2] created testing package included the class to compare 2 files line by line --- .idea/deployment.xml | 14 + .idea/php.xml | 8 + .idea/workspace.xml | 1323 +++++++++++++---- Server/src/lk/ijse/vcs/testing/Compare.java | 88 ++ Server/src/lk/ijse/vcs/testing/Demo1.java | 7 + Server/src/lk/ijse/vcs/testing/Demo2.java | 7 + Server/src/lk/ijse/vcs/testing/changes.txt | 0 .../Client/lk/ijse/vcs/assets/assets | 0 .../Client/lk/ijse/vcs/controller/controller | 0 out/production/Client/lk/ijse/vcs/proxy/proxy | 0 .../Client/lk/ijse/vcs/view/Dashboard.fxml | 223 +++ .../Client/lk/ijse/vcs/view/Repositories.fxml | 45 + out/production/Common/lk/ijse/vcs/dto/dto | 0 .../Common/lk/ijse/vcs/service/service | 0 .../Server/lk/ijse/vcs/business/business | 0 .../Server/lk/ijse/vcs/entity/Branches.class | Bin 0 -> 778 bytes .../Server/lk/ijse/vcs/entity/Commits.class | Bin 0 -> 699 bytes .../Server/lk/ijse/vcs/entity/Files.class | Bin 0 -> 644 bytes .../lk/ijse/vcs/entity/Organizations.class | Bin 0 -> 1903 bytes .../lk/ijse/vcs/entity/Repositories.class | Bin 0 -> 979 bytes .../Server/lk/ijse/vcs/entity/SuperID.class | Bin 0 -> 842 bytes .../Server/lk/ijse/vcs/entity/Users.class | Bin 0 -> 1845 bytes .../Server/lk/ijse/vcs/repository/repository | 0 .../Server/lk/ijse/vcs/resources/resources | 0 .../Server/lk/ijse/vcs/service/service | 0 .../Server/lk/ijse/vcs/testing/Compare.class | Bin 0 -> 3319 bytes .../Server/lk/ijse/vcs/testing/Demo.class | Bin 0 -> 544 bytes .../Server/lk/ijse/vcs/testing/Demo1.class | Bin 0 -> 398 bytes .../Server/lk/ijse/vcs/testing/changes.txt | 0 29 files changed, 1414 insertions(+), 301 deletions(-) create mode 100644 .idea/deployment.xml create mode 100644 .idea/php.xml create mode 100644 Server/src/lk/ijse/vcs/testing/Compare.java create mode 100644 Server/src/lk/ijse/vcs/testing/Demo1.java create mode 100644 Server/src/lk/ijse/vcs/testing/Demo2.java create mode 100644 Server/src/lk/ijse/vcs/testing/changes.txt create mode 100644 out/production/Client/lk/ijse/vcs/assets/assets create mode 100644 out/production/Client/lk/ijse/vcs/controller/controller create mode 100644 out/production/Client/lk/ijse/vcs/proxy/proxy create mode 100644 out/production/Client/lk/ijse/vcs/view/Dashboard.fxml create mode 100644 out/production/Client/lk/ijse/vcs/view/Repositories.fxml create mode 100644 out/production/Common/lk/ijse/vcs/dto/dto create mode 100644 out/production/Common/lk/ijse/vcs/service/service create mode 100644 out/production/Server/lk/ijse/vcs/business/business create mode 100644 out/production/Server/lk/ijse/vcs/entity/Branches.class create mode 100644 out/production/Server/lk/ijse/vcs/entity/Commits.class create mode 100644 out/production/Server/lk/ijse/vcs/entity/Files.class create mode 100644 out/production/Server/lk/ijse/vcs/entity/Organizations.class create mode 100644 out/production/Server/lk/ijse/vcs/entity/Repositories.class create mode 100644 out/production/Server/lk/ijse/vcs/entity/SuperID.class create mode 100644 out/production/Server/lk/ijse/vcs/entity/Users.class create mode 100644 out/production/Server/lk/ijse/vcs/repository/repository create mode 100644 out/production/Server/lk/ijse/vcs/resources/resources create mode 100644 out/production/Server/lk/ijse/vcs/service/service create mode 100644 out/production/Server/lk/ijse/vcs/testing/Compare.class create mode 100644 out/production/Server/lk/ijse/vcs/testing/Demo.class create mode 100644 out/production/Server/lk/ijse/vcs/testing/Demo1.class create mode 100644 out/production/Server/lk/ijse/vcs/testing/changes.txt diff --git a/.idea/deployment.xml b/.idea/deployment.xml new file mode 100644 index 0000000..084a0a0 --- /dev/null +++ b/.idea/deployment.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000..e43a64f --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4a11aca..3ddff80 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,18 +1,7 @@ - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + @@ -78,11 +26,9 @@ - + - - - + @@ -90,18 +36,18 @@ - - + + - + - - + + @@ -109,32 +55,65 @@ - - + + + + + + + + + + + + + + + - - - - - + + + - - + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173,6 +152,9 @@ @@ -182,12 +164,15 @@ true DEFINITION_ORDER + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -628,29 +395,6 @@ - - - - - @@ -797,36 +541,6 @@ - - - - - - - - - - - - - - - - - @@ -864,19 +578,6 @@ - - - - - + - - @@ -1090,29 +750,31 @@ - + + - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1185,21 +891,20 @@ + + + - - - - @@ -1271,7 +976,6 @@ - @@ -1383,7 +1087,6 @@ - @@ -1399,13 +1102,12 @@ - - + @@ -1421,7 +1123,7 @@ - + @@ -1429,7 +1131,7 @@ - + @@ -1437,7 +1139,7 @@ - + @@ -1456,14 +1158,8 @@ - - - - - - - - + + @@ -1472,18 +1168,10 @@ - - - - - - - - - - + + diff --git a/Server/src/lk/ijse/vcs/testing/Compare.java b/Server/src/lk/ijse/vcs/testing/Compare.java index fc26cc5..0a17e1e 100644 --- a/Server/src/lk/ijse/vcs/testing/Compare.java +++ b/Server/src/lk/ijse/vcs/testing/Compare.java @@ -26,10 +26,17 @@ public static void main(String[] args) { try { File changes = new File("src/lk/ijse/vcs/testing/changes.txt"); + changes.getParentFile().mkdirs(); changes.createNewFile(); +// changes=changes.getAbsoluteFile(); - BufferedReader earlierFileBufRdr = new BufferedReader(new FileReader(new File("src/lk/ijse/vcs/testing/Demo1.java"))); - BufferedReader newFileBufRdr = new BufferedReader(new FileReader(new File("src/lk/ijse/vcs/testing/Demo2.java"))); + /*Used the following to check how File functions + File demo1=new File("Server/src/lk/ijse/vcs/testing/Demo1.java"); + System.out.println(demo1.getAbsolutePath()); + System.out.println(demo1.exists());*/ + + BufferedReader earlierFileBufRdr = new BufferedReader(new FileReader(new File("Server/src/lk/ijse/vcs/testing/Demo1.java"))); + BufferedReader newFileBufRdr = new BufferedReader(new FileReader(new File("Server/src/lk/ijse/vcs/testing/Demo2.java"))); BufferedWriter resultFileBufWrtr = new BufferedWriter(new FileWriter(changes)); LineNumberReader earlierLine = new LineNumberReader(earlierFileBufRdr); diff --git a/Server/src/lk/ijse/vcs/testing/changes.txt b/Server/src/lk/ijse/vcs/testing/changes.txt deleted file mode 100644 index e69de29..0000000 diff --git a/out/production/Server/lk/ijse/vcs/testing/Compare.class b/out/production/Server/lk/ijse/vcs/testing/Compare.class index 112724711ddcb181eff5281cbb0283d9a4b03960..e20a652bb902f511b6f3ede6c4f0e9d93256247a 100644 GIT binary patch delta 1828 zcmaKsX>b%(5XXNnd(7-)a*&XOkpLmc5s-v4#BfF+TuBU9VgiT(7Fe#p5(u6Pf_FS% z6%8IBDp8Ecj&y|nW`mdIU_nw?vuihm7YB<&tAYx9 zV(sd+HQ`|HikgizHU-=q-Rc>YS-@VKS9sOtHTKywu}_gRI~d*=4Ch6E@nmNkyl(Rb z`)%H&+2Adk13Khw?R|iQiu7n+Tzd3^C#|bSJ*36qYcR6CvpfYHiPn32q#mW&<{ez& zXcOa@A|raxpV3=^&2dg>(V~b81Z>{bzQ=jbrc$VW>rIdT>2=~y+Pu#xn-4e^&GBWK zA9C8}BXOAN%kTcNO{?bEX7dT38l18DjI%bM^F?&8uW0}Itld-sLrW~{^~1@R{PtIgpK(sb(plN{>7nm;YAikzci@#E4qq4(nin;VKfty?` zm-tT2c1dUM7tDE;r;`j@gFk1X@+5Ba=(_Mus^Oo>>*6M@mnZUXEWJU9wUl zz4giz;gaprr_zyxZft6Ab^?X*op81%U)cAR*nWkHPJAmHI_*gU9^V1pPtv@K-e2P- zx(v7q8Sl+cXrjnTOiMaOj>|wf;;M5`H$tzpBuzw0*h|A*$D=c?_@?%Tw1iz0UmGZK zQsAr1J32F#MYB&?sI3}q@ zOjgS%R%@85)-g?OWV+hL47HmQb(}JFiaF{ub5$D^>MWJ&JoAKpmHL`$b&&-fE#6EQ z!Cy`hw-8B^D{ zkq8S*jx422D%M*a9(f_ne} delta 1627 zcmZ{kYfx2H6vuy?``G6m4oKhyPoUrG{rm-BIu~rF(WY5v5wS_*5hK=X9@Vs4bl7Mfv+>huu|e~=W}{7pF*$T;HrZs+ zY5d(r+icTAuV#x)kT#30W_-ekZ5G?j_@n_oWv>9q!{8p{bhSDn4j8(F+ z)Lw-6Ce2=1QjiLJ#m3(5wn$xjXGGyF*tnsqwL3DkqjgKGLnYH=$2>FAE7|ApE`5sJ zSW{YVY?(LcQH+ai_ZH+-{1dz10Nxw6FZWb(Aojg?bk;!*IlRvYvZTXdj>N8c3qwaa z=5Uk`6={Kh!*LUHlzxY0OjqQX)ysQ(+B?f@ySrPr)wgf%(R}1^f|IcZpPTcs!zb+1 zoN_qL8HZ0L?IvH5HNc?5Ss~r$tIGe(;d2gY;tmPUX})kcPtxH_zKZ?gtIcWajBw9W( zTVhTSh$gTbZgHd!JH+0Y#F5~Pa7lv91S3M;Bw69o1h<8JMk_O#zcfyENS7IDx&Amg zRRLFD!g8&PD&N(v6=!50(_8@u!wGV;^WuzheG(YQ&5qt~W?Dp?{5S>8t~bu;{-IN@ z6|#rZrF*KJBx3|y7|L+%i}VcJGbOp5NL8%rnWcU z^#{}AOzFRVS;|%{>7&JF!zKNUtk0I|)N_;%a;K8>su(Z_td6S_l;Xu4|7l7@7GN`4 z4!Dp>6j8%inix+D6IjP&I+#Ki#cY+>9fI6N8G}rfPA!)%t>A+6+t<=*-$<`rp(@G` z(oI*Ti+*O7@)A;-*~+F`1(~a6QKRNEPc3A=TFe4f&qCG3BGpTs+QSmHmqyjcQgx6f zb(m%9IID#23U!i|>O9SW89jcT?5~%4?6R8tTt~yo7Vo4LgRtH$Z-BO`RD#|_FEB{Z8T2H-b9wD=u1{$Sm zEkb#z)W^p;y$_v*i&^#conmI%+ng1E~cZ7+O+CB)^n5q6?&YvtEB2e+a$%o{K1rRpkp)8@+ JDumK__%A6ELdO6A diff --git a/out/production/Server/lk/ijse/vcs/testing/changes.txt b/out/production/Server/lk/ijse/vcs/testing/changes.txt deleted file mode 100644 index e69de29..0000000