aboutsummaryrefslogtreecommitdiff
path: root/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java
diff options
context:
space:
mode:
Diffstat (limited to 'PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java')
-rw-r--r--PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java b/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java
index 7a7010c..f76c033 100644
--- a/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java
+++ b/PunchingBag/src/uk/ac/open/punchingbag/PunchingBagGUI.java
@@ -53,6 +53,7 @@ import javax.sound.sampled.UnsupportedAudioFileException;
import javax.sound.sampled.AudioFormat.Encoding;
import javax.sound.sampled.Mixer.Info;
+import uk.ac.open.punchingbag.examples.Keyboard;
import uk.ac.open.punchingbag.examples.SimpleKeyboard;
import PicHelper.ImagePanel;
@@ -64,7 +65,7 @@ public class PunchingBagGUI implements MouseListener, MouseMotionListener,
Debug, Menu
};
- Mode currentMode = Mode.Menu;
+ Mode currentMode = Mode.Debug;
JFrame frame;
@@ -94,7 +95,7 @@ public class PunchingBagGUI implements MouseListener, MouseMotionListener,
public static void main(String[] args) throws InterruptedException {
new PunchingBagGUI();
- new SimpleKeyboard();
+ new Keyboard();
}
PunchingBagGUI() throws InterruptedException {
@@ -146,7 +147,7 @@ public class PunchingBagGUI implements MouseListener, MouseMotionListener,
programOptionsPanel.add(new JButton("Debug"));
frame.add(bagDebugingPanel);
- frame.add(new DisplayPanel(), BorderLayout.CENTER);
+ //frame.add(new DisplayPanel(), BorderLayout.CENTER);
frame.add(programOptionsPanel, BorderLayout.SOUTH);
setMode(currentMode);