diff --git a/bin/.gitignore b/bin/.gitignore index 4a6964c..66905d0 100644 --- a/bin/.gitignore +++ b/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 diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 13f0cc3..00469c6 100644 Binary files a/bin/controller/Cashflow.class and b/bin/controller/Cashflow.class differ diff --git a/bin/model/BigDealStack.class b/bin/model/BigDealStack.class index a820dd7..5a27ad0 100644 Binary files a/bin/model/BigDealStack.class and b/bin/model/BigDealStack.class differ diff --git a/bin/model/Card.class b/bin/model/Card.class index fb749aa..282d93b 100644 Binary files a/bin/model/Card.class and b/bin/model/Card.class differ diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class index d9e4bf9..ce4fd7a 100644 Binary files a/bin/model/CardStack.class and b/bin/model/CardStack.class differ diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class index 80cfd97..0d2d553 100644 Binary files a/bin/model/CharityTile.class and b/bin/model/CharityTile.class differ diff --git a/bin/model/ChildTile.class b/bin/model/ChildTile.class index 54da5e4..1c2f52b 100644 Binary files a/bin/model/ChildTile.class and b/bin/model/ChildTile.class differ diff --git a/bin/model/DealCard.class b/bin/model/DealCard.class index adc8ef1..9a51abb 100644 Binary files a/bin/model/DealCard.class and b/bin/model/DealCard.class differ diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class index 7d9238f..a4bd343 100644 Binary files a/bin/model/DealTile.class and b/bin/model/DealTile.class differ diff --git a/bin/model/Die.class b/bin/model/Die.class index 3884acd..e319493 100644 Binary files a/bin/model/Die.class and b/bin/model/Die.class differ diff --git a/bin/model/DoodadCard.class b/bin/model/DoodadCard.class index 8e23482..538f415 100644 Binary files a/bin/model/DoodadCard.class and b/bin/model/DoodadCard.class differ diff --git a/bin/model/DoodadStack.class b/bin/model/DoodadStack.class index b3885f0..f68cac1 100644 Binary files a/bin/model/DoodadStack.class and b/bin/model/DoodadStack.class differ diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class index 7e73a9e..2129309 100644 Binary files a/bin/model/DoodadTile.class and b/bin/model/DoodadTile.class differ diff --git a/bin/model/DownsizeTile.class b/bin/model/DownsizeTile.class index 058fe38..60b4d98 100644 Binary files a/bin/model/DownsizeTile.class and b/bin/model/DownsizeTile.class differ diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class index 14738b8..fdcff01 100644 Binary files a/bin/model/FinancialStatement.class and b/bin/model/FinancialStatement.class differ diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class index d75668d..6fed275 100644 Binary files a/bin/model/GameBoard.class and b/bin/model/GameBoard.class differ diff --git a/bin/model/Handler.class b/bin/model/Handler.class index 168fca9..3a3c5f5 100644 Binary files a/bin/model/Handler.class and b/bin/model/Handler.class differ diff --git a/bin/model/MarketCard.class b/bin/model/MarketCard.class index 10982d5..62aad7c 100644 Binary files a/bin/model/MarketCard.class and b/bin/model/MarketCard.class differ diff --git a/bin/model/MarketStack.class b/bin/model/MarketStack.class index 6c75bff..cf1b145 100644 Binary files a/bin/model/MarketStack.class and b/bin/model/MarketStack.class differ diff --git a/bin/model/MarketTile.class b/bin/model/MarketTile.class index c4b9bfa..b3c3a8b 100644 Binary files a/bin/model/MarketTile.class and b/bin/model/MarketTile.class differ diff --git a/bin/model/OwnedRealEstate.class b/bin/model/OwnedRealEstate.class index b9ca4f6..500d944 100644 Binary files a/bin/model/OwnedRealEstate.class and b/bin/model/OwnedRealEstate.class differ diff --git a/bin/model/PaydayTile.class b/bin/model/PaydayTile.class index fde1634..631fb20 100644 Binary files a/bin/model/PaydayTile.class and b/bin/model/PaydayTile.class differ diff --git a/bin/model/Player.class b/bin/model/Player.class index 980dae0..3ac14df 100644 Binary files a/bin/model/Player.class and b/bin/model/Player.class differ diff --git a/bin/model/Profession.class b/bin/model/Profession.class index 8fdeb61..8206775 100644 Binary files a/bin/model/Profession.class and b/bin/model/Profession.class differ diff --git a/bin/model/Professions.class b/bin/model/Professions.class index 41ab535..491de07 100644 Binary files a/bin/model/Professions.class and b/bin/model/Professions.class differ diff --git a/bin/model/SmallDealStack.class b/bin/model/SmallDealStack.class index 143fd12..8b79e20 100644 Binary files a/bin/model/SmallDealStack.class and b/bin/model/SmallDealStack.class differ diff --git a/bin/model/Stock.class b/bin/model/Stock.class index 605e025..b348dae 100644 Binary files a/bin/model/Stock.class and b/bin/model/Stock.class differ diff --git a/bin/model/Tile.class b/bin/model/Tile.class index 6f236de..655ebd0 100644 Binary files a/bin/model/Tile.class and b/bin/model/Tile.class differ diff --git a/bin/model/TileCircularLinkedList$Node.class b/bin/model/TileCircularLinkedList$Node.class index 64dfb0f..06495c6 100644 Binary files a/bin/model/TileCircularLinkedList$Node.class and b/bin/model/TileCircularLinkedList$Node.class differ diff --git a/bin/model/TileCircularLinkedList.class b/bin/model/TileCircularLinkedList.class index 2577118..36c46be 100644 Binary files a/bin/model/TileCircularLinkedList.class and b/bin/model/TileCircularLinkedList.class differ diff --git a/bin/view/CharityWindow$1.class b/bin/view/CharityWindow$1.class index e815cf8..f38a143 100644 Binary files a/bin/view/CharityWindow$1.class and b/bin/view/CharityWindow$1.class differ diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class index 2dee356..d41d311 100644 Binary files a/bin/view/CharityWindow$2.class and b/bin/view/CharityWindow$2.class differ diff --git a/bin/view/CharityWindow$3.class b/bin/view/CharityWindow$3.class index 275ba13..6e12f73 100644 Binary files a/bin/view/CharityWindow$3.class and b/bin/view/CharityWindow$3.class differ diff --git a/bin/view/CharityWindow.class b/bin/view/CharityWindow.class index b5cac5e..3415f45 100644 Binary files a/bin/view/CharityWindow.class and b/bin/view/CharityWindow.class differ diff --git a/bin/view/ChildWindow$1.class b/bin/view/ChildWindow$1.class index a63c280..efd900f 100644 Binary files a/bin/view/ChildWindow$1.class and b/bin/view/ChildWindow$1.class differ diff --git a/bin/view/ChildWindow$2.class b/bin/view/ChildWindow$2.class index 35fa16f..0120329 100644 Binary files a/bin/view/ChildWindow$2.class and b/bin/view/ChildWindow$2.class differ diff --git a/bin/view/ChildWindow.class b/bin/view/ChildWindow.class index 00056a1..6f698fb 100644 Binary files a/bin/view/ChildWindow.class and b/bin/view/ChildWindow.class differ diff --git a/bin/view/DealCardWindow$1.class b/bin/view/DealCardWindow$1.class index ac4aceb..698118b 100644 Binary files a/bin/view/DealCardWindow$1.class and b/bin/view/DealCardWindow$1.class differ diff --git a/bin/view/DealCardWindow$2.class b/bin/view/DealCardWindow$2.class index 62114ff..69547f0 100644 Binary files a/bin/view/DealCardWindow$2.class and b/bin/view/DealCardWindow$2.class differ diff --git a/bin/view/DealCardWindow$3$1.class b/bin/view/DealCardWindow$3$1.class index e0a922b..96db31e 100644 Binary files a/bin/view/DealCardWindow$3$1.class and b/bin/view/DealCardWindow$3$1.class differ diff --git a/bin/view/DealCardWindow$3$2.class b/bin/view/DealCardWindow$3$2.class index 75eab6a..7af86cd 100644 Binary files a/bin/view/DealCardWindow$3$2.class and b/bin/view/DealCardWindow$3$2.class differ diff --git a/bin/view/DealCardWindow$3.class b/bin/view/DealCardWindow$3.class index 9906e71..a57b468 100644 Binary files a/bin/view/DealCardWindow$3.class and b/bin/view/DealCardWindow$3.class differ diff --git a/bin/view/DealCardWindow$4$1.class b/bin/view/DealCardWindow$4$1.class index a938d08..2d1cd22 100644 Binary files a/bin/view/DealCardWindow$4$1.class and b/bin/view/DealCardWindow$4$1.class differ diff --git a/bin/view/DealCardWindow$4$2.class b/bin/view/DealCardWindow$4$2.class index 111e7c7..f06db03 100644 Binary files a/bin/view/DealCardWindow$4$2.class and b/bin/view/DealCardWindow$4$2.class differ diff --git a/bin/view/DealCardWindow$4.class b/bin/view/DealCardWindow$4.class index dad01a2..e4ed6d3 100644 Binary files a/bin/view/DealCardWindow$4.class and b/bin/view/DealCardWindow$4.class differ diff --git a/bin/view/DealCardWindow.class b/bin/view/DealCardWindow.class index f81b2f9..bd6667d 100644 Binary files a/bin/view/DealCardWindow.class and b/bin/view/DealCardWindow.class differ diff --git a/bin/view/DoodadCardWindow$1.class b/bin/view/DoodadCardWindow$1.class index 63ad1b1..155e8d5 100644 Binary files a/bin/view/DoodadCardWindow$1.class and b/bin/view/DoodadCardWindow$1.class differ diff --git a/bin/view/DoodadCardWindow$2.class b/bin/view/DoodadCardWindow$2.class index da8c80f..4c4c3be 100644 Binary files a/bin/view/DoodadCardWindow$2.class and b/bin/view/DoodadCardWindow$2.class differ diff --git a/bin/view/DoodadCardWindow.class b/bin/view/DoodadCardWindow.class index 65ca86f..6d44673 100644 Binary files a/bin/view/DoodadCardWindow.class and b/bin/view/DoodadCardWindow.class differ diff --git a/bin/view/DownSizeWindow$1.class b/bin/view/DownSizeWindow$1.class index f33d97e..52f3a74 100644 Binary files a/bin/view/DownSizeWindow$1.class and b/bin/view/DownSizeWindow$1.class differ diff --git a/bin/view/DownSizeWindow.class b/bin/view/DownSizeWindow.class index 506d0a8..dcded3f 100644 Binary files a/bin/view/DownSizeWindow.class and b/bin/view/DownSizeWindow.class differ diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class index 701d99f..86276a9 100644 Binary files a/bin/view/FSWindow.class and b/bin/view/FSWindow.class differ diff --git a/bin/view/GameboardWindow.class b/bin/view/GameboardWindow.class index 06f8a0b..ee0b303 100644 Binary files a/bin/view/GameboardWindow.class and b/bin/view/GameboardWindow.class differ diff --git a/bin/view/MainWindow$1.class b/bin/view/MainWindow$1.class index 5c3d145..1c26d21 100644 Binary files a/bin/view/MainWindow$1.class and b/bin/view/MainWindow$1.class differ diff --git a/bin/view/MainWindow.class b/bin/view/MainWindow.class index 2f9e5fe..55b39c8 100644 Binary files a/bin/view/MainWindow.class and b/bin/view/MainWindow.class differ diff --git a/bin/view/MainWindow1$1.class b/bin/view/MainWindow1$1.class index 0300272..0720031 100644 Binary files a/bin/view/MainWindow1$1.class and b/bin/view/MainWindow1$1.class differ diff --git a/bin/view/MainWindow1.class b/bin/view/MainWindow1.class index edc924e..9d49cf6 100644 Binary files a/bin/view/MainWindow1.class and b/bin/view/MainWindow1.class differ diff --git a/bin/view/Positioner.class b/bin/view/Positioner.class index 32ebf82..588f16b 100644 Binary files a/bin/view/Positioner.class and b/bin/view/Positioner.class differ diff --git a/bin/view/SDStockCardWindow$1.class b/bin/view/SDStockCardWindow$1.class index c11d678..09d4e6f 100644 Binary files a/bin/view/SDStockCardWindow$1.class and b/bin/view/SDStockCardWindow$1.class differ diff --git a/bin/view/SDStockCardWindow$2.class b/bin/view/SDStockCardWindow$2.class index aab4f8a..02dbdb4 100644 Binary files a/bin/view/SDStockCardWindow$2.class and b/bin/view/SDStockCardWindow$2.class differ diff --git a/bin/view/SDStockCardWindow$3.class b/bin/view/SDStockCardWindow$3.class index 2921fb3..e2d8af2 100644 Binary files a/bin/view/SDStockCardWindow$3.class and b/bin/view/SDStockCardWindow$3.class differ diff --git a/bin/view/SDStockCardWindow.class b/bin/view/SDStockCardWindow.class index 43b9ea3..c2b2d14 100644 Binary files a/bin/view/SDStockCardWindow.class and b/bin/view/SDStockCardWindow.class differ diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class index 2c088ec..7b840b9 100644 Binary files a/bin/view/TileButton.class and b/bin/view/TileButton.class differ diff --git a/bin/view/Window.class b/bin/view/Window.class index c68be93..fe71bb5 100644 Binary files a/bin/view/Window.class and b/bin/view/Window.class differ diff --git a/src/view/DealCardWindow.java b/src/view/DealCardWindow.java index e4f9b87..0dcf33d 100644 --- a/src/view/DealCardWindow.java +++ b/src/view/DealCardWindow.java @@ -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() { @@ -143,5 +143,5 @@ public class DealCardWindow { controlPanel.add(SmallDeal); mainFrame.setVisible(true); return response; - } + } } diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java index 9585627..fb49517 100644 --- a/src/view/FSWindow.java +++ b/src/view/FSWindow.java @@ -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); @@ -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*/},