From 3ecb1a4749ee3a6648ac1f7d2639616993130419 Mon Sep 17 00:00:00 2001 From: Joe Hill Date: Sun, 23 Apr 2017 14:49:34 -0400 Subject: [PATCH] trying to pull --- bin/controller/Cashflow.class | Bin 2286 -> 2693 bytes bin/model/FinancialStatement.class | Bin 4498 -> 6352 bytes bin/view/FSWindow.class | Bin 7552 -> 7572 bytes src/controller/Cashflow.java | 18 ++++++++++++++++++ src/model/FinancialStatement.java | 3 --- src/view/FSWindow.java | 13 +++++++------ 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index e57c612d6a538afdf0ea50ce975543e4715354f6..17ef4fcbdad8d9166c3bb431e99b4dd093af0411 100644 GIT binary patch delta 1274 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 literal 4498 zcmb7`J#ZUE6vy8g$NI1=+lupnNkE1`BrrCFKp-{-Tak%C{=jk^5+KLww3aqG-D&Pt zj@44r(9luRrG^6;3#9QisQ2*no+fWRJ|-#Hr73RBuv?8!&3NJa?D+ zK64!dGUe|2&9HC5fRt$wzp+Aaoka~WN(RJC=2&hMTQSqe0k0!STSYN()pl17@P^%~$ZJWPEj%vUqa}G` zDU-XL*u7@D+l&e*35D=7V`hW+SA{{0>v)}u%wc>9#mF7BOMb_I;R2d41}|cMeZv(! z&-LOkZ@~H$$D_V$@6lQoP1IsG;po0B8nJ5A=EZC>QRz5nnJg7+vN*)uTj-_PEP9)A zn#CLU@i*v9CSev{PC*{d1sU~stZ)zSc0pt`US%gZRX`<9JkYr9)wj^pQLRgsy(fy%)$Gl|_;PzDN(m|6(m zRak1o9c~O3n+$esK3r~ubm+By!4U^pmL(^N-<4j`5qV4L#iDYw3J4=a57HH@e**NW z5JBdSt>7eK*4=6#QeGRZ2cj#Gyf2?Pg`6cWaW^R7$%@kLLqPyofW=29 zI0}LRZ)yw}Un>dk!g~=N4p;K7l2Fzle5WL=!FnWz!~O8R zlCYtn!;ebBrUv0>CE;M+BwW)V{G%jX*C0Gl5CQ4GqGil3;2OPALhW vXb`eW0?{CxQ4*>egq)IKX%J?WgqjB7oRUB_2p5!uT@Avbl28x+qig&Nyl3~P diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class index a99b9ee9acd71012a523a6c3c5cd9e721aeb7fc5..99b261e6ffe2db6b87b44fc63761501571c6af77 100644 GIT binary patch delta 1923 zcmZvdc}!GS6vn^vmV2KtA|k^$0!l%xCKzj*vJzONwNi1RS{K{}t3|D-btf&_YPCsiHEB$&NtZO~dGi>hrt{C-`F-E{?z!jAn^~B; zCUx&1(apdb0wmTFqNaOid*}8nnUi0X+jH<}@6-Zc7|QXn0}iY=XNaD|J|T!fMcMvB zpMi}8eYAJ3uOtlV*zCZk=u0qieWgKYppxJm$j*de{^HVHZ>}$4q<3DSuc*}WZ*`!` zyf5NYw-efBW#{?*1qnm_-lCSCoeor6nbDkSTP#O&h=E;ZZ|O??!ht=OsV$o_yv6@< z?Bnc=VqZ>vX#z_*EwgJJIAE@lu`eGYM2slS^A#ubn>*82RAL|JhyzEh)JRSZsv*(9 zar3rpuhltl!u(6d4n66>Da#qb&f&8PGxG8aa*BOL2I_ej&#KN4WR`a}4>mZiuN^pN zRfSncv$28mrq_rbe33_-RqD^45j0+M;Id_GZ5b^()>|-(hkupe$n?*7Ixhp)30j7~ zq|`touZDXIeKlu{*NDn%{%O@9oO~IG0rv@nUxb0~eCO3Qw<1?6WA!?y9yMxJmPd;+ zv$8z$d0;#bBE@qgCFVHFJ?xZGOQ26K12v_J)CCLhA4BUsA8dUMqln|@}~ zP}Vk^?yza7iO+4i+oqvT_S$s6O`o=N(8h@R-eOxs@;Tf?|q0*s$B(-fFl5 zH~f{kCOS26+IF6`6G9C)Fpc_%PY~+$f^GZ8&Wa0W#kpgxtawp}`8>`ttL6$HI_g?h zN=I3Tg&vh9Ytk(xb~V!*yd1z6z!lal=q>OwDmciBu*@Oq5mrG;r(hSI+#R_Kv)ozR ziZ3L|ooIa;AJc16bH%e;cnZY-?i9L!r?$}SLm;JVaKoO{PwmY_^s zfp^s{SfCzbPc0Uy4OpyR!+YvYEK?s~x%vnzG{XCu3m<6R@S&E5QJ2;>}!9gK#NI0=qxNuZ-#&OXD zfm)Gdea+FktCN=ALSVTj4*_vJzr8JC<5tJ|b z&~RpLXtiihBX|`_n?*Q{WVJ0_)4!up%%bRTeGk3Kt9FW^S5g+M(aI>@L!)U7oJynC zNMmUnVw8K@IeLpcaH*=coyN1;UaeJsqqkXg2h;}jE=^#$gZe-{NfTL))zZ}hn#6LP zHbk9FlUa?|rl^By3acHpdgVTOS?#1&D{O*tF<24J+?;M& zY2pDiMM(1kmVqL81CLAnjgiaeynJofk3m?{Tn$Rz^#Fdj@ytp)OqRZ_pDAny#AM4mDd1uE@&D7QJG9CVM`!oF}ac z{((Q2H28ga0)L}3mhG%nE81Ht+7V^eis9{8CRexI%sDR)9sE^R(m>IU*RoY9nOp5G zNtcgalHs`EE;FOcTvjjKL%A$umN3nJn$69Gq*(71v5tXq3Zo&cEkIt#AV<9Ut0?@D z*}jaPTeuJS|90|Uz%>sba2HWif~mWL{~0@bV% z8`vHR8?lMCp@wy03+qBHyNNpXBet?T*v9_Ec1^<$EeJccXzbD+MZGp24cct%)=DII zV~@5Hjamhow2j!SHDI517|q&Q?AN-{qWy+ePH5sP4skntY0Mh!lJy zGV!gLg*(BRkb; ze^aJZ`_m=uBu$YlnEur^(^MISD7v r@}xSLt7K3<^_zhq+)i)N0x3Vl9ma;}I#P_pm<0J}(eb;H7nATGoZ{*D diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index fde4514..631612b 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -41,6 +41,7 @@ public class Cashflow { while(!isWinner()) { + // TODO Play method // Get player whose turn it is // Display their financial statement @@ -51,6 +52,7 @@ public class Cashflow // Call tile's getLandedOn method // Update current/all players' financials // Increment player array (Also needs to wrap like tiles array) + } } @@ -76,6 +78,22 @@ public class Cashflow g.movePlayer(p1, 5); System.out.println(p1.getLocation()); + + FSWindow FSWindow = new FSWindow(); + FSWindow.prepareGUI(p1); + FSWindow.showButtonDemo(); + + + // Delay to check how the financial statement updates + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + FSWindow.prepareGUI(p2); + } diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java index c3f2d1d..d96f3e5 100644 --- a/src/model/FinancialStatement.java +++ b/src/model/FinancialStatement.java @@ -204,10 +204,7 @@ public class FinancialStatement { return _totalIncome; } - -<<<<<<< HEAD -======= //income getters public int getIncome() { diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java index c40270d..054490d 100644 --- a/src/view/FSWindow.java +++ b/src/view/FSWindow.java @@ -22,7 +22,7 @@ public class FSWindow { // FSWindow.prepareGUI(); // FSWindow.showButtonDemo(); // } - private void prepareGUI(Player p) + public void prepareGUI(Player p) { FinancialStatement currentFS = p.getFinancialStatement(); @@ -103,10 +103,10 @@ public class FSWindow { {"Interest/dividends", "0"}, //another table for real estate - {"Real Estate/Business",/**business of user*/}, - {"Real Estate/Business",/**business of user*/}, - {"Real Estate/Business",/**business of user*/}, - {"Real Estate/Business",/**business of user*/}, + {"Real Estate/Business",""/**business of user*/}, + {"Real Estate/Business",""/**business of user*/}, + {"Real Estate/Business",""/**business of user*/}, + {"Real Estate/Business",""/**business of user*/}, }; JTable incomeTable = new JTable(income, incomeColumns); @@ -238,7 +238,8 @@ public class FSWindow { panel.add(filler); return panel; } - private void showButtonDemo(){ + + public void showButtonDemo(){ mainFrame.setVisible(true); } }