From 52665039a414f28d920432ea0e49057e81047eb7 Mon Sep 17 00:00:00 2001 From: Joe Hill Date: Fri, 7 Apr 2017 14:11:10 -0400 Subject: [PATCH] Just changed the view class names --- bin/model/CharityTile.class | Bin 833 -> 887 bytes bin/model/ChildTile.class | Bin 651 -> 621 bytes bin/model/DealTile.class | Bin 2245 -> 1706 bytes bin/model/DoodadStack.class | Bin 4455 -> 4641 bytes bin/model/DoodadTile.class | Bin 1090 -> 1096 bytes bin/model/FinancialStatement.class | Bin 4635 -> 4631 bytes src/model/CharityTile.java | 5 ++-- src/model/ChildTile.java | 1 - src/model/DealTile.java | 4 +-- src/model/DoodadStack.java | 7 ++++- src/model/DoodadTile.java | 25 ++++++++---------- src/model/FinancialStatement.java | 7 ++--- ...harityCard.java => CharityCardWindow.java} | 10 +++---- .../{ChildCard.java => ChildCardWindow.java} | 6 ++--- .../{DealCard.java => DealCardWindow.java} | 10 +++---- ...{DoodadCard.java => DoodadCardWindow.java} | 8 +++--- ...DStockCard.java => SDStockCardWindow.java} | 10 +++---- 17 files changed, 47 insertions(+), 46 deletions(-) rename src/view/{CharityCard.java => CharityCardWindow.java} (91%) rename src/view/{ChildCard.java => ChildCardWindow.java} (93%) rename src/view/{DealCard.java => DealCardWindow.java} (93%) rename src/view/{DoodadCard.java => DoodadCardWindow.java} (92%) rename src/view/{SDStockCard.java => SDStockCardWindow.java} (91%) diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class index 8d5917cec7b051f6ecbf94b7cb1019fbaaca8ba0..80cfd9721fc1e82e383149e0fc449453f19e49c1 100644 GIT binary patch delta 320 zcmX@e_MMIE)W2Q(7#J8#7|b_vaWhV?Vl+<{Wsv4!kYSKzWZ+H7&r2*xbs4%DkRTQJEVA1f@44b^3 zQJqn7@^waKM%Br`8Fl3t(-;|~d~)+sQgig(GV>Dik~0%?f=hsw=ceYBOjc!DSl`OP z%D@bCs;2ff1`%H%AvKdhUK>cuu_bI{Py&hSY-3Ps7h%xOF7MmMpt}*Mn3;hKNQwcq zGBEH1Nnr*apzFkdP=i61fg32Q05KFO&I{xLjb|`mFl1l^s#ReyVlZZ40)`C(0|$d3 T;~xeMb_R8zlqpbviNOp2jT%1{ delta 295 zcmey)c94zh)W2Q(7#J8#7)&>EaWmHQrsU@(mZUmoBo<|sR5CI!YiLGsF^Doq^DxLT z$TBkUr>B-cC7tt2^Gd)fJV7etc^DKJ6oD#=(N(Z$cxr}$lqmBss4%E9GKc~Vam&n0 z%uCKp%n2?5+LxOOGD=2cvOc5iHjtKLOW4LB2V^LL@HPgub`b{c?DD>C47wYEN|_nBfTR!u3z%eQ5MdAmxff$?3=9k=3@RJBN*O0lVqEO)z`)4B1Qg@Y-o_xZjX`Q7kj=!v1tht^ n;(QG33<3ff$?3=9k=4C))XN*RT@7^E2#c^H%!WZ1uY_0`Ox~6Z0Va)v)ygB3)oW+ zCLX-*5AbN>jhK`~5;=MC=CAPTFEGw-F&sS1yfg1S&pb2peeiQc`SIuLHvk#DK2$!j z&cGXE-_T9Ns_Dy)V>>dE47n}K;Vs+T=T&XTZZzwr;nrSJy+W? zEX#Ja3fKPO6$J^5syL4^hG=r_to?@T)U8@BwaqYC*=rXq>dd`gLi&o1DG8GdYQwH_ zQ!klDn>#9Q;HIaC=0eld$U70E9R)L(lQ7HB-$NF-Vdf2|sv?UVgIwe8X5BS8!-Zt( ze`%k;pyDjCO-tu3svsSjJ+U2KQM;Yj?%8 z5AwToG_KGk@A>QA_areEUd5V(2i~X{6CPsSTNTruD@47w;s^HJ6T&|`83^d3`zyyt zl!vY#A$3AoA4bTB!N`vwMqUkK1#w)ZjA0xTM!TXh(rJY literal 2245 zcmZuyTUQ%Z6#fngoe+jQ6iTs%DoVJP7Suv*YXfMMn+>8=El!eCm@>?ylSv`os#br5 zzrbh9TCkR^<&#hTCUyCpnMp{X4|8(PK6~%)+n2NR_kVx<31Aw(XlM{<-E;ENnw*!0 zwQgEcLsTFh$kbV&ZL7FvSe8=Act&nl;NntnpQ)423AAiw&Fvb+?ojbwjg)H5TSd>w z?XJ0Ij{Zej;KD7_Hoe<)J-qbTcxp^qhP^$R@m$m1o=Yb;1fnU@j3a_J9nH`+bO?06 zj7A*o=u$e}0+He5Mib~&MQ8B#7zMG08g#``s^=b5*PRAnNXJ5)E zCBtHo>+n{yk7drAOFmG&me%nhJ`#u(%-n8@rR9?%X3%EpOx~hEVSQ~Wq}#55TWxKr z-e{_FQ6ndy*L!O5pWw1l@Ox0hC)LLqKzC$I<+Po1_T-xD6r}5w1qRQwRp?RmtItp6 zZ4;ksctE&-chG=3zQC7^olUxE+J>Do{Sm+}lQ!uMRKq-fJEvibmVvj`eOu=56Ka=q4SjVoqY30qlvv02% zWyMQf@fFzWszVtW#hpdV*-!0oq|oI<6jbv+Ic@&BS(E0piKB>;24eLE0i2Id$5ZU{ z{W9IBiSDl?`b@xl$SfusqjpqOTH}#Ge^`<8Fl>fqTkfAi^oFWu5$L;A$TPW_n#tN# z;Zsv;HRpcR(S$e?P4>P%n<(Ry+?-tWCw@z1luf9oh(Ve}_>U1mT#Zrg;%ZL%zx2c3 zMrv>CQd8+)9vK}tM(YXMH;>VIh@KPla(C$v{lD|N0Rvn+5#`!Kx2=3kZRqFv z3MGla1+L&#p6HAcMMUkc610K)*YJ7>`4_btc{g){q0JX~^BCjHFL14M`Ur209pTo> zc<0?C-1`-+FVJ&@4`!pkp}DeEWFkJ9tA12{jO7x#NTrYPg9J`;9V6H@#(i?P{VdE> z$<1I1%cRnb5v*X9PPPzQ?nW&|UsEkWh?-18^JdeQ_O4rZbZ7!b z=vB6W`Nj^SJHE6I1;(mpA%U|bFu3M=uD>oYk*U6u?`5Gbz5T+D-*UbEQYBjx(8}y& zAc_$aI)-$_1d@HF444>I2?>E{CR-bZK+41b1_ef|uIFrb8hcJ_SMDilscO@b^_pzC z%I-Ne|G;gl*xBN06w=f@*$8lb969t}Q?~4iXFDGRL`7g^-|?%Gw*A5**G#YA%ewsN zv`X2UfvcF+ag8eqTZIu5*D)uMCVJELq-VLZ&NcZ?!|{B9nM}4V!iChjO; zoWQbdA8bgF1R!rW^J<9KTR?CrX=S-Y?%}`^NcHhJUl@@QGtH6aG(RqG@biNgs z`u{crBDQr=$zXOKoNP2ZYM-&-1h?c-Pkv*k*=bqMW^lWs{|-B^B&Rgo1@E77tE1v8 z!Z+`c|6y9M7*+A);?m49j9)NcA0z%9$*)1`82|AgVVGb835;NzzS$6jG$v>fj!T$i zN%gvnsi4U;W_nG2&>mo{xYWg!t#3$nabtVAi(9K&u8ZZg_8GBUTJyWO`vu9+^$A0{ zXcw!BM-+<3LO?jdN=aT#ir*Nf$zYBg=Gi~b&MRc5_!Yx`r~Ha|h(}~IfC5TbBOjC3 h^cd@`onnP2-qoy literal 1090 zcmZWn+fEZv6kVsq4h)9^a`h9!_VQp_{QT1?garWXi^B7+sjbAnZY z@l@%RdZV(g^0u-YLBsL3a>aC+t@5N~B8owYenfQzni#@}28;?sQ|WRa*izyI zVgiFD$FmQsCVR`e|U ztw8^l9h4N$)?<%6Qyl@GxaytV$fe7g=aj?+Op|BbuM5Oe=?*B=$H2v7Ht4h-=aPhh zUK2A&OJp!7(96fl%59PvXD({cWr;qRCbGC{;0oPpE7g8q;u@|CjPcsK<0-G|D3^`} zcFop)Ozt!3uI5ZE;iiEb0u$|)-57~mnpK?b^J-^%P0`CLty{vfL=Gz~?Hnml*Hl4k zvV>KMyV|>0vu=?PmqSZ)R6T)#aK9d^ddD(z!*4dK_IkLOg9lr?pl!kw^@wu0qcHU% z@D$MshJT6_{^=MbaRZE=5vlRRnYqb5#D8Gu`5qEqG4?rxp5!+k0{YoZ(#Qc!Fqdp! z!YQ0)#OpYNNw(CdvwSAP^EsUFJo2092y2zh7mT%#{Dqla%w{s*Fxx_E7xQy1EVQu5 z#QaB0>F7|#df&qBc6{d(l7}iEkkC>5psra*p;>3bVH4y#LdK(*#W>f&Jc)C^-}U`&}jpF?8vJ`Q^(#_f~;ajjrv+Ps{* zi5bYz;x7b}bNJhVq>4ZkkgOMIsdr;w0zw7`E-mS;45zfVGfdeC?=L{SSK#Lh(Fgyd2+CVYFW*!Ebc?4+YQ6(IP nzJwb3isAL-xq>Q;Cnx_G6lHuf`G%kx<5>`!{VmWUCWdza1-U$% delta 302 zcmbQPGFye~)W2Q(7#J8#7(Q;~>f+FF(F|i`U`zpG7e)r*%)I2H)WqUc=fvU+r^KAZ zyyR3y1{MuZ&9KcIIUJc7w@v=cwStjx^BnFbW*|qNzYs`HK2a;Ssnt@?20~^CWh8aMX7?{t_Fq2^xkO$Pj@SNcV1JEf9 zFBx7<{wN@3w~b*6LOUPW)I$uc42Kyw8IB+s!38&hi{Ui`2iS-=3~wjT6jTvE0anKY d6k`DDgjmJM@NV)IK{eSkSmoXWRWdPr005}ZLX`jj diff --git a/src/model/CharityTile.java b/src/model/CharityTile.java index 0b92dd8..a732946 100644 --- a/src/model/CharityTile.java +++ b/src/model/CharityTile.java @@ -12,13 +12,14 @@ public class CharityTile extends Tile @Override public void getLandedOn(Player p) { - //call view method + FinancialStatement f = p.getFinancialStatement(); + // call view method // TODO if (p.donateCharity()) { p.setCharityCount(p.getCharityCount() + 3); - p.getFinancialStatement().increaseCashBalance((int) -((p.getFinancialStatement().getTotalIncome()*.1))); + p.getFinancialStatement().increaseCashBalance((int) -((f.getTotalIncome()*.1))); } else { diff --git a/src/model/ChildTile.java b/src/model/ChildTile.java index c9bdbf5..bdc42fa 100644 --- a/src/model/ChildTile.java +++ b/src/model/ChildTile.java @@ -12,7 +12,6 @@ public class ChildTile extends Tile public void getLandedOn(Player p) { p.getFinancialStatement().addChild(); - p.getFinancialStatement().update(); } diff --git a/src/model/DealTile.java b/src/model/DealTile.java index 5cdebb3..c7543e4 100644 --- a/src/model/DealTile.java +++ b/src/model/DealTile.java @@ -21,9 +21,7 @@ public class DealTile extends Tile // TODO // For now, using a scanner to interact with user until GUI is ready: // Ask user to decide big/small deal: - Scanner s = new Scanner(System.in); - System.out.println("You landed on a deal tile. Enter 0 for small deal or 1 for big deal"); - String input = s.next(); + // Pick card from big/small deal stack: Card c; diff --git a/src/model/DoodadStack.java b/src/model/DoodadStack.java index a30512e..78b635c 100644 --- a/src/model/DoodadStack.java +++ b/src/model/DoodadStack.java @@ -67,7 +67,12 @@ public class DoodadStack extends CardStack _doodadStack = DoodadCardStack; } - + + @Override + public DoodadCard pickCard() + { + return (DoodadCard) super.pickCard(); + } diff --git a/src/model/DoodadTile.java b/src/model/DoodadTile.java index 5190806..97bc6b5 100644 --- a/src/model/DoodadTile.java +++ b/src/model/DoodadTile.java @@ -3,8 +3,6 @@ package model; public class DoodadTile extends Tile { private static DoodadStack _doodadStack; - private DoodadCard card; - private int amount; public DoodadTile(String name, int boardIndex) { @@ -15,18 +13,17 @@ public class DoodadTile extends Tile @Override public void getLandedOn(Player p) { - card = (DoodadCard) _doodadStack.pop(); - amount = card.getValue(); - if (p.getFinancialStatement().getCashBalance() > amount) - { - p.getFinancialStatement().setCashBalance(p.getFinancialStatement().getCashBalance() - amount); - p.getFinancialStatement().update(); - } - else if(p.getFinancialStatement().getCashBalance() < amount) - { - p.getFinancialStatement().setCashBalance(0); - p.getFinancialStatement().update(); - } + FinancialStatement f = p.getFinancialStatement(); + DoodadCard dc = _doodadStack.pickCard(); + int amount = dc.getValue(); + if (f.getCashBalance() > amount) + { + f.increaseCashBalance(-amount); + } + else if(f.getCashBalance() < amount) + { + f.setCashBalance(0); + } // Pop next card // Get cash out from card // Check if player has enough money to pay in full diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java index cbd79a0..c4a394a 100644 --- a/src/model/FinancialStatement.java +++ b/src/model/FinancialStatement.java @@ -91,7 +91,7 @@ public class FinancialStatement update(); } - public void update() + private void update() { _income = _salary + _REcashFlow; _expenses = _taxes + _homeMortgagePayment + _schoolLoanPayment + _carLoanPayment + _creditCardPayment + _otherExpenses + (_perChildExpense * _numChildren); @@ -184,9 +184,10 @@ public class FinancialStatement return _cashBalance; } - public void setCashBalance(double d) + public void setCashBalance(int d) { - _cashBalance = (int) d; + _cashBalance = d; + update(); } public void increaseCashBalance(int cashIncrease) diff --git a/src/view/CharityCard.java b/src/view/CharityCardWindow.java similarity index 91% rename from src/view/CharityCard.java rename to src/view/CharityCardWindow.java index 75f5bfd..0bc006e 100644 --- a/src/view/CharityCard.java +++ b/src/view/CharityCardWindow.java @@ -4,18 +4,18 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; -public class CharityCard { +public class CharityCardWindow { private JFrame mainFrame; private JLabel headerLabel; private JLabel statusLabel; private JPanel controlPanel; - public CharityCard(){ + public CharityCardWindow(){ prepareGUI(); } public static void main(String[] args){ - CharityCard CharityCard = new CharityCard(); - CharityCard.showButtonDemo(); + CharityCardWindow CharityCardWindow = new CharityCardWindow(); + CharityCardWindow.showButtonDemo(); } private void prepareGUI(){ mainFrame = new JFrame("Charity"); @@ -42,7 +42,7 @@ public class CharityCard { mainFrame.setVisible(true); } private static ImageIcon createImageIcon(String path, String description) { - java.net.URL imgURL = CharityCard.class.getResource(path); + java.net.URL imgURL = CharityCardWindow.class.getResource(path); if (imgURL != null) { return new ImageIcon(imgURL, description); } else { diff --git a/src/view/ChildCard.java b/src/view/ChildCardWindow.java similarity index 93% rename from src/view/ChildCard.java rename to src/view/ChildCardWindow.java index 19eec34..babd4a2 100644 --- a/src/view/ChildCard.java +++ b/src/view/ChildCardWindow.java @@ -4,18 +4,18 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; -public class ChildCard { +public class ChildCardWindow { private JFrame mainFrame; private JLabel headerLabel; private JLabel statusLabel; private JPanel controlPanel; - public ChildCard(){ + public ChildCardWindow(){ prepareGUI(); } public static void main(String[] args){ - ChildCard ChildCard = new ChildCard(); + ChildCardWindow ChildCard = new ChildCardWindow(); ChildCard.showButtonDemo(); } private void prepareGUI(){ diff --git a/src/view/DealCard.java b/src/view/DealCardWindow.java similarity index 93% rename from src/view/DealCard.java rename to src/view/DealCardWindow.java index 6a0d78c..62bac61 100644 --- a/src/view/DealCard.java +++ b/src/view/DealCardWindow.java @@ -5,7 +5,7 @@ import java.awt.event.*; import javax.swing.*; import model.*; -public class DealCard { +public class DealCardWindow { private JFrame mainFrame; private JLabel headerLabel; private JLabel statusLabel; @@ -16,12 +16,12 @@ public class DealCard { private JPanel controlPanel2; public int response; - public DealCard(){ + public DealCardWindow(){ prepareGUI(); } public static void main(String[] args){ - DealCard DealCard = new DealCard(); - DealCard.showButtonDemo(); + DealCardWindow DealCardWindow = new DealCardWindow(); + DealCardWindow.showButtonDemo(); } private void prepareGUI(){ mainFrame = new JFrame("Deal"); @@ -71,7 +71,7 @@ public class DealCard { mainFrame2.setVisible(true); } - private int showButtonDemo(){ + private int showButtonDemo() { headerLabel.setText("Deal"); statusLabel.setText("What type of deal would you like?"); diff --git a/src/view/DoodadCard.java b/src/view/DoodadCardWindow.java similarity index 92% rename from src/view/DoodadCard.java rename to src/view/DoodadCardWindow.java index cec2a5e..9b165a1 100644 --- a/src/view/DoodadCard.java +++ b/src/view/DoodadCardWindow.java @@ -14,18 +14,18 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; -public class DoodadCard { +public class DoodadCardWindow { private JFrame mainFrame; private JLabel headerLabel; private JLabel statusLabel; private JPanel controlPanel; - public DoodadCard(){ + public DoodadCardWindow(){ prepareGUI(); } public static void main(String[] args){ - DoodadCard DoodadCard = new DoodadCard(); - DoodadCard.showButtonDemo(); + DoodadCardWindow DoodadCardWindow = new DoodadCardWindow(); + DoodadCardWindow.showButtonDemo(); } private void prepareGUI(){ mainFrame = new JFrame("Doodad"); diff --git a/src/view/SDStockCard.java b/src/view/SDStockCardWindow.java similarity index 91% rename from src/view/SDStockCard.java rename to src/view/SDStockCardWindow.java index 4f0e3f7..d632c81 100644 --- a/src/view/SDStockCard.java +++ b/src/view/SDStockCardWindow.java @@ -4,18 +4,18 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; -public class SDStockCard { +public class SDStockCardWindow { private JFrame mainFrame; private JLabel headerLabel; private JLabel statusLabel; private JPanel controlPanel; - public SDStockCard(){ + public SDStockCardWindow(){ prepareGUI(); } public static void main(String[] args){ - SDStockCard SDStockCard = new SDStockCard(); - SDStockCard.showButtonDemo(); + SDStockCardWindow SDStockCardWindow = new SDStockCardWindow(); + SDStockCardWindow.showButtonDemo(); } private void prepareGUI(){ mainFrame = new JFrame("Small Deal"); @@ -57,7 +57,7 @@ public class SDStockCard { public void actionPerformed(ActionEvent e) { //put message that they BuyStockd xx dollars after 10 seconds, close window try { - Thread.sleep(1000); + Thread.sleep(10000); } catch (InterruptedException e1) { // TODO Auto-generated catch block e1.printStackTrace();