Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
changes made
  • Loading branch information
afortuna2016 committed Apr 21, 2017
1 parent 45eedbe commit c175f75
Show file tree
Hide file tree
Showing 66 changed files with 6 additions and 12 deletions.
6 changes: 0 additions & 6 deletions bin/.gitignore
@@ -1,10 +1,4 @@
<<<<<<< HEAD
/view/
/controller/
/model/
=======
/.DS_Store
/controller/
/model/
/view/
>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
Binary file modified bin/controller/Cashflow.class
Binary file not shown.
Binary file modified bin/model/BigDealStack.class
Binary file not shown.
Binary file modified bin/model/Card.class
Binary file not shown.
Binary file modified bin/model/CardStack.class
Binary file not shown.
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/DealCard.class
Binary file not shown.
Binary file modified bin/model/DealTile.class
Binary file not shown.
Binary file modified bin/model/Die.class
Binary file not shown.
Binary file modified bin/model/DoodadCard.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/DownsizeTile.class
Binary file not shown.
Binary file modified bin/model/FinancialStatement.class
Binary file not shown.
Binary file modified bin/model/GameBoard.class
Binary file not shown.
Binary file modified bin/model/Handler.class
Binary file not shown.
Binary file modified bin/model/MarketCard.class
Binary file not shown.
Binary file modified bin/model/MarketStack.class
Binary file not shown.
Binary file modified bin/model/MarketTile.class
Binary file not shown.
Binary file modified bin/model/OwnedRealEstate.class
Binary file not shown.
Binary file modified bin/model/PaydayTile.class
Binary file not shown.
Binary file modified bin/model/Player.class
Binary file not shown.
Binary file modified bin/model/Profession.class
Binary file not shown.
Binary file modified bin/model/Professions.class
Binary file not shown.
Binary file modified bin/model/SmallDealStack.class
Binary file not shown.
Binary file modified bin/model/Stock.class
Binary file not shown.
Binary file modified bin/model/Tile.class
Binary file not shown.
Binary file modified bin/model/TileCircularLinkedList$Node.class
Binary file not shown.
Binary file modified bin/model/TileCircularLinkedList.class
Binary file not shown.
Binary file modified bin/view/CharityWindow$1.class
Binary file not shown.
Binary file modified bin/view/CharityWindow$2.class
Binary file not shown.
Binary file modified bin/view/CharityWindow$3.class
Binary file not shown.
Binary file modified bin/view/CharityWindow.class
Binary file not shown.
Binary file modified bin/view/ChildWindow$1.class
Binary file not shown.
Binary file modified bin/view/ChildWindow$2.class
Binary file not shown.
Binary file modified bin/view/ChildWindow.class
Binary file not shown.
Binary file modified bin/view/DealCardWindow$1.class
Binary file not shown.
Binary file modified bin/view/DealCardWindow$2.class
Binary file not shown.
Binary file modified bin/view/DealCardWindow$3$1.class
Binary file not shown.
Binary file modified bin/view/DealCardWindow$3$2.class
Binary file not shown.
Binary file modified bin/view/DealCardWindow$3.class
Binary file not shown.
Binary file modified bin/view/DealCardWindow$4$1.class
Binary file not shown.
Binary file modified bin/view/DealCardWindow$4$2.class
Binary file not shown.
Binary file modified bin/view/DealCardWindow$4.class
Binary file not shown.
Binary file modified bin/view/DealCardWindow.class
Binary file not shown.
Binary file modified bin/view/DoodadCardWindow$1.class
Binary file not shown.
Binary file modified bin/view/DoodadCardWindow$2.class
Binary file not shown.
Binary file modified bin/view/DoodadCardWindow.class
Binary file not shown.
Binary file modified bin/view/DownSizeWindow$1.class
Binary file not shown.
Binary file modified bin/view/DownSizeWindow.class
Binary file not shown.
Binary file modified bin/view/FSWindow.class
Binary file not shown.
Binary file modified bin/view/GameboardWindow.class
Binary file not shown.
Binary file modified bin/view/MainWindow$1.class
Binary file not shown.
Binary file modified bin/view/MainWindow.class
Binary file not shown.
Binary file modified bin/view/MainWindow1$1.class
Binary file not shown.
Binary file modified bin/view/MainWindow1.class
Binary file not shown.
Binary file modified bin/view/Positioner.class
Binary file not shown.
Binary file modified bin/view/SDStockCardWindow$1.class
Binary file not shown.
Binary file modified bin/view/SDStockCardWindow$2.class
Binary file not shown.
Binary file modified bin/view/SDStockCardWindow$3.class
Binary file not shown.
Binary file modified bin/view/SDStockCardWindow.class
Binary file not shown.
Binary file modified bin/view/TileButton.class
Binary file not shown.
Binary file modified bin/view/Window.class
Binary file not shown.
6 changes: 3 additions & 3 deletions src/view/DealCardWindow.java
Expand Up @@ -88,8 +88,8 @@ public class DealCardWindow {
JButton BigDeal = new JButton("BigDeal");
JButton SmallDeal = new JButton("SmallDeal");
SmallDeal.setHorizontalTextPosition(SwingConstants.LEFT);
JButton AcceptDeal = new JButton("Accept Deal");
JButton DeclineDeal = new JButton("Decline Deal");
final JButton AcceptDeal = new JButton("Accept Deal");
final JButton DeclineDeal = new JButton("Decline Deal");
DeclineDeal.setHorizontalTextPosition(SwingConstants.LEFT);

BigDeal.addActionListener(new ActionListener() {
Expand Down Expand Up @@ -143,5 +143,5 @@ public class DealCardWindow {
controlPanel.add(SmallDeal);
mainFrame.setVisible(true);
return response;
}
}
}
6 changes: 3 additions & 3 deletions src/view/FSWindow.java
Expand Up @@ -23,9 +23,9 @@ public class FSWindow {
FSWindow.prepareGUI();
FSWindow.showButtonDemo();
}
private void prepareGUI(Player p)
private void prepareGUI()
{
FinancialStatement currentFS = p.getFinancialStatement();
// FinancialStatement currentFS = p.getFinancialStatement();

JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
splitPane.setOneTouchExpandable(true);
Expand Down Expand Up @@ -95,7 +95,7 @@ public class FSWindow {
String[] incomeColumns = {"Description", "CashFlow"};
Object[][] income = {
{"Description", "CashFlow"},
{"Salary","" currentFS.getSalary()},
//{"Salary","" currentFS.getSalary()},
{"Interest/dividends", ""/**call interest of user*/},
{"Real Estate/Business",""/**business of user*/},
{"Real Estate/Business",""/**business of user*/},
Expand Down

0 comments on commit c175f75

Please sign in to comment.