diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 6d77dff..3963c5c 100644 Binary files a/bin/controller/Cashflow.class and b/bin/controller/Cashflow.class differ diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index 83039bb..ec0ad31 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -7,5 +7,6 @@ public class Cashflow public static void main(String[] args) { new MainWindow(); + System.out.println("Hello"); } } diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java index b5b25b1..c00e108 100644 --- a/src/model/Market_Cards.java +++ b/src/model/Market_Cards.java @@ -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 + */ } } diff --git a/src/view/MainWindow.java b/src/view/MainWindow.java index b1a94ed..ea95c70 100644 --- a/src/view/MainWindow.java +++ b/src/view/MainWindow.java @@ -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); } } diff --git a/src/view/MainWindow1.java b/src/view/MainWindow1.java new file mode 100644 index 0000000..b68860b --- /dev/null +++ b/src/view/MainWindow1.java @@ -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); + } + +}