Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Just changed the view class names
  • Loading branch information
Joe Hill committed Apr 7, 2017
1 parent afdcd50 commit 5266503
Show file tree
Hide file tree
Showing 17 changed files with 47 additions and 46 deletions.
Binary file modified bin/model/CharityTile.class
Binary file not shown.
Binary file modified bin/model/ChildTile.class
Binary file not shown.
Binary file modified bin/model/DealTile.class
Binary file not shown.
Binary file modified bin/model/DoodadStack.class
Binary file not shown.
Binary file modified bin/model/DoodadTile.class
Binary file not shown.
Binary file modified bin/model/FinancialStatement.class
Binary file not shown.
5 changes: 3 additions & 2 deletions src/model/CharityTile.java
Expand Up @@ -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
{
Expand Down
1 change: 0 additions & 1 deletion src/model/ChildTile.java
Expand Up @@ -12,7 +12,6 @@ public class ChildTile extends Tile
public void getLandedOn(Player p)
{
p.getFinancialStatement().addChild();
p.getFinancialStatement().update();

}

Expand Down
4 changes: 1 addition & 3 deletions src/model/DealTile.java
Expand Up @@ -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;
Expand Down
7 changes: 6 additions & 1 deletion src/model/DoodadStack.java
Expand Up @@ -67,7 +67,12 @@ public class DoodadStack extends CardStack
_doodadStack = DoodadCardStack;

}


@Override
public DoodadCard pickCard()
{
return (DoodadCard) super.pickCard();
}



Expand Down
25 changes: 11 additions & 14 deletions src/model/DoodadTile.java
Expand Up @@ -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)
{
Expand All @@ -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
Expand Down
7 changes: 4 additions & 3 deletions src/model/FinancialStatement.java
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions src/view/CharityCard.java → src/view/CharityCardWindow.java
Expand Up @@ -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");
Expand All @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/view/ChildCard.java → src/view/ChildCardWindow.java
Expand Up @@ -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(){
Expand Down
10 changes: 5 additions & 5 deletions src/view/DealCard.java → src/view/DealCardWindow.java
Expand Up @@ -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;
Expand All @@ -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");
Expand Down Expand Up @@ -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?");
Expand Down
8 changes: 4 additions & 4 deletions src/view/DoodadCard.java → src/view/DoodadCardWindow.java
Expand Up @@ -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");
Expand Down
10 changes: 5 additions & 5 deletions src/view/SDStockCard.java → src/view/SDStockCardWindow.java
Expand Up @@ -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");
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit 5266503

Please sign in to comment.