Skip to content

Commit

Permalink
idk whats going on
Browse files Browse the repository at this point in the history
  • Loading branch information
Joe authored and Joe committed Mar 3, 2017
1 parent 48af30b commit 9efaf16
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 3 deletions.
Binary file modified bin/controller/Cashflow.class
Binary file not shown.
1 change: 1 addition & 0 deletions src/controller/Cashflow.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ public class Cashflow
public static void main(String[] args)
{
new MainWindow();
System.out.println("Hello");
}
}
4 changes: 2 additions & 2 deletions src/model/Market_Cards.java
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ public static void main(String[] args) {
/* Need a decision function
*Need separate functionalities (if statements) based on card type
* Need a way that every player who is affected gets the decision option
*/ Do we check if they have the proper real estate needed? Or do we assume the player knows and obviously make it so they can't sell something they don't have

* Do we check if they have the proper real estate needed? Or do we assume the player knows and obviously make it so they can't sell something they don't have
*/
}

}
Expand Down
7 changes: 6 additions & 1 deletion src/view/MainWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ private void initialize() {

JPanel panel = new JPanel();
panel.setBackground(new Color(186,85,211));
frame.add(panel);
frame.getContentPane().add(panel);
panel.setLayout(null);

JPanel panel_1 = new JPanel();
panel_1.setBounds(6, 6, 48, 47);
panel.add(panel_1);
}
}
42 changes: 42 additions & 0 deletions src/view/MainWindow1.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package view;

import java.awt.BorderLayout;
import java.awt.EventQueue;

import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;

public class MainWindow1 extends JFrame {

private JPanel contentPane;

/**
* Launch the application.
*/
public static void main(String[] args) {
EventQueue.invokeLater(new Runnable() {
public void run() {
try {
MainWindow1 frame = new MainWindow1();
frame.setVisible(true);
} catch (Exception e) {
e.printStackTrace();
}
}
});
}

/**
* Create the frame.
*/
public MainWindow1() {
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setBounds(100, 100, 450, 300);
contentPane = new JPanel();
contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
contentPane.setLayout(new BorderLayout(0, 0));
setContentPane(contentPane);
}

}

0 comments on commit 9efaf16

Please sign in to comment.