Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero into main

5 files changed, 65 insertions, 6 deletions

diff --git a/src/main/JFXaudioPlayer.java b/src/test/JFXaudioPlayer.java
index 0a2162d..2f12e20 100644
--- a/src/main/JFXaudioPlayer.java
+++ b/src/test/JFXaudioPlayer.java
@@ -1,16 +1,29 @@
-package main;
+package test;
 
 import java.io.File;
+import java.io.IOException;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
 import javafx.scene.media.Media;
 import javafx.scene.media.MediaPlayer;
+import javafx.stage.Stage;
 
-public class JFXaudioPlayer {
+public class JFXaudioPlayer extends Application{
+    
     public static void main(String[] args) 
     {
+        launch(args);
+    }
+        
+    @Override
+    public void start(Stage primaryStage) 
+    {
+        // primaryStage.show();
         String musicFile = "EXAMPLE.mp3";     // For example
         Media sound = new Media(new File(musicFile).toURI().toString());
         MediaPlayer mediaPlayer = new MediaPlayer(sound);
         mediaPlayer.play();
-        mediaPlayer.stop();
     }
 }
\ No newline at end of file
diff --git a/src/main/KeyDetection.java b/src/test/KeyDetection.java
index 7887405..447b101 100644
--- a/src/main/KeyDetection.java
+++ b/src/test/KeyDetection.java
@@ -4,7 +4,7 @@
  *Teacher:
  *Description:
  */
-package main;
+package test;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/main/NoteTest.java b/src/test/NoteTest.java
index 34d9c8c..ce74d56 100644
--- a/src/main/NoteTest.java
+++ b/src/test/NoteTest.java
@@ -4,7 +4,7 @@
  *Teacher:
  *Description:
  */
-package main;
+package test;
 import java.awt.*;
 
 public class NoteTest
diff --git a/src/main/SongPlayer.java b/src/test/SongPlayer.java
index caf1ab7..48f859d 100644
--- a/src/main/SongPlayer.java
+++ b/src/test/SongPlayer.java
@@ -4,7 +4,7 @@
  *Teacher:
  *Description:
  */
-package main;
+package test;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/src/test/focusTest.java b/src/test/focusTest.java
new file mode 100644
index 0000000..bc337da
--- /dev/null
+++ b/src/test/focusTest.java
@@ -0,0 +1,46 @@
+package test;
+
+import javafx.application.Application;
+import javafx.geometry.Pos;
+import javafx.scene.Scene;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
+
+public class focusTest extends Application {
+    
+    public static void main(String[] args) 
+    {
+        launch(args);
+    }
+
+    @Override
+    public void start(Stage primaryStage) throws Exception 
+    {
+        VBox root = new VBox();
+        root.setAlignment(Pos.CENTER);
+        root.setSpacing(20);
+        Scene sc = new Scene(root, 500, 500);
+        primaryStage.setScene(sc);
+        primaryStage.show();
+
+
+        ToggleButton btn1 = new ToggleButton("Button 1");
+        ToggleButton btn2 = new ToggleButton("Button 2");
+        ToggleButton btn3 = new ToggleButton("Button 3");
+        ToggleButton btn4 = new ToggleButton("Button 4");
+
+        HBox hb1 = new HBox();
+        hb1.setAlignment(Pos.CENTER);
+        hb1.getChildren().addAll(btn1, btn2);
+
+        HBox hb2 = new HBox();
+        hb2.setAlignment(Pos.CENTER);
+        hb2.getChildren().addAll(btn3, btn4);
+
+        root.getChildren().addAll(hb1, hb2);
+
+        hb1.requestFocus();
+    }
+}