sup

joh13010 · Apr 11, 2017 · f277afe · f277afe
1 parent 97af0d4
commit f277afe
Show file tree

Hide file tree

Showing 49 changed files with 79 additions and 4 deletions.
diff --git 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
diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class
diff --git a/bin/model/Die.class b/bin/model/Die.class
diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class
diff --git a/bin/model/MarketCard.class b/bin/model/MarketCard.class
diff --git a/bin/model/MarketStack.class b/bin/model/MarketStack.class
diff --git a/bin/model/MarketTile.class b/bin/model/MarketTile.class
diff --git a/bin/model/OwnedRealEstate.class b/bin/model/OwnedRealEstate.class
diff --git a/bin/model/PaydayTile.class b/bin/model/PaydayTile.class
diff --git a/bin/model/Profession.class b/bin/model/Profession.class
diff --git a/bin/model/Professions.class b/bin/model/Professions.class
diff --git a/bin/model/Stock.class b/bin/model/Stock.class
diff --git a/bin/model/TileCircularLinkedList$Node.class b/bin/model/TileCircularLinkedList$Node.class
diff --git a/bin/model/TileCircularLinkedList.class b/bin/model/TileCircularLinkedList.class
diff --git a/bin/view/CharityWindow$1.class b/bin/view/CharityWindow$1.class
diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class
diff --git a/bin/view/CharityWindow$3.class b/bin/view/CharityWindow$3.class
diff --git a/bin/view/CharityWindow.class b/bin/view/CharityWindow.class
diff --git a/bin/view/ChildWindow$1.class b/bin/view/ChildWindow$1.class
diff --git a/bin/view/ChildWindow$2.class b/bin/view/ChildWindow$2.class
diff --git a/bin/view/ChildWindow.class b/bin/view/ChildWindow.class
diff --git a/bin/view/DealCardWindow$1.class b/bin/view/DealCardWindow$1.class
diff --git a/bin/view/DealCardWindow$2.class b/bin/view/DealCardWindow$2.class
diff --git a/bin/view/DealCardWindow$3$1.class b/bin/view/DealCardWindow$3$1.class
diff --git a/bin/view/DealCardWindow$3$2.class b/bin/view/DealCardWindow$3$2.class
diff --git a/bin/view/DealCardWindow$3.class b/bin/view/DealCardWindow$3.class
diff --git a/bin/view/DealCardWindow$4$1.class b/bin/view/DealCardWindow$4$1.class
diff --git a/bin/view/DealCardWindow$4$2.class b/bin/view/DealCardWindow$4$2.class
diff --git a/bin/view/DealCardWindow$4.class b/bin/view/DealCardWindow$4.class
diff --git a/bin/view/DealCardWindow.class b/bin/view/DealCardWindow.class
diff --git a/bin/view/DoodadCardWindow$1.class b/bin/view/DoodadCardWindow$1.class
diff --git a/bin/view/DoodadCardWindow$2.class b/bin/view/DoodadCardWindow$2.class
diff --git a/bin/view/DoodadCardWindow.class b/bin/view/DoodadCardWindow.class
diff --git a/bin/view/DownSizeWindow 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
diff --git a/bin/view/FSWindow$2.class b/bin/view/FSWindow$2.class
diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
diff --git a/bin/view/MainWindow$1.class b/bin/view/MainWindow$1.class
diff --git a/bin/view/MainWindow.class b/bin/view/MainWindow.class
diff --git a/bin/view/MainWindow1$1.class b/bin/view/MainWindow1$1.class
diff --git a/bin/view/MainWindow1.class b/bin/view/MainWindow1.class
diff --git a/bin/view/SDStockCardWindow$1.class b/bin/view/SDStockCardWindow$1.class
diff --git a/bin/view/SDStockCardWindow$2.class b/bin/view/SDStockCardWindow$2.class
diff --git a/bin/view/SDStockCardWindow$3.class b/bin/view/SDStockCardWindow$3.class
diff --git a/bin/view/SDStockCardWindow.class b/bin/view/SDStockCardWindow.class
diff --git a/bin/view/Window.class b/bin/view/Window.class
diff --git 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<initialSize; i++)

diff --git a/src/model/DealTile.java b/src/model/DealTile.java
@@ -1,7 +1,10 @@
 package model;
 
+import view.*;
+import controller.*;
 import java.util.Scanner;
 
+
 public class DealTile extends Tile
 {
 	private static SmallDealStack _smallDealStack;