diff --git a/bin/.gitignore b/bin/.gitignore index 66905d0..4e7e508 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,4 +1 @@ -/.DS_Store /controller/ -/model/ -/view/ diff --git a/bin/model/Card.class b/bin/model/Card.class index 282d93b..fb749aa 100644 Binary files a/bin/model/Card.class and b/bin/model/Card.class differ diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class index 3439ceb..f1ef37b 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 e319493..3884acd 100644 Binary files a/bin/model/Die.class and b/bin/model/Die.class differ diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class index 6812249..7a1eefb 100644 Binary files a/bin/model/GameBoard.class and b/bin/model/GameBoard.class differ diff --git a/bin/model/MarketCard.class b/bin/model/MarketCard.class index 62aad7c..10982d5 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 cf1b145..6c75bff 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 af03a6d..8004057 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 500d944..b9ca4f6 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 631fb20..fde1634 100644 Binary files a/bin/model/PaydayTile.class and b/bin/model/PaydayTile.class differ diff --git a/bin/model/Profession.class b/bin/model/Profession.class index 8206775..8fdeb61 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 72577b6..044c822 100644 Binary files a/bin/model/Professions.class and b/bin/model/Professions.class differ diff --git a/bin/model/Stock.class b/bin/model/Stock.class index b348dae..605e025 100644 Binary files a/bin/model/Stock.class and b/bin/model/Stock.class differ diff --git a/bin/model/TileCircularLinkedList$Node.class b/bin/model/TileCircularLinkedList$Node.class index 06495c6..64dfb0f 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 36c46be..2577118 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 new file mode 100644 index 0000000..e815cf8 Binary files /dev/null and b/bin/view/CharityWindow$1.class differ diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class new file mode 100644 index 0000000..2dee356 Binary files /dev/null and b/bin/view/CharityWindow$2.class differ diff --git a/bin/view/CharityWindow$3.class b/bin/view/CharityWindow$3.class new file mode 100644 index 0000000..275ba13 Binary files /dev/null and b/bin/view/CharityWindow$3.class differ diff --git a/bin/view/CharityWindow.class b/bin/view/CharityWindow.class new file mode 100644 index 0000000..b5cac5e Binary files /dev/null and b/bin/view/CharityWindow.class differ diff --git a/bin/view/ChildWindow$1.class b/bin/view/ChildWindow$1.class new file mode 100644 index 0000000..a63c280 Binary files /dev/null and b/bin/view/ChildWindow$1.class differ diff --git a/bin/view/ChildWindow$2.class b/bin/view/ChildWindow$2.class new file mode 100644 index 0000000..35fa16f Binary files /dev/null and b/bin/view/ChildWindow$2.class differ diff --git a/bin/view/ChildWindow.class b/bin/view/ChildWindow.class new file mode 100644 index 0000000..00056a1 Binary files /dev/null and b/bin/view/ChildWindow.class differ diff --git a/bin/view/DealCardWindow$1.class b/bin/view/DealCardWindow$1.class new file mode 100644 index 0000000..ac4aceb Binary files /dev/null and b/bin/view/DealCardWindow$1.class differ diff --git a/bin/view/DealCardWindow$2.class b/bin/view/DealCardWindow$2.class new file mode 100644 index 0000000..62114ff Binary files /dev/null and b/bin/view/DealCardWindow$2.class differ diff --git a/bin/view/DealCardWindow$3$1.class b/bin/view/DealCardWindow$3$1.class new file mode 100644 index 0000000..e0a922b Binary files /dev/null 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 new file mode 100644 index 0000000..75eab6a Binary files /dev/null and b/bin/view/DealCardWindow$3$2.class differ diff --git a/bin/view/DealCardWindow$3.class b/bin/view/DealCardWindow$3.class new file mode 100644 index 0000000..9906e71 Binary files /dev/null and b/bin/view/DealCardWindow$3.class differ diff --git a/bin/view/DealCardWindow$4$1.class b/bin/view/DealCardWindow$4$1.class new file mode 100644 index 0000000..a938d08 Binary files /dev/null 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 new file mode 100644 index 0000000..111e7c7 Binary files /dev/null and b/bin/view/DealCardWindow$4$2.class differ diff --git a/bin/view/DealCardWindow$4.class b/bin/view/DealCardWindow$4.class new file mode 100644 index 0000000..dad01a2 Binary files /dev/null and b/bin/view/DealCardWindow$4.class differ diff --git a/bin/view/DealCardWindow.class b/bin/view/DealCardWindow.class new file mode 100644 index 0000000..f81b2f9 Binary files /dev/null and b/bin/view/DealCardWindow.class differ diff --git a/bin/view/DoodadCardWindow$1.class b/bin/view/DoodadCardWindow$1.class new file mode 100644 index 0000000..63ad1b1 Binary files /dev/null and b/bin/view/DoodadCardWindow$1.class differ diff --git a/bin/view/DoodadCardWindow$2.class b/bin/view/DoodadCardWindow$2.class new file mode 100644 index 0000000..da8c80f Binary files /dev/null and b/bin/view/DoodadCardWindow$2.class differ diff --git a/bin/view/DoodadCardWindow.class b/bin/view/DoodadCardWindow.class new file mode 100644 index 0000000..65ca86f Binary files /dev/null and b/bin/view/DoodadCardWindow.class differ diff --git a/bin/view/DownSizeWindow b/bin/view/DownSizeWindow new file mode 100644 index 0000000..bd082ad --- /dev/null +++ b/bin/view/DownSizeWindow @@ -0,0 +1,75 @@ +package view; + +import java.awt.Color; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; + +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; + +public class DownSizeWindow { + private JFrame mainFrame; + private JLabel headerLabel; + private JLabel statusLabel; + private JPanel controlPanel; + + public DownSizeWindow(){ + prepareGUI(); + } + public static void main(String[] args){ + DownSizeWindow DownSizeWindow = new DownSizeWindow(); + DownSizeWindow.showButtonDemo(); + } + private void prepareGUI(){ + mainFrame = new JFrame("Doodad"); + mainFrame.getContentPane().setBackground(new Color(149, 32, 216)); + mainFrame.setSize(400,250); + //need to set this to null and position everything manually + mainFrame.setLayout(new GridLayout(3, 1)); + +// mainFrame.addWindowListener(new WindowAdapter() { +// public void windowClosing(WindowEvent windowEvent){ +// System.exit(0); +// } +// }); + headerLabel = new JLabel("", JLabel.CENTER); + headerLabel.setFont(headerLabel.getFont().deriveFont(Font.BOLD, 16f)); + statusLabel = new JLabel("",JLabel.CENTER); + statusLabel.setSize(350,100); + + controlPanel = new JPanel(); + controlPanel.setLayout(new FlowLayout()); + controlPanel.setBackground(new Color(149, 32, 216)); + + mainFrame.add(headerLabel); + mainFrame.add(controlPanel); + mainFrame.add(statusLabel); + mainFrame.setVisible(true); + } + + private void showButtonDemo(){ + headerLabel.setText("Downsize"); + statusLabel.setText("You lose 3 turns."); + //resources folder should be inside SWING folder. + + JButton Downsize = new JButton("Downsize"); + // Downsize.setLayout(null); + // Downsize.setLocation(10,220); + Downsize.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + //run downsize update method + System.exit(0); + } + }); + + controlPanel.add(Downsize); + mainFrame.setVisible(true); + } +} diff --git a/bin/view/FSWindow$1.class b/bin/view/FSWindow$1.class new file mode 100644 index 0000000..420404d Binary files /dev/null and b/bin/view/FSWindow$1.class differ diff --git a/bin/view/FSWindow$2.class b/bin/view/FSWindow$2.class new file mode 100644 index 0000000..8252443 Binary files /dev/null and b/bin/view/FSWindow$2.class differ diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class new file mode 100644 index 0000000..d04cbaf Binary files /dev/null and b/bin/view/FSWindow.class differ diff --git a/bin/view/MainWindow$1.class b/bin/view/MainWindow$1.class index 1c26d21..5c3d145 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 55b39c8..2f9e5fe 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 f40f2c6..589edb8 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 68c09eb..077cd20 100644 Binary files a/bin/view/MainWindow1.class and b/bin/view/MainWindow1.class differ diff --git a/bin/view/SDStockCardWindow$1.class b/bin/view/SDStockCardWindow$1.class new file mode 100644 index 0000000..c11d678 Binary files /dev/null and b/bin/view/SDStockCardWindow$1.class differ diff --git a/bin/view/SDStockCardWindow$2.class b/bin/view/SDStockCardWindow$2.class new file mode 100644 index 0000000..aab4f8a Binary files /dev/null and b/bin/view/SDStockCardWindow$2.class differ diff --git a/bin/view/SDStockCardWindow$3.class b/bin/view/SDStockCardWindow$3.class new file mode 100644 index 0000000..2921fb3 Binary files /dev/null and b/bin/view/SDStockCardWindow$3.class differ diff --git a/bin/view/SDStockCardWindow.class b/bin/view/SDStockCardWindow.class new file mode 100644 index 0000000..43b9ea3 Binary files /dev/null and b/bin/view/SDStockCardWindow.class differ diff --git a/bin/view/Window.class b/bin/view/Window.class index fe71bb5..c68be93 100644 Binary files a/bin/view/Window.class and b/bin/view/Window.class differ diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index 1099cfb..5848dd2 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -77,7 +77,7 @@ public class Cashflow public static void testCards() - { + { BigDealStack ms = new BigDealStack(); int initialSize = ms.getSize(); for(int i=0; i