diff --git a/src/main/java/Gui/gui.java b/src/main/java/Gui/gui.java index e92cfc4..e9e9ad9 100644 --- a/src/main/java/Gui/gui.java +++ b/src/main/java/Gui/gui.java @@ -11,7 +11,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; public class gui { - public static JFrame jf; + public static JFrame Frame; public static JButton StartBtn, CloseBtn; public static JPanel Panel; public static JLabel Label; @@ -23,11 +23,11 @@ public class gui { createPanel(); } public void createFrame(){ - jf = new JFrame("Wer wird Millionr"); - jf.setSize(width,height); - jf.setLocationRelativeTo(null); - jf.setResizable(false); - jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + Frame = new JFrame("MiniGames"); + Frame.setSize(width,height); + Frame.setLocationRelativeTo(null); + Frame.setResizable(false); + Frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); } public void createButtons() { @@ -54,8 +54,8 @@ public class gui { Panel.add(Label,gbc); Panel.add(StartBtn,gbc); Panel.add(CloseBtn,gbc); - jf.add(Panel); - jf.setVisible(true); + Frame.add(Panel); + Frame.setVisible(true); Panel.setVisible(true); } diff --git a/src/test/java/Gui/guiTest.java b/src/test/java/Gui/guiTest.java index 7c8a394..af0d48c 100644 --- a/src/test/java/Gui/guiTest.java +++ b/src/test/java/Gui/guiTest.java @@ -19,8 +19,8 @@ class guiTest { int FrameWitdh = 800; int FrameHeight = 600; //act - assertEquals(FrameWitdh, gui.jf.getWidth()); - assertEquals(FrameHeight, gui.jf.getHeight()); + assertEquals(FrameWitdh, gui.Frame.getWidth()); + assertEquals(FrameHeight, gui.Frame.getHeight()); } } diff --git a/target/MiniGameProject-1.0-SNAPSHOT.jar b/target/MiniGameProject-1.0-SNAPSHOT.jar index dab2b23..a8406a8 100644 Binary files a/target/MiniGameProject-1.0-SNAPSHOT.jar and b/target/MiniGameProject-1.0-SNAPSHOT.jar differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 8d2892b..0961d2b 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Dec 30 01:11:12 CET 2022 +#Fri Dec 30 10:15:22 CET 2022 groupId=MiniGameProject artifactId=MiniGameProject version=1.0-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 03f0c51..e26bf8e 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,4 @@ C:\Users\Leon\MiniGameProject\src\main\java\Gui\ActionHandler.java C:\Users\Leon\MiniGameProject\src\main\java\Gui\gui.java C:\Users\Leon\MiniGameProject\src\main\java\main.java +C:\Users\Leon\MiniGameProject\src\main\java\Gui\StartGameGui.java