diff --git a/spaceinvaders/GameProject/bin/.gitignore b/spaceinvaders/GameProject/bin/.gitignore new file mode 100644 index 0000000..15c18ec --- /dev/null +++ b/spaceinvaders/GameProject/bin/.gitignore @@ -0,0 +1 @@ +/ui/ diff --git a/spaceinvaders/GameProject/bin/ui/GameUI.class b/spaceinvaders/GameProject/bin/ui/GameUI.class index 92022e7..400ec96 100644 Binary files a/spaceinvaders/GameProject/bin/ui/GameUI.class and b/spaceinvaders/GameProject/bin/ui/GameUI.class differ diff --git a/spaceinvaders/GameProject/bin/ui/GameUIWithLogin.class b/spaceinvaders/GameProject/bin/ui/GameUIWithLogin.class index 38ba7d9..c372f1a 100644 Binary files a/spaceinvaders/GameProject/bin/ui/GameUIWithLogin.class and b/spaceinvaders/GameProject/bin/ui/GameUIWithLogin.class differ diff --git a/spaceinvaders/GameProject/bin/ui/LoginWindow.class b/spaceinvaders/GameProject/bin/ui/LoginWindow.class index 3d0ac11..ffffaa7 100644 Binary files a/spaceinvaders/GameProject/bin/ui/LoginWindow.class and b/spaceinvaders/GameProject/bin/ui/LoginWindow.class differ diff --git a/spaceinvaders/GameProject/log/log4j.log b/spaceinvaders/GameProject/log/log4j.log index dbadd14..4ad64b9 100644 --- a/spaceinvaders/GameProject/log/log4j.log +++ b/spaceinvaders/GameProject/log/log4j.log @@ -5559,3 +5559,12 @@ 2022-06-30 15:04:29,495 INFO base.GameLoop - GUI starts 2022-06-30 16:48:22,817 INFO base.GameLoop - GUI starts 2022-06-30 16:49:00,156 INFO base.GameLoop - GUI starts +2022-07-01 10:58:42,860 INFO base.GameLoop - GUI starts +2022-07-01 11:00:50,737 INFO base.GameLoop - GUI starts +2022-07-01 11:07:20,302 INFO base.GameLoop - GUI starts +2022-07-01 11:08:49,325 INFO base.GameLoop - GUI starts +2022-07-01 11:13:36,261 INFO base.GameLoop - GUI starts +2022-07-01 11:13:58,459 INFO base.GameLoop - GUI starts +2022-07-01 11:16:20,950 INFO base.GameLoop - GUI starts +2022-07-01 11:17:51,360 INFO base.GameLoop - GUI starts +2022-07-01 18:39:59,465 INFO base.GameLoop - GUI starts diff --git a/spaceinvaders/GameProject/src/ui/GameUI.java b/spaceinvaders/GameProject/src/ui/GameUI.java index 372e83a..8562fd2 100644 --- a/spaceinvaders/GameProject/src/ui/GameUI.java +++ b/spaceinvaders/GameProject/src/ui/GameUI.java @@ -47,7 +47,6 @@ public class GameUI implements ActionListener { protected JMenuItem saveItem; protected JMenuItem quitItem; protected JMenuItem aboutItem; - //protected JMenuItem loginItem; protected JMenu gameMenu; protected JMenu helpMenu; @@ -108,7 +107,7 @@ public class GameUI implements ActionListener { this.loadItem = new JMenuItem("Restore game"); this.saveItem = new JMenuItem("Save game"); this.quitItem = new JMenuItem("Exit game"); - //this.loginItem = new JMenuItem("Login... P E N I S"); + this.playItem.addActionListener(this); this.loadItem.addActionListener(this); @@ -116,7 +115,7 @@ public class GameUI implements ActionListener { this.quitItem.addActionListener(this); this.gameMenu = new JMenu("Game"); - //this.gameMenu.add(loginItem); + this.gameMenu.add(playItem); this.gameMenu.add(loadItem); this.gameMenu.add(saveItem); diff --git a/spaceinvaders/GameProject/src/ui/GameUIWithLogin.java b/spaceinvaders/GameProject/src/ui/GameUIWithLogin.java index fc93c8a..6b2afaa 100644 --- a/spaceinvaders/GameProject/src/ui/GameUIWithLogin.java +++ b/spaceinvaders/GameProject/src/ui/GameUIWithLogin.java @@ -1,6 +1,5 @@ package ui; -//einfach erstmal alle Imports der Elternklassse mitgenommen... import java.util.*; import javax.swing.*; import playground.Playground; @@ -19,9 +18,9 @@ public class GameUIWithLogin extends GameUI { public GameUIWithLogin(int sizeX, int sizeY) { super(sizeX, sizeY); - this.loginItem = new JMenuItem("Login..."); // legt den button an (mit String name) - this.loginItem.addActionListener(this); //added den listener - this.gameMenu.add(loginItem); // added den Button zum Menue + this.loginItem = new JMenuItem("Login..."); + this.loginItem.addActionListener(this); + this.gameMenu.add(loginItem, 0); } @@ -29,11 +28,8 @@ public class GameUIWithLogin extends GameUI { public void actionPerformed(ActionEvent ae) { super.actionPerformed(ae); if(ae.getSource() == this.loginItem) { - System.out.println(); - System.out.println("test"); LoginWindow login = new LoginWindow(0,0); - //JFrame login = new JFrame(); - //login.setVisible(true); + } diff --git a/spaceinvaders/GameProject/src/ui/LoginWindow.java b/spaceinvaders/GameProject/src/ui/LoginWindow.java index e45b77a..8fd4eb8 100644 --- a/spaceinvaders/GameProject/src/ui/LoginWindow.java +++ b/spaceinvaders/GameProject/src/ui/LoginWindow.java @@ -42,7 +42,7 @@ public class LoginWindow extends GameUIWithLogin implements ActionListener { this.tf2.addActionListener(this); this.login.addActionListener(this); - this.frame.setSize(200, 200); + this.frame.setSize(250, 200); this.frame.setVisible(true); @@ -64,4 +64,4 @@ public class LoginWindow extends GameUIWithLogin implements ActionListener { -} +} \ No newline at end of file