From 6039988f3e09a6e1a6366d5035aef943a9fee89d Mon Sep 17 00:00:00 2001 From: Harakou Date: Tue, 21 Apr 2015 16:12:03 -0400 Subject: [PATCH 1/3] Add new mock classes to determine source of problem --- src/LinuxTestMain.java | 15 +++++++++++++++ src/Main.java | 8 +++++--- src/TestGui.java | 16 ++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 src/LinuxTestMain.java create mode 100644 src/TestGui.java diff --git a/src/LinuxTestMain.java b/src/LinuxTestMain.java new file mode 100644 index 0000000..d654c92 --- /dev/null +++ b/src/LinuxTestMain.java @@ -0,0 +1,15 @@ +import javax.swing.JFrame; +import javax.swing.JPanel; + + +public class LinuxTestMain{ + + public static void main(String[] args) { + JFrame frame = new JFrame("y u no work on linux"); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + JPanel container = new JPanel(); + container.add(new TestGui()); + + } + +} diff --git a/src/Main.java b/src/Main.java index 6c581e8..8c70a32 100644 --- a/src/Main.java +++ b/src/Main.java @@ -32,15 +32,16 @@ public class Main extends JFrame{ JPanel container = new JPanel(); //container.setLayout(new BoxLayout(container, BoxLayout.X_AXIS)); - container.setLayout(new BorderLayout(10,10)); + //container.setLayout(new BorderLayout(10,10)); MockGui mg = new MockGui(640,640,32, num, nodes); StatGui sg= new StatGui(0,0); //sg.setPreferredSize(new Dimension(1, 0)); //this keeps statgui from overlapping mockgui //container.add(mg); //container.add(sg); - container.add(mg, BorderLayout.CENTER); - container.add(sg, BorderLayout.PAGE_END); + //container.add(new TestGui()); + //container.add(sg); + frame.add(new TestGui()); MapTowerDefense map = new MapTowerDefense(100, num, nodes, mg, sg); @@ -49,6 +50,7 @@ public class Main extends JFrame{ sg.setup(); frame.add(container); + frame.pack(); frame.setVisible(true); map.createMinion(MinionTypes.BASIC); diff --git a/src/TestGui.java b/src/TestGui.java new file mode 100644 index 0000000..c45df50 --- /dev/null +++ b/src/TestGui.java @@ -0,0 +1,16 @@ +import java.awt.Color; +import java.awt.LayoutManager; + +import javax.swing.JButton; +import javax.swing.JPanel; + + +public class TestGui extends JPanel { + + public TestGui() { + super(); + this.setBackground(Color.CYAN); + this.add(new JButton("Press this and nothing will happen")); + } + +} From 758396cd6460e07fbfba30943fe652a8a97a95b2 Mon Sep 17 00:00:00 2001 From: dwm10005 Date: Tue, 21 Apr 2015 16:31:24 -0400 Subject: [PATCH 2/3] Update Main to setup GUI elements in proper order, (fixes problems on my system for the most part. Need to test on Windows/OS X before merge) --- src/LinuxTestMain.java | 15 ----------- src/Main.java | 61 ++++++++++++++++++++++-------------------- src/TestGui.java | 16 ----------- 3 files changed, 32 insertions(+), 60 deletions(-) delete mode 100644 src/LinuxTestMain.java delete mode 100644 src/TestGui.java diff --git a/src/LinuxTestMain.java b/src/LinuxTestMain.java deleted file mode 100644 index d654c92..0000000 --- a/src/LinuxTestMain.java +++ /dev/null @@ -1,15 +0,0 @@ -import javax.swing.JFrame; -import javax.swing.JPanel; - - -public class LinuxTestMain{ - - public static void main(String[] args) { - JFrame frame = new JFrame("y u no work on linux"); - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - JPanel container = new JPanel(); - container.add(new TestGui()); - - } - -} diff --git a/src/Main.java b/src/Main.java index 8c70a32..9a7749f 100644 --- a/src/Main.java +++ b/src/Main.java @@ -2,55 +2,36 @@ import java.awt.*; import javax.swing.*; public class Main extends JFrame{ - + private static int[][] nodes; + private static final int NUM = 6; public static void main(String[] args) { JFrame frame = new JFrame("Tower Defense Refactor Mock GUI"); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - frame.setSize(650,720); - int num = 6; - int[][] nodes = new int[num][2]; - nodes[0][0] = 1; - nodes[0][1] = 3; - nodes[1][0] = 16; - nodes[1][1] = 3; - nodes[2][0] = 16; - nodes[2][1] = 9; - nodes[3][0] = 4; - nodes[3][1] = 9; - nodes[4][0] = 4; - nodes[4][1] = 15; - nodes[5][0] = 18; - nodes[5][1] = 15; - /*nodes[6][0] = 18; - nodes[6][1] = 13; - nodes[7][0] = 11; - nodes[7][1] = 13; - nodes[8][0] = 11; - nodes[8][1] = 1;*/ + setupDefaultNodes(); JPanel container = new JPanel(); //container.setLayout(new BoxLayout(container, BoxLayout.X_AXIS)); - //container.setLayout(new BorderLayout(10,10)); - MockGui mg = new MockGui(640,640,32, num, nodes); + container.setLayout(new BorderLayout(10,10)); + MockGui mg = new MockGui(640,640,32, NUM, nodes); StatGui sg= new StatGui(0,0); //sg.setPreferredSize(new Dimension(1, 0)); //this keeps statgui from overlapping mockgui //container.add(mg); //container.add(sg); - //container.add(new TestGui()); - //container.add(sg); - frame.add(new TestGui()); + container.add(mg, BorderLayout.CENTER); + container.add(sg, BorderLayout.SOUTH); - MapTowerDefense map = new MapTowerDefense(100, num, nodes, mg, sg); + MapTowerDefense map = new MapTowerDefense(100, NUM, nodes, mg, sg); mg.setMap(map); sg.setMap(map); sg.setup(); frame.add(container); frame.pack(); + frame.setSize(650,800); frame.setVisible(true); map.createMinion(MinionTypes.BASIC); @@ -58,5 +39,27 @@ public class Main extends JFrame{ } - + private static void setupDefaultNodes() + { + nodes = new int[NUM][2]; + nodes[0][0] = 1; + nodes[0][1] = 3; + nodes[1][0] = 16; + nodes[1][1] = 3; + nodes[2][0] = 16; + nodes[2][1] = 9; + nodes[3][0] = 4; + nodes[3][1] = 9; + nodes[4][0] = 4; + nodes[4][1] = 15; + nodes[5][0] = 18; + nodes[5][1] = 15; + /*nodes[6][0] = 18; + nodes[6][1] = 13; + nodes[7][0] = 11; + nodes[7][1] = 13; + nodes[8][0] = 11; + nodes[8][1] = 1;*/ + + } } diff --git a/src/TestGui.java b/src/TestGui.java deleted file mode 100644 index c45df50..0000000 --- a/src/TestGui.java +++ /dev/null @@ -1,16 +0,0 @@ -import java.awt.Color; -import java.awt.LayoutManager; - -import javax.swing.JButton; -import javax.swing.JPanel; - - -public class TestGui extends JPanel { - - public TestGui() { - super(); - this.setBackground(Color.CYAN); - this.add(new JButton("Press this and nothing will happen")); - } - -} From cf7ca5dd1fbbeba0c19ab8938fdfe99d2445fc7a Mon Sep 17 00:00:00 2001 From: dwm10005 Date: Wed, 22 Apr 2015 12:45:22 -0400 Subject: [PATCH 3/3] Fix window sizing (really should make the window scalable) --- src/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Main.java b/src/Main.java index 9a7749f..16a4ab8 100644 --- a/src/Main.java +++ b/src/Main.java @@ -31,7 +31,7 @@ public class Main extends JFrame{ frame.add(container); frame.pack(); - frame.setSize(650,800); + frame.setSize(650,720); frame.setVisible(true); map.createMinion(MinionTypes.BASIC);