From 162cbc34c6e24c393e42804f8543ac11636ebd55 Mon Sep 17 00:00:00 2001 From: afortuna2016 Date: Fri, 21 Apr 2017 20:52:58 -0400 Subject: [PATCH] main menu --- bin/.gitignore | 7 ++++++ bin/controller/Cashflow.class | Bin 2286 -> 2169 bytes bin/model/CardStack.class | Bin 1828 -> 1828 bytes bin/model/Handler.class | Bin 741 -> 0 bytes bin/view/TileButton.class | Bin 1204 -> 820 bytes src/controller/Cashflow.java | 11 ++-------- src/model/Handler.java | 25 --------------------- src/model/Instructions.java | 10 +++++++++ src/view/MainMenu.java | 40 ++++++++++++++++++++++++++++++---- src/view/TileButton.java | 17 --------------- 10 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 bin/model/Handler.class delete mode 100644 src/model/Handler.java create mode 100644 src/model/Instructions.java diff --git a/bin/.gitignore b/bin/.gitignore index 1f65b37..2255885 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1 +1,8 @@ +<<<<<<< HEAD +======= +/.DS_Store +/controller/ +/model/ +>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git /view/ +/Instructions.class diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 1704d346dd38edd872674781d7eae2aca87eeb88..88b07e4430aa323852bbc1736f5d0420a50c6cf9 100644 GIT binary patch literal 2169 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 literal 1204 zcmZuwYflqV5IvW+RLWv`KP$>ZX&1{XpeRL@hd@cAAHW*@wzM~J&9WuCTkvOTqL64} z;#Yr^@!Z`N5NUE>J2Pj_%$)xE{p|;US!|`zB9J{+^2FLzj$Ca9LBmZWDbVx5KDIwv z{)uw;t?kGl(CJH0*-lk@zG}E{%IgARTcBgD;rfB?236Z>$`rBnPY5Ifq6!$5!$w^? zVU7~NdeRLTSr$kgd8$T_)+ObtU|C=)U(uN@$7bH0z+?JSIS${n59MmZ_UffVl_+b( z%pidt16lM6^j#BLsAkZQ!88U~XGG#0#lR4T1=9O6(8bdsUoKo`+6IA~fehL+yp0;T zjXMIpz6@Azz#3LOX>TaUk#*9^zt_nG#tlqhlDPCMyMZr|$VZlY2BtJZhL)=G)t)2M zD6oAIu`S!JJJQoxrw!ahhrSgJ80g3#4@;N%Kwu(Y{@V~u``Yek9Img&icvhK z=X{hI3wXj8Inc65Uiwxd*Ou_MglFVDN1n@g&N?YGOvdaNcxwMP&FUv!yuBck3B$+P ri0Lqy5jn=m1Xi&YgJ|kHmADAjeFUs9us<@MvlLjzOWFlC!obZx7^e59 diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index fde4514..b57c1d8 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -11,17 +11,10 @@ public class Cashflow private Player[] _players; //private CardStack[] _cards; - public static void main(String[] args) - { - /* - * Just testing stuff in here for now. Main method will call the go() method when game is built - */ - testGamePlay(); - - } - public void go() + public static void go() { + System.out.println("Start game"); // Joe // Initialize game board // Initialize GUI diff --git a/src/model/Handler.java b/src/model/Handler.java deleted file mode 100644 index 8515231..0000000 --- a/src/model/Handler.java +++ /dev/null @@ -1,25 +0,0 @@ -package model; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - - -public class Handler implements ActionListener { - private int rent, price, locationOnBoard; - private Tile tile; - - public Handler(int price, int rent, Tile tile, int locationOnBoard, - GameBoard board) { - this.price = price; - this.rent = rent; - this.tile = tile; - this.locationOnBoard = locationOnBoard; - - } - - public void actionPerformed(ActionEvent event) { - // refer to getLandedOn? Or one of the decision/card windows? How do i do this i am tired - - } - -} diff --git a/src/model/Instructions.java b/src/model/Instructions.java new file mode 100644 index 0000000..665cdb8 --- /dev/null +++ b/src/model/Instructions.java @@ -0,0 +1,10 @@ +package model; + +public class Instructions +{ + public static void getClicked() + { + System.out.println("You thought we were just going to GIVE you the instructions?"); + System.out.println("HAHAHAHAH"); + } +} diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java index a9b25e3..d5b97c3 100644 --- a/src/view/MainMenu.java +++ b/src/view/MainMenu.java @@ -1,8 +1,15 @@ package view; import javax.imageio.ImageIO; + import javax.swing.*; + +import controller.Cashflow; +import model.Instructions; + import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; @@ -11,7 +18,7 @@ public class MainMenu { public static void main (String[] args) { - JFrame frame = new JFrame("CashFlow"); + final JFrame frame = new JFrame("CashFlow"); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setSize(650,530); @@ -96,7 +103,32 @@ public class MainMenu frame.add(panel3); frame.add(panel4); frame.add(panel5); - frame.setVisible(true); + frame.setVisible(true); - } -} + newGame.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + frame.dispose(); + Cashflow.go(); + } + }); + + rules.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + frame.dispose(); + Instructions.getClicked(); + } + }); + + exit.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + System.exit(0); + } + }); + + + + + + + +}} diff --git a/src/view/TileButton.java b/src/view/TileButton.java index c3c06c8..3aafc82 100644 --- a/src/view/TileButton.java +++ b/src/view/TileButton.java @@ -11,7 +11,6 @@ public class TileButton extends JButton { private static final long serialVersionUID = 1L; private Tile tile; - private int rent, price; public TileButton(String name, int TileOnBoard, GameBoard board) { super(name); @@ -20,27 +19,11 @@ public class TileButton extends JButton { // this.setOpaque(false); this.setContentAreaFilled(false); // this.setBorderPainted(false); - - this.setInts(); this.setVisible(true); - Handler hand = new Handler(price, rent, tile, TileOnBoard, - board); - this.addActionListener(hand); } - public void setInts() { - - if (this.tile instanceof Tile) { - /* - * i dont actually really like this method - * but i think it should be like that iterator in cash flow - * that determines moving over the tiles and if it's landed on - * the gui should be brought up already in the handler method - */ - } - } public void paint(Graphics g) { // Do nothing here }