Skip to content
Permalink
Browse files

main menu

  • Loading branch information
afortuna2016
afortuna2016 committed Apr 22, 2017
1 parent 4795507 commit 162cbc34c6e24c393e42804f8543ac11636ebd55
@@ -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
BIN -117 Bytes (95%) bin/controller/Cashflow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/CardStack.class
Binary file not shown.
BIN -741 Bytes bin/model/Handler.class
Binary file not shown.
BIN -384 Bytes (68%) bin/view/TileButton.class
Binary file not shown.
@@ -11,17 +11,10 @@
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

This file was deleted.

@@ -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");
}
}
@@ -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 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 static void main (String[] args)
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);
}
});







}}
@@ -11,7 +11,6 @@

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 TileButton(String name, int TileOnBoard, GameBoard board) {
// 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 }

0 comments on commit 162cbc3

Please sign in to comment.
You can’t perform that action at this time.