diff options
| author | Tyler Ferrari <tpoke.ferrari@gmail.com> | 2023-05-04 02:37:34 +0000 |
|---|---|---|
| committer | Tyler Ferrari <tpoke.ferrari@gmail.com> | 2023-05-04 02:37:34 +0000 |
| commit | 291cf3bbfbd316f6acdb6d686470113ab91f53b6 (patch) | |
| tree | 72ad28111d5c53e47dc5a825730bc88e6f7e638f /apcs | |
| parent | 6a10a65a0dbcd0540202479a02e4f91881791d6b (diff) | |
| parent | a52f89a5092d347797cfd0893fc163233160e9e1 (diff) | |
| download | NPEhero-291cf3bbfbd316f6acdb6d686470113ab91f53b6.tar.gz NPEhero-291cf3bbfbd316f6acdb6d686470113ab91f53b6.tar.bz2 NPEhero-291cf3bbfbd316f6acdb6d686470113ab91f53b6.zip | |
Merge branch 'revert-6a10a65a' into 'main'
Revert "rearange some files"
See merge request guitarheros/guitarhero!2
Diffstat (limited to 'apcs')
| -rw-r--r-- | apcs/Driver.java | 4 | ||||
| -rw-r--r-- | apcs/Gui.java | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/apcs/Driver.java b/apcs/Driver.java index 0b9fba4..a3b4c6c 100644 --- a/apcs/Driver.java +++ b/apcs/Driver.java @@ -12,9 +12,7 @@ public class Driver public static void main(String[] args) { - - SongPlayer s = new SongPlayer(); - s.createAndShowGui(); + new Gui(); } } diff --git a/apcs/Gui.java b/apcs/Gui.java index b6fb5a1..934c371 100644 --- a/apcs/Gui.java +++ b/apcs/Gui.java @@ -5,8 +5,6 @@ *Description: */ package apcs; -import java.awt.Graphics; -import java.awt.geom.RoundRectangle2D; import javax.swing.JButton; import javax.swing.JFrame; @@ -19,7 +17,7 @@ public class Gui { JFrame frame=new JFrame(); // Creating Button - JButton b=new TButton("Click Me.."); + JButton b=new JButton("Click Me.."); /* This method specifies the location and size * of button. In method setBounds(x, y, width, height) * x,y) are cordinates from the top left @@ -30,8 +28,6 @@ public class Gui { //Adding button onto the frame frame.add(b); - - // Setting Frame size. This is the window size frame.setSize(600,500); |