From 096a3f8ee3cc85c9b8d438ffa6cd8b8d5cf8437f Mon Sep 17 00:00:00 2001 From: Jannik Niebuhr Date: Fri, 1 Jul 2022 21:24:41 +0200 Subject: [PATCH] HA10 fertig und hochgeladen --- spaceinvaders/GameProject/bin/log4j2.xml | 3 +++ .../GameProject/bin/ui/GameUIWithLogin.class | Bin 1019 -> 1362 bytes .../GameProject/bin/ui/LoginWindow.class | Bin 2293 -> 2251 bytes spaceinvaders/GameProject/log/log4j.log | 14 ++++++++++++++ spaceinvaders/GameProject/src/log4j2.xml | 3 +++ .../GameProject/src/ui/GameUIWithLogin.java | 12 +++++------- .../GameProject/src/ui/LoginWindow.java | 3 --- 7 files changed, 25 insertions(+), 10 deletions(-) diff --git a/spaceinvaders/GameProject/bin/log4j2.xml b/spaceinvaders/GameProject/bin/log4j2.xml index f21f70a..2828b66 100644 --- a/spaceinvaders/GameProject/bin/log4j2.xml +++ b/spaceinvaders/GameProject/bin/log4j2.xml @@ -23,6 +23,9 @@ + + + diff --git a/spaceinvaders/GameProject/bin/ui/GameUIWithLogin.class b/spaceinvaders/GameProject/bin/ui/GameUIWithLogin.class index c372f1a0179206c7896435a2011cacf96a309adb..5059659cae081a4c01a5eea2dcec4777c09b74db 100644 GIT binary patch literal 1362 zcmah}Yg5xe6g`_lQ$i3a>bMHN8&pqwWU*CTKn8BI~g&|zCjAdRHFEbmKyJI><%U03C z&~|)IaY-I$Tv2A|Gk5tue`8eZmR&Sfvcj&(7ioqdWfet*Va#+YMT770{Ejf>q0FRp zX4f#i6iN=w=1Z1sxpNGGcp}Hpvfvbih7NS9xWF)RUW+WZIU(t|h%RDR6mFw0!%Wb5YrLDrG_Z zV@>>ZhEN zbTLLw3eay}L5s8#MVfRwtpR$r(T<^=b_rVLr!CCBLjQ#D2ihoz&@<@0>O_xs0@{(; z{jzt|R<@r`4h|inKY4_K%`inHUoe*ZOy2`c(0WzIfdfo#d_*{W^BblWoB#}Xyt?Tb zK{vq+5suD=|8f delta 485 zcmXw!yG|QH6o$Xq0T!0UF$N5H4dxOO?;329IFO5z0xD3DsDfxBSu!GQi6N zCm?_3%onDaaVaQ}NzS1!w@ zrVIKtZ_GEnF#cANI*cn_4?A(vXtq3wFlf$o{X|?_3lhpfS=aIoNY|3NmKsJuzJnLt z;O}Nq9n#l~L|1a#j7goeShtzlx$IKR%bOKK7!}enMx+ZQS&>Pe%XH=+DGR)i4o*T| z%2EjoR6Ds@;awJBS@3x;l}?rPm(Wy|VntZqg=!<48`lcqpU6s=}f aND&wRH3L?8Cj#$fn$oD8;17ZwKK=#$;zTU~ diff --git a/spaceinvaders/GameProject/bin/ui/LoginWindow.class b/spaceinvaders/GameProject/bin/ui/LoginWindow.class index ffffaa74af2b8abb76ecc6bfb97ffdc1ced73dcd..f2c9ee3f4f7780b8729511c2e7e46fe47e789716 100644 GIT binary patch delta 1168 zcmZvc-A|i!6vscmzR<2bZnUGoO6kfd9h4z+IQBxP40XcnbcizXz0!ik@*+=J2Rggy ze7|w|U6~lCH@@7METM%+V&a|A=$)5FZ~O;LyqSsd{GJly5-*-}zTfklbAIRL_dI_F ze+UM?|NHB2fV+ABdSK%E<)4~bE%ws93&lPQAAUWdI_50HJ1usz$Dl5YraJ1j2omyf zP!XEXUd&z^u*-$Txq-81R9h+*THR6IYpd|2RKEapZgSn^I6+2FRhe}v7ZMl&hVg|na$-CDSgu$*1x%0ljDlLw>37p zS}H9`J7e^j5;7L&cvyG1hdal}m})019;I21wDYCO!g}7=9t(U4`v#|t{< z+3(Jg*CU>8{}6K)FH+D8p01{s6rNQ(zY<`9B_E6W6HnN^%*%Sq)0MOpuH~|yRT;O_ zQQTggnaSJs>}s*N7NE?Uk4sv4qwaNH(Q)r+ILT#;*UUJ5xq`jCWXo2r=(4vX^18yR zCz;I_ius%gzh<${oBAv7$I7SAHFTscxg40iJ6g8xXxX`Fms|z8DsSTkUL~0xn>(F%QcvJHxC#ytnr!k?Y zrbG8`a=J>qPDUMaz=X>auW|o{9UT1+KH%U=-6`gfZN{8h&Q?k6L?m`1qNy4Wi7mFH z6QUmx-WKFmknd`oH^ft8@}|@I1(A!iiwx3$pGJ1cHxZCYG!nsLKX;Ijxm9{)L_=ae zO$!;?c#3_@OJJEO*NE|fxPC;OFX&{0F20qpALYvY%t3ykhu=x@2Zy-DVV;oV;`Jdj z&6C1p+>-HWS%E>%2r^4~mgnkA;YJ0Im|(oG#`Drb;xk4>$)ILK^EHYe(k)cRGaFiQ zXp7KDsI*C-r^0@z8lkiOnwhAC=DN_S9(0cF-~xtw8$}$rrMTN b{q%p!9p^3Hmg3%#mr_}}QSiHhUA*@XEDP+9 delta 1250 zcmZvbU2KzO6vuy0+qI>CBY(skAaS0>(oA)e>$Vz$J*dCxij^FHT1|MT(Q z_Wtel{B-ZT?|}n+blr0*WSg5&_>*VT=hGMBrD`@mAD=jy&1H@(6bhwGF>yWhi*uL3 z4%*BiwY%251x2U9HY}^#park?^&0pZ)?S0{w7Te1_%^34rq5;E^edW@h52mWLxh-4 z{eWUe#G(+-rG>y`xhOmmeN!$T+?>R`t+uqs*{7rSE9{ZJDV^n@!2l1Nf2x=oGX1uW zXhMO9K_1ZuA62ydPx^74|B!jcwlg}Wa9NawLmoznxp`dSIhih%s)b@%JL5cIaEx*D z3){i)amDscm5o)(<$}~RK}_Fz!r&=Rns;r9&IwLvf|CZPX_H$@net@zVn+L>45oS3 zoVMR^&X932YyM;3W1nN*3_5za2Hx$Nw$sa3+!TSQX6=o5 zc28{s2wC-V=eM+$3%N;L2)_Gb3N1bQBwJJ}E%+n#V z6(?Ke(ZADu(vN2R(ziXd)aa3R^+|&UXy-7yNJ_x-1Y|dYROQGroqS9epV7@Xa(aa@ zKd_gdCF)nA{6;^25aTb|;XCZ-Ik_&>XtLyaL6EeY7kNoWpsh1v>7l$#T4YV8!VMha zg7N-3uSf~uuQ()18nxid)yaQKuRv+fg0F1BHh}@(`I}r2!(Zpkui0j~-txU;zsbA0 zd^@`QATE&uQu?6q9bzBDA`^_rb4-54xTf3Ixcxu6~( Dt04+- diff --git a/spaceinvaders/GameProject/log/log4j.log b/spaceinvaders/GameProject/log/log4j.log index 4ad64b9..e837921 100644 --- a/spaceinvaders/GameProject/log/log4j.log +++ b/spaceinvaders/GameProject/log/log4j.log @@ -5568,3 +5568,17 @@ 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 +2022-07-01 20:54:00,492 INFO base.GameLoop - GUI starts +2022-07-01 20:56:57,120 INFO base.GameLoop - GUI starts +2022-07-01 21:08:58,354 INFO base.GameLoop - GUI starts +2022-07-01 21:08:59,116 INFO ui.GameUIWithLogin - added new MenuItem +2022-07-01 21:09:01,012 INFO ui.GameUIWithLogin - added new MenuItem +2022-07-01 21:09:33,906 INFO base.GameLoop - GUI starts +2022-07-01 21:09:34,693 INFO ui.GameUIWithLogin - added new MenuItem +2022-07-01 21:09:36,524 INFO ui.GameUIWithLogin - added new MenuItem +2022-07-01 21:10:11,496 INFO base.GameLoop - GUI starts +2022-07-01 21:10:12,218 INFO ui.GameUIWithLogin - added new MenuItem +2022-07-01 21:10:15,314 INFO ui.GameUIWithLogin - added new MenuItem +2022-07-01 21:11:12,787 INFO base.GameLoop - GUI starts +2022-07-01 21:11:13,582 INFO ui.GameUIWithLogin - added new MenuItem +2022-07-01 21:11:26,152 INFO ui.GameUIWithLogin - added new MenuItem diff --git a/spaceinvaders/GameProject/src/log4j2.xml b/spaceinvaders/GameProject/src/log4j2.xml index f21f70a..2828b66 100644 --- a/spaceinvaders/GameProject/src/log4j2.xml +++ b/spaceinvaders/GameProject/src/log4j2.xml @@ -23,6 +23,9 @@ + + + diff --git a/spaceinvaders/GameProject/src/ui/GameUIWithLogin.java b/spaceinvaders/GameProject/src/ui/GameUIWithLogin.java index 6b2afaa..e07b1f3 100644 --- a/spaceinvaders/GameProject/src/ui/GameUIWithLogin.java +++ b/spaceinvaders/GameProject/src/ui/GameUIWithLogin.java @@ -1,11 +1,8 @@ package ui; -import java.util.*; -import javax.swing.*; -import playground.Playground; +import javax.swing.*; import java.awt.event.*; - import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; @@ -15,12 +12,15 @@ public class GameUIWithLogin extends GameUI { protected JMenuItem loginItem; + private static Logger logger = LogManager.getLogger(GameUIWithLogin.class); + public GameUIWithLogin(int sizeX, int sizeY) { super(sizeX, sizeY); this.loginItem = new JMenuItem("Login..."); this.loginItem.addActionListener(this); this.gameMenu.add(loginItem, 0); + logger.info("added new MenuItem"); } @@ -28,9 +28,7 @@ public class GameUIWithLogin extends GameUI { public void actionPerformed(ActionEvent ae) { super.actionPerformed(ae); if(ae.getSource() == this.loginItem) { - LoginWindow login = new LoginWindow(0,0); - - + new LoginWindow(0,0); } } diff --git a/spaceinvaders/GameProject/src/ui/LoginWindow.java b/spaceinvaders/GameProject/src/ui/LoginWindow.java index 8fd4eb8..3933aee 100644 --- a/spaceinvaders/GameProject/src/ui/LoginWindow.java +++ b/spaceinvaders/GameProject/src/ui/LoginWindow.java @@ -1,13 +1,10 @@ package ui; -import java.util.*; import javax.swing.*; -import playground.Playground; import java.awt.event.*; public class LoginWindow extends GameUIWithLogin implements ActionListener { - JFileChooser fc; JFrame frame = null; JPanel contentPane = null; JTextField tf1 = null;