From d4bf141426192e2bd254fc43e58350071e3df2a3 Mon Sep 17 00:00:00 2001
From: fdai7222 <janosch.bisiorek@informatik.hs-fulda.de>
Date: Fri, 1 Jul 2022 18:44:28 +0200
Subject: [PATCH] ha 10 fertig (kommentare entfernt)

---
 spaceinvaders/GameProject/bin/.gitignore      |   1 +
 spaceinvaders/GameProject/bin/ui/GameUI.class | Bin 5217 -> 5217 bytes
 .../GameProject/bin/ui/GameUIWithLogin.class  | Bin 1178 -> 1019 bytes
 .../GameProject/bin/ui/LoginWindow.class      | Bin 2293 -> 2293 bytes
 spaceinvaders/GameProject/log/log4j.log       |   9 +++++++++
 spaceinvaders/GameProject/src/ui/GameUI.java  |   5 ++---
 .../GameProject/src/ui/GameUIWithLogin.java   |  12 ++++--------
 .../GameProject/src/ui/LoginWindow.java       |   4 ++--
 8 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 spaceinvaders/GameProject/bin/.gitignore

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 92022e7b23cbba74d5a1018d1628f95256a38261..400ec969ef2af17f88b894a9932d6eef3e2fa412 100644
GIT binary patch
delta 429
zcmW-dOGs346o<bP-SRa$Gin7PQUfUoEfm2Q3>FbBW>?@y5jdHkg=UDF+7&4YUs!);
zVPvHXp(LE}0fQ7+V!2Rc+z4jlEz{IYb1(Sk?tbT-k8?Pmm1$*$RukmnsFiT+h<S~p
zq!Y^-5;;dQS)8H-4>!2LO^ONN;|`@%P);SaRAF+LF7DAs4FlZgt?qu{0b%Nxp`Hj0
z{GgF79`c_i4rq}$9?3~e@z5q&JeC}uND=LFxqzqQqeDvRlrp-dnjWdASK4?cL7vM1
zO5PKcFfU|^moiJgEbvN}c&*+fmCK+qU8(A{Gh2r26wv9Noray~jS-F$va4NZzGIXa
z#z<nE6HKUF*HsDYnb-KJsZTbw<jQkQ>FTqV@r6{TRhqj{zA3*u+nCd$=2fpd*NA9h
z(dMJ>E&np{eAio7NYig;5Y-A-$;aXnKe@s$uCvB1esi03t!jg2{?N)MJz7y8+w}97
VVRo3{ACv6r%X@rfU!6_y9s=ncc~bxY

delta 429
zcmW-dTS(J!6vsa&n%y+F)hdu7DyTH*!4R?pi4oz0k3MXmLM92`sKl-~DJrC4=}(1_
zdBF#f5lqx%1&Nl4FBRFt9%^%WDQ}th9C-M@ea|@`&N+ON`N{mqQmS~zlc^~O0_7Ye
zlOtqtoLo-e;S4@<sNfuxT;@7u+`vyQHPms7dIB^Mq>)$LWJo)s+-8hsqO|adyL{sw
zaqhFh19o}He_G`z0Xa>Z<nUNLJdyJ}m13UBm5a1X8PCN}P_EG-O}vmhbjl;Tqz5BI
zbjxdcB}$*n5RwJ@<tqacW6%ty*T}F5I9w*fULYe@s@4>?QrLdh7U2+MR<&a<N}J#?
zlce*8Q%spcN2$EkS&8kvQqvX{b6iN9)#`)F_=t-+<91$>1><uT*gmVMFXpAQ(6*?=
zcZ*LrH+(-h#!uZE$4!DfmQ-PqB7WgznX9Z&&MH-`smkA~>yIi~r%m;Au&ENa2(e9=
Uzxvk>@A#+JcbR9;WS=bA2QbNbs{jB1

diff --git a/spaceinvaders/GameProject/bin/ui/GameUIWithLogin.class b/spaceinvaders/GameProject/bin/ui/GameUIWithLogin.class
index 38ba7d950bd48abaaff12e638d6c0ec1125b40ad..c372f1a0179206c7896435a2011cacf96a309adb 100644
GIT binary patch
delta 311
zcmZvWy-LGS0ENHgs-*!%tftsd73xo$h*|1y-JA+_F5(oZNCcA()eH_kL~-c@xEG`a
z1s}lo@F@iG)Su1eaL&2+p6?FwA35jk^Z6C1b3Am;tstnjuA<v0jIv&Ml3sVy<Ra-c
znzeu0{)6>i%&}`RcN2%L^fFG`aneaMhkD;NclnGdjJ9k2fvMb^5#{z!(WWAGnU*dx
z!x9B0k0Mo;Sy#LE^NbBPl{CPX&a7`&le6W00%=}d=NIGo!I<q}#E$<&;gQ)F>SxA`
t**g`ssm%#@LARkS`U>-`QW9~(bhV0p@yGPo=Rkx*wFavsdn9Yq_yRULG2Q?G

delta 433
zcmZus+e!ja6kTV=nj9oVQA@F#U1l_z9_(rtE4v#6LJ~nRkjRA2gpNk_;1Bd7^VSFS
zZo~)$eL$blZv@evDSGN<vG!hP?X}LQ@Zc5Szh2$|q>=B4XN;Sb+Sv$`+u1?OVjnFp
z=CB}Op22^qHdUpf>Sd*HQ#VUh9~QC1z#9#dA(VGz%}|bOnr;@%T1l;DL}aikV1*(0
zkL<%5))|B=$5GMglq8?@VS~YAmg=Tsj&C`S0s^)f`Wu>(H_Dn`)btDET13ve=kB~s
zc)-&KB+JhyS~lXv4ow^qgkkg$hR{nahzMdBz!ahwr|rm(3lo^6iTtEUU@nu1am15I
z5qfEN`<o&sQ(a7_Y|JE|5qw1K327V4gn_J$&GT2}PI<nIog=3O@3x3iJ}^XGhT*5&
iFh*$_qYTMy5~eIb{%ay*7kiYu?_OX|sRN=M4!;2~uS%By

diff --git a/spaceinvaders/GameProject/bin/ui/LoginWindow.class b/spaceinvaders/GameProject/bin/ui/LoginWindow.class
index 3d0ac11bf253608b681a1b3069448c98dd851648..ffffaa74af2b8abb76ecc6bfb97ffdc1ced73dcd 100644
GIT binary patch
delta 14
Wcmew=_*HPj1a`(>n<uiTFaiKGGzI?v

delta 14
Wcmew=_*HPj1a`&~n<uiTFaiKF2nEdm

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