From 1224c1c97d03cb054c2f9648ddaa07d2816812c3 Mon Sep 17 00:00:00 2001 From: David Westgate Date: Thu, 2 Jun 2016 22:50:01 -0700 Subject: [PATCH] clean up repo --- Task_Managment_application/.classpath | 1 + .../bin/Account_Module$1.class | Bin 1426 -> 1418 bytes .../bin/Account_Module$2.class | Bin 2063 -> 2053 bytes .../bin/Account_Module$User.class | Bin 1046 -> 1046 bytes .../bin/Account_Module.class | Bin 5617 -> 5526 bytes Task_Managment_application/bin/Main.class | Bin 1237 -> 1377 bytes .../bin/Manager_Module$1.class | Bin 1664 -> 1635 bytes .../bin/Manager_Module$2.class | Bin 1328 -> 1328 bytes .../bin/Manager_Module$3.class | Bin 1832 -> 1832 bytes .../Manager_Module$Direction_Button$1.class | Bin 2333 -> 2333 bytes .../bin/Manager_Module$Direction_Button.class | Bin 1113 -> 1113 bytes .../bin/Manager_Module$Task_Container.class | Bin 2871 -> 3171 bytes .../bin/Manager_Module.class | Bin 6185 -> 5935 bytes Task_Managment_application/david_data.txt | 3 - Task_Managment_application/rohane_data.txt | 0 .../src/Account_Module.java | 25 +++++--- Task_Managment_application/src/Main.java | 13 +++- .../src/Manager_Module.java | 59 +++++++++--------- Task_Managment_application/user_data.txt | 2 - tma_westgate.jar | Bin 47976 -> 0 bytes 20 files changed, 58 insertions(+), 45 deletions(-) delete mode 100644 Task_Managment_application/david_data.txt delete mode 100644 Task_Managment_application/rohane_data.txt delete mode 100644 Task_Managment_application/user_data.txt delete mode 100644 tma_westgate.jar diff --git a/Task_Managment_application/.classpath b/Task_Managment_application/.classpath index 144797c..9784fe3 100644 --- a/Task_Managment_application/.classpath +++ b/Task_Managment_application/.classpath @@ -6,5 +6,6 @@ + diff --git a/Task_Managment_application/bin/Account_Module$1.class b/Task_Managment_application/bin/Account_Module$1.class index d03284f300f1a6a4e7191b0d971ad64d4ec0c451..39e9205e6f4d614992881c61f5574b3a8d0c45dc 100644 GIT binary patch delta 68 zcmbQl-Nn73nMqV2F(oCwv^cdWz9c_BC$qSOkwIN!^8%(fjEwPc8d$G-PnVvH;hEHx~v0~gY`2dTuU>t)OLp*~d SLjr>oLo$OLL)zpoEYko@`4OrB diff --git a/Task_Managment_application/bin/Account_Module$2.class b/Task_Managment_application/bin/Account_Module$2.class index 4fd2937a1119f5b63ea103c20d2bd23c4db041dd..fa84611ef54082fe6a845e81be30b29c97e3e96e 100644 GIT binary patch delta 475 zcmXYsT~8BH5Qd+#MUO12G;P&H6j!PgE42!W;s;PfF~k}oA*S4zO}lAo>XwwPiP6Nb z7y~gO>AB+0J8zAW#e^T^B|iW!oK;TFnVCF!XU@Ev$xq4eztuu7E<>7giesf}wbcp2 zXXRF{)ASv(oL3y0yFa@;uTU$!3^St1DU#2`D3{gql*4g zC}=hGYi_euZv-}%xuPj5(*ODzt>R+45rj)&+xMjPDr4qJV(5s?H6}FI&7R68ZgA5a zx3Y(C#pt$~vT_41cO9mfRyf}OA0EZy6}b`f)fyhul*B~Y3%t7DJ}_Z3!##(ijQ#8; z_N=#UP5}-|Vuk@uOIDm=P-4H74w@ceo%}Y*ZO(4d_k#b$V)|xOUgt{M%>wA ze3zNZ0pDS^9LwiKzRQEkXoiP!cUXA*i*g~Nt8GVSreje>MCOEc3$ID>hCJ_>iyrkB$$Cs~t?ZE+C0lJghFcV;gD delta 380 zcmXZYODjZi7{~GN{~YF+V`4%mX@+r|<1+4d#)y=fQj*wcnweZWX4E+|E(?*6mH4kL zya%_2@vExiT*Q=WSI)u-R$>A4Kv2A_UJg-MuJgBJO$Mf3=5@=J^OIy~yU*E_8! z-3FGRDv?g-3psZyna>pLY=9nm1r@1uI_o%X1A?);-+H;Ew~YFU5)06e!t#a1`L!j1 z*z_~Rh{3QRxR)xXVs6 zHR`j(<+au-cl2fvf4$OwHL)j)zR(EFMi$f+jBEc~$oUqO*o1Bs19GeRc fxWeT|t{d@kKV?=-J{oJaQ5ta6Z6@juD%Jb}S3Xll diff --git a/Task_Managment_application/bin/Account_Module$User.class b/Task_Managment_application/bin/Account_Module$User.class index 020e868412da6331b1c2a79ac044141b238b8147..3797e7196afa738158f2429fef49a61453b9d158 100644 GIT binary patch delta 79 zcmbQnF^ywGJQJrH11p0n11E#VHD#V4<3HehuC@*IIYGXNwA4+{VQ delta 79 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 Ljo(H}Er#d+(15W~ literal 5617 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 avYtY-q>**Q20W*8LSdhfz;gx%@Zvu(@d{7? literal 1237 zcmZuwX;0Kp6g>|*be6IWt0=PTEWo%RE-X4CewraBOh||y$fMMuI<%zIQR0vAx40x= zB>DsVQO5JyLWhKYc<o2xwJlJ32Ih+wbK^`R=47kB=L+ zDSg{@O6AxVNHl#}w*&?&QD)$mwpDaRplj83Y=2##Gnd~X@P>O}rO}Cu0Ub$!-iqy5 zTdkvg%d5%#27$5_*OZMN>DkJUf|`G5H;GnJ#0aY$aTgfQy$#Bi8q%q=re{0#mHdv5 z0f9cnr~OA70z(Fd(NCa;Y&qs3fuvU_@W3@VVQ-!?{JlUS9n%6mWz%$9j=xuR4_XZhGlh(fIf`&0rfE4=XblH7vem4;&i zgiqoji`QiH!(>%D1okG|E`uum$iOllhhR0^R|6di$+nLoV*1p;GsQ@29=e}MOh#%P zxd)tI<*GQGdiO;_Q?Y8lb8Rdsa{WSNbwl#k%`U~6yflzN7iYNbwmj2%Z7Z@Vb-@;u z`kV!CEguClR3fbeZQfe0DS9RDLPZN_NPnZz0fTE-7(_R1BeHwYOD}~!^fRIkFLPIi zlbyej{fWW&e402w1{%x87)gv^lyQL@7-Pmw+8VuE0ooT5)fg!hil?}Jj;Y-<%v8@Y zyE}h|J6jCqiwmb%EM^~^Vu|jPxZX4y0+}Vqts7asj{#N~!~}*gM=#Hcibo-=fUpVlg3PNY&cB1B$S8<32X#qUi}AEQS&_j diff --git a/Task_Managment_application/bin/Manager_Module$1.class b/Task_Managment_application/bin/Manager_Module$1.class index 13b5c669f9540885365afdb903bd8b75abc36e45..df5db38254721e85e47039274fe35eba747b9637 100644 GIT binary patch delta 392 zcmX9&NlOB89DTFss2C1XVYUcHffHecR?}{~EoN!arNbZ=6_l7om$2_JAEL7q5*{Mx z*0ECy6tvK{sNPI}_^t2#-us`|eRw_hKeZbGF>F*kccLqTxEK8xFu%oir;cF-L#8SP z;v)zM@D+-?2c=BO$n9r~MlSEc7$y{q3-Iq5C&u<^^r&R);LG23lRg6|3pc!FwK!=1TQp0dD zKQcc-#WT@Y?%vRecWC%TFTM~YL;Dvd-ol9%n8Xy-TtucZL*q^|W-&+IdE$*Ii@)@d z6bK5E3PM)ZWi^3TEb`DtQiNwBt6S^3MY4*e3J1~tmy;AQEN_bD|x?fT5?SP}&b&HBFXQ8_*)KpE<4^>Qxutb=k$W-aBQ2jOIIi|9* psD*4rf*>#Nokw(L3ezleg+9+h;Wx-4OEP(d5``%vMC9@^`~etoMg9N) diff --git a/Task_Managment_application/bin/Manager_Module$2.class b/Task_Managment_application/bin/Manager_Module$2.class index 1a0dd7ea6d9744c119fcb5e440b9070c6fa59f4a..51e59e726faebb34dd6e4c8f37a1880716783d00 100644 GIT binary patch delta 27 jcmdnMwSjAcH4Ed5$u=y>obMQf7~V5zGklo5f~5lhfg%ZA delta 27 jcmdnMwSjAcH4Edz$u=y>oX;7A7+x@FGrXLWpalW*lc5ExCHMdn0QvwV0Q&$n0Q>+<0RI3}0RRA20RaG40R#YB N0S5qU0Sc3G2Dk2R4*>uG delta 55 zcmV-70LcHS4yX>WpalW!lc5ExCGh|g0P_GO0Q3Mg0QCS&0Qdk?0Qmq`0Qvw|0Q~@4 N0RRAN0Rxk92Dcfs5wQRO diff --git a/Task_Managment_application/bin/Manager_Module$Direction_Button$1.class b/Task_Managment_application/bin/Manager_Module$Direction_Button$1.class index b451dacd1abef6f5921561b5250e2f316a74dd3c..0c304537a48b3f020230228b31188f1103913270 100644 GIT binary patch delta 63 zcmbO$G*@UtB|D?$Xd45kc`3>FLt43-SZ T3|0)O47Lne3{H~+InDq8j~)x{ delta 63 zcmbO$G*@UtB|D?W=Q-!uU90`QF7V** zpEm$>;k(;`Ka@&81P*BMBcP&Fpx!>9)K=?LMmm5F)XL>)4c&;^NmskC13em^$3c75 zRp0%Bh8M9{Aec0)!)H_JM9wf(^a(sNt1s#^OOgDvVH%O)Ou`7FA1|pmBCyY{5c@nD zj^bsz%KbyZk5>^>aYCSCNH_JQk((UKBo@+!hEa?Oc>0g@jU5#b6MmdTT*bIRrNob< zbu$@>ozGjwyoL#!5^!Y}EP>s}oNy`=8OfzgD`w>keZEJ<>jICKC0Yz7`w9!>ZRC8I z6!4Ae`MFRk9}3_!bPbh=%G0!l1PlSMp3NF&LZCfds!$@};PkZo@2ana+#?~98qOlc z3RZ@6SXZDX?4;OnZ^fYi<}j}!El|A!bqyw>0%}%vlQyN4Sq-j zKnRwG1uWWsDqRHux5a)0cEv1xdTvP1j_Ols_7Th(^O;3sQbr}%TN>WRI|QSR5^SKn zm*Z2j#f^J`#{5o_=ueHsSD)b z3bzc}Ah=JLMhn_2UZ-U*ao!!<)39RVVx#@W9Pc9k*B2=EDBFh}=U*d<{(Y>1GTzj-jtmJ(uJW;nyyWU~xK=qW&#-HB{k>`0{vDzQzmq0G>2=W(?1#TfI zNl|^rRd<=I*C^#Oldq$m9m!4|Qwto%tubrhsLJ-gX0RlKyxGN@O`q#|T-hGG-c1r- qNh0!a;^m+MH(AeqSce*KmGL^mEM2+<)NuO-t4xr_3I3741^xw|u_C?z delta 1201 zcmZuvSx*yD6#iz0PRn#^2!T?|nxKT$B2YIdDxfT~NkIe!9H5q^6etB;(26l`iTZG# z^vx#|ObjGgQjJC*^nt`Te}IXJiT^>xb7!C+@#QY(-tYU)`Of+7ShFkZf8M+YP=VVk z$`4Udkb_bc2T{g;nksCG5Ky5a5sDdy*l#i0=7wE?8%I?fLnSMaN-S<1S8)O-S-<2= zt5s2lOaWHEFI+n^8W;}wf@Yj%Pb9nCfF?5<*-I%;I)i5RRa#Q4Xh4^WbLeItOIMWPjcIe5E1(7aE^jzA8uTmZho)i>-2!Ca z^sE+`;izF1KJ-z@VB;abiV=*mW!Yi#hP9#b7Hz6i8w~i^C;4+~N`67}Zt6<*z}#kO zz`TkpxXQkn{V8VL60oO53u=B}XrN_sc$V<>mfplKFd>1=9AZnByvQnY3s;d9g{!dm zHOk+@-LrP2*~5Q~TwTFao)+D6Q+ z)P{B>;Vjb8f&K8J6rI$HE_lem8g!!(z2re3{RDC%kZ2nsXglrvL|r6O5AukjgI)!q zsH8QSUcK}p(w@dsE{dU(lHmDlRTvtkZdCQj%^`7RQU%8cQNAs^4OiDyYEim1XE0YwCe!~*FTOhUd$FB8b5D5n;Q zklW2Ft5v~`q_k3!*~Icn2NJZvkk>DwhdYM2eO3-QN~7FcIuVy z)?559I7}n6mGmrIv^pbm0-nLjjU%I7yp;*MYsvbs-X+)WQE~U-#6z9YXlHudsB~&J zuj(2hjp}&BMiFip&5@Ii*W-<@CV4(ea$ymT{R;U{S6(uoKHw4QJ>H=s$8}_VLU}_L R=%0uixT&M~97V7Q`~|QCzmWg{ diff --git a/Task_Managment_application/bin/Manager_Module.class b/Task_Managment_application/bin/Manager_Module.class index e2fe42dca5cefda6bb5b0fb55edc7d504eda5bbf..7cfa4ede4ba4d31737f07bc6589c6779b2f5954d 100644 GIT binary patch delta 2270 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 b#bePdt`wX#ZeyonMxkfBtOn&F*a7?ptpO;k diff --git a/Task_Managment_application/david_data.txt b/Task_Managment_application/david_data.txt deleted file mode 100644 index 387cec0..0000000 --- a/Task_Managment_application/david_data.txt +++ /dev/null @@ -1,3 +0,0 @@ -,s -,Enter task here -hellworld,Enter task here,rhdrh \ No newline at end of file diff --git a/Task_Managment_application/rohane_data.txt b/Task_Managment_application/rohane_data.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Task_Managment_application/src/Account_Module.java b/Task_Managment_application/src/Account_Module.java index 5d95c00..b215c78 100644 --- a/Task_Managment_application/src/Account_Module.java +++ b/Task_Managment_application/src/Account_Module.java @@ -21,7 +21,15 @@ import javafx.geometry.Insets; public class Account_Module extends VBox { - private class User + Manager_Module mm; //for junit test + + + public Manager_Module get_new_manager_module(String name) //for junit + { + return new Manager_Module(name); + } + + private class User //"struct" for users { private String username; private String password; @@ -112,10 +120,11 @@ public class Account_Module extends VBox { try { + if(DEBUG)System.out.println("Attempted login"); if (attemptLogin(usernameField.getText(), passwordField.getText())) { - if(DEBUG)System.out.println("Attempted login"); + Manager_Module hbox = new Manager_Module(usernameField.getText()); System.out.println("LOGIN SUCCESS"); Scene mod_scene = new Scene(hbox, 600, 600); @@ -137,7 +146,7 @@ public class Account_Module extends VBox } }); - // if(this.getScene() != null) + HBox buttonContainer = new HBox(); @@ -152,7 +161,7 @@ public class Account_Module extends VBox } - private boolean add_user_to_list(String username, String password) throws IOException + public boolean add_user_to_list(String username, String password) throws IOException { User user = new User(username, password); refresh_user_list(); @@ -171,6 +180,7 @@ public class Account_Module extends VBox { if (DEBUG) System.out.println("user name already exists, not adding"); + return false; } } @@ -183,7 +193,7 @@ public class Account_Module extends VBox return true; } - private boolean attemptLogin(String username, String password) throws IOException + public boolean attemptLogin(String username, String password) throws IOException { refresh_user_list(); for (int i = 0; i < user_list.size(); ++i) @@ -254,10 +264,7 @@ public class Account_Module extends VBox BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(FILE)); for (int i = 0; i < user_list.size(); ++i) { - if (DEBUG) - System.out.println("size is " + i); - if (DEBUG) - debug_print_list(); + if (i != 0) { bufferedWriter.write('\n'); diff --git a/Task_Managment_application/src/Main.java b/Task_Managment_application/src/Main.java index 97913e7..0f87a64 100644 --- a/Task_Managment_application/src/Main.java +++ b/Task_Managment_application/src/Main.java @@ -2,9 +2,16 @@ import javafx.application.Application; import javafx.scene.Scene; import javafx.stage.Stage; -public class Main extends Application +public class Main extends Application //basis for application { private static Stage stage; + Account_Module Test_am; //junit + + public Account_Module get_account_module() //for junit + { + return Test_am; + } + public static void main(String [] args) { launch(); @@ -15,6 +22,7 @@ public class Main extends Application { set_stage(stage); Account_Module account_mod = new Account_Module(); + Test_am = account_mod; Scene account_scene = new Scene(account_mod); stage.sizeToScene(); stage.setScene(account_scene); @@ -22,6 +30,9 @@ public class Main extends Application stage.show(); + + + } public static Stage get_stage() diff --git a/Task_Managment_application/src/Manager_Module.java b/Task_Managment_application/src/Manager_Module.java index 8c68d25..e0ed765 100644 --- a/Task_Managment_application/src/Manager_Module.java +++ b/Task_Managment_application/src/Manager_Module.java @@ -7,6 +7,7 @@ import java.io.FileWriter; import java.io.IOException; import java.util.LinkedList; +import javafx.beans.Observable; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.event.ActionEvent; @@ -68,7 +69,7 @@ public class Manager_Module extends HBox } } - class Task_Container extends VBox + class Task_Container extends VBox //container visual and data structure for task items { ListView task_view; @@ -77,11 +78,14 @@ public class Manager_Module extends HBox Task_Container(String title) { + task_list = FXCollections.observableArrayList(); + task_view = new ListView(); task_view.setOrientation(Orientation.VERTICAL); - task_view.setItems(task_list); + this.title = title; + Label title_label = new Label(); title_label.setText(title); title_label.setPrefWidth(100); @@ -95,6 +99,7 @@ public class Manager_Module extends HBox public void add_task(String task) { + if(DEBUG)System.out.println("Task is " +task); task_list.add(task); task_view.setItems(task_list); @@ -155,6 +160,10 @@ public class Manager_Module extends HBox public Manager_Module(String username) { + todo_container = new Task_Container("To Do"); + doing_container = new Task_Container("In Progress"); + done_container = new Task_Container("Done"); + DEBUG = true; FILE = new File(username + "_data.txt"); @@ -164,9 +173,7 @@ public class Manager_Module extends HBox this.setSpacing(11); this.setMinSize(500, 500); - todo_container = new Task_Container("To Do"); - doing_container = new Task_Container("In Progress"); - done_container = new Task_Container("Done"); + Button add_task_button = new Button(); Button remove_task_button = new Button(); @@ -209,7 +216,7 @@ public class Manager_Module extends HBox String next_task = new String(); next_task = task_textfield.getText(); todo_container.add_task(next_task); - task_textfield.clear(); + try { save(); @@ -280,55 +287,47 @@ public class Manager_Module extends HBox return; } BufferedReader bufferedReader = new BufferedReader(new FileReader(FILE)); - ObservableList temp_list = FXCollections.observableArrayList(); + String line = bufferedReader.readLine(); String[] task_desc = null; - if(line != null) + if(line != null && !line.isEmpty()) { task_desc = line.split(","); for(int i = 0; i < task_desc.length; ++i) { - temp_list.add(task_desc[i]); + todo_container.add_task(task_desc[i]); } - todo_container.set_task_list(temp_list); + } - else - { - todo_container.set_task_list(null); - } - temp_list = FXCollections.observableArrayList(); + + line = bufferedReader.readLine(); task_desc = null; - if(line != null) + if(line != null && !line.isEmpty()) { task_desc = line.split(","); for(int i = 0; i < task_desc.length; ++i) { - temp_list.add(task_desc[i]); + + doing_container.add_task(task_desc[i]); } - doing_container.set_task_list(temp_list); + } - else - { - doing_container.set_task_list(null); - } - temp_list = FXCollections.observableArrayList(); + + line = bufferedReader.readLine(); task_desc = null; - if(line != null) + if(line != null && !line.isEmpty()) { task_desc = line.split(","); for(int i = 0; i < task_desc.length; ++i) { - temp_list.add(task_desc[i]); + done_container.add_task(task_desc[i]); } - done_container.set_task_list(temp_list); - } - else - { - done_container.set_task_list(null); + } + bufferedReader.close(); } diff --git a/Task_Managment_application/user_data.txt b/Task_Managment_application/user_data.txt deleted file mode 100644 index 983647a..0000000 --- a/Task_Managment_application/user_data.txt +++ /dev/null @@ -1,2 +0,0 @@ -david,w -rohane,rohane \ No newline at end of file diff --git a/tma_westgate.jar b/tma_westgate.jar deleted file mode 100644 index 3684268c70a281c737ef7c4a0bd8268e782e4740..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47976 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