From da0a2beeeca756fcc60fb1e12dc55384bdb1e310 Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Sun, 2 Feb 2020 17:45:13 +0100 Subject: [PATCH 01/11] Commit_21 3x Label(Betrag, name und Betrag) hinzugefuegt --- .../bin/MeinBudgetView/MeinGui$1.class | Bin 738 -> 738 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 5975 -> 6258 bytes .../src/MeinBudgetView/MeinGui.java | 15 +++++++++++++++ 3 files changed, 15 insertions(+) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class index f37b81ec5e3bf2838646230714867b902d9db29f..3aee88919b2a034d79a94491b4da2c1c46af3a21 100644 GIT binary patch delta 35 qcmaFF`iOOd3KOI0WL2h6K??>B21^EB1}g?Z25SaU2HVNqOyK~IMh4IT delta 35 qcmaFF`iOOd3KOHzWL2h6K~n|}1~Ud;26F~M1`7sJ2CK>4OyK~HG6uc? diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index cb6a157f8292a6ada5513ce3d94ebc4f4fef8ff9..bf994de53c4b31f1d61510e6331951c318786d4e 100644 GIT binary patch literal 6258 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 literal 5975 zcmai233yc175?wcOJ?$Tftkn_P(<89SOVHA8bk>M42B?!!HC;S@(2TyndvM9+_h@8 z?ppV{)CI*VYJf>JYOPSj9l^TRrHa~C>(W-+y43#XzBiLe;QPc+&Yg45Irr@6Jf8jE zqfY=hL>&}>Phsd>Clag4w6;0v#)#8VB|m3pA^{i*Wy|fA_NuB>MmqCHs2yu@ z(jIbmhVr)8PgR2+49CT%bpcTz3OoI2^>$ifKCGfZjRl!l%x;c4T9HBZ zk(kqvX{YxV36fE&kGI&-Mmrgi-yYJilWi$JxEpg!__2QwKcSXx5|~gp#KNJNLVu;4 z^rA>wA6nmUEEwd#!3^O02X_RkW*!jTN6Pv(f>7GRhVeR5;16s zIN~G=d!Q_cQxqUKwuNR1muR{u9*-`HB&5{kYMMBJS+x{xOh3D|RiUy#of+}=L_Egi zs~+p7m}^rG8AOD6u~65pJiNj}7-a#pvo;DNFel$xOhnyaB`lP{l%G@~ij;-4B#Eh= z8O^lEQX+7rg#j=FSk*uBy6Kqcz!D)l-9iYZ0i4M^EPPk@n>uzx6KCVx0M21G>!Q*H zJFj`U(~`Du9)3<&vI)&hI&i&(8*n4biyjvjqA}-kjjZDS35Wl4_a?Lr22l#+DY$Pupv|yn$h=-Y2 zRqagV)e<+kS#M#W+-&4iRWf5!6C$)%u7l`enlv~aqxG075ci0MLBiA{OmjtC0n_7D zWO^pm#%V}xe@79ukytvp>8>_sv^%ln-QQanEFw0Mx_(nuk1xUh!NL$J*{A8)TF$ak zQ?Soi7%JH3#4JabSr9Mq$E1mqM!$dF{X+ASg<&X_)5{iyyQdu%%H7i+EsS!@jFF1s zbqjCcO?r}*-hXq*<)=h>ce{m-Pa|GuyG}2Quug{8?|!&(To*@VRhUF4^iMt+!Fov3 zJ36u~6W7lg%T&|9av@c)3Zsyd%-zL(f*Xo^I5;m@f*>hFH#LjTWM>#;>ow_EC%H79 zY2QAl0$;Yr!c`wv_3nc zYiI$=Q>j`+jI-2uaZ)fHci*A3q?6*_BwD`KJ$@@HL)+lQV? zP73=lA^iNmhzo*Gwk3Xzl*k~~kfW9m(la$=ht!ZwPeaaF4LRdAdS# z5tc|_(vV$AL-r&MnQ9s`bu?sh5c;H35eCV*H%3#-efaAz;}{Y(3(gh=-@dy=4bI|cB8(`ZksC9MWS%zDiA-o}7~k|I&bY)GO-uzkn#xY@!s?AUtp{f`Rc3Kk z+4)&q*o8~8xT2m9X#BV?T$9Ch?$4W=%6@HxO1p4t7QYcx$n=LALq}wBwRY7oWbpNCMR(%D){|-IA#-jH0JQX#W)71@*_Bb zx%|eMhl}}TdjsazbencGIcSQt81`A-Oic37BRH}arG1u>Ukv9Ye=aNkyf8$rTPvX zzA#q#_Q7es$vEA21kUu$!CAgjaJDawbA4yyJl`ca-**Ep@I8PFeUIZJ-wU|d_XaNU z?ZlHiXU8Nl7f0Ni5?!@b5>tTm?KK4S*%H|F61!^S!zfd`G# z@vw0rI*lu^-nbnbjQg?C*oZFUF?1W7@QCpo9yNBL$9M~m86V&YJ);ut9KxUQHb>Mb z{}#N1cey0B`p?089FRVBjekD=%#&Yj@K3_~JQ?aW+VlZWMZU0a2X>O9*msKW0({6* z!1sXfP<+Hw(6^HV@nh1J_}8jx{Dmi3GXKhm>2azCaAL~Lym4F>pD=;8u0en~^QHH5 z^BNR)<6nBl{JR_9u2;&tS-u9tiQa-TX5kiCtf6k@&#GeY{=_wyt?#Gn`|3`mc*sJe zw60erEU<1hfb@CUh1UaFN8KvKYe`-|WVjzf<$+Cf*JdW}7A~kyGkKroKaV|!qwqZH z@Dh`D8EQ6LT9=E3b6_C7KK z#eC##YW5EQ9phbo#l45oOo0jpU)CB?p+wel@2S~(hXcxc)W{|}x?AnlrS{!J?Uz*t zWL4!cl@DpA-VNy^u3{hO^&iF@o1o;jM0R#h=rOcW9I%%ww1je7e^l@%+}u9R3m#b@ lm}~y-wH^4QLcgH4U*?7OYU@+l8ETT6Og$y9#}M+*{{aDfB4Gdk diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index 564b0f8..98b1ca4 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -42,6 +42,9 @@ public class MeinGui extends JFrame implements ActionListener { public static int expenses; public static int balance; private JTextField textExpensesName; + private JLabel ausgabenName; + private JLabel ausgabenBetrag; + private JLabel budgetBetrag; /** * Launch the application. @@ -179,6 +182,18 @@ public class MeinGui extends JFrame implements ActionListener { textExpensesName.setBounds(60, 221, 128, 20); contentPane.add(textExpensesName); textExpensesName.setColumns(10); + + ausgabenName = new JLabel(" Name"); + ausgabenName.setBounds(10, 224, 46, 14); + contentPane.add(ausgabenName); + + ausgabenBetrag = new JLabel(" Betrag"); + ausgabenBetrag.setBounds(10, 253, 46, 14); + contentPane.add(ausgabenBetrag); + + budgetBetrag = new JLabel(" Betrag"); + budgetBetrag.setBounds(10, 100, 46, 14); + contentPane.add(budgetBetrag); text1.addActionListener(this); text2.addActionListener(this); From af406391f95bd4ed20f7a00ae5f6c8e3affd3a59 Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Sun, 2 Feb 2020 17:47:02 +0100 Subject: [PATCH 02/11] Commit_21 3x Label(Betrag, name und Betrag) hinzugefuegt --- .../bin/MeinBudgetView/MeinGui$1.class | Bin 738 -> 738 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 5975 -> 6258 bytes .../src/MeinBudgetView/MeinGui.java | 15 +++++++++++++++ 3 files changed, 15 insertions(+) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class index f37b81ec5e3bf2838646230714867b902d9db29f..3aee88919b2a034d79a94491b4da2c1c46af3a21 100644 GIT binary patch delta 35 qcmaFF`iOOd3KOI0WL2h6K??>B21^EB1}g?Z25SaU2HVNqOyK~IMh4IT delta 35 qcmaFF`iOOd3KOHzWL2h6K~n|}1~Ud;26F~M1`7sJ2CK>4OyK~HG6uc? diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index cb6a157f8292a6ada5513ce3d94ebc4f4fef8ff9..bf994de53c4b31f1d61510e6331951c318786d4e 100644 GIT binary patch literal 6258 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 literal 5975 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 diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index 564b0f8..98b1ca4 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -42,6 +42,9 @@ public class MeinGui extends JFrame implements ActionListener { public static int expenses; public static int balance; private JTextField textExpensesName; + private JLabel ausgabenName; + private JLabel ausgabenBetrag; + private JLabel budgetBetrag; /** * Launch the application. @@ -179,6 +182,18 @@ public class MeinGui extends JFrame implements ActionListener { textExpensesName.setBounds(60, 221, 128, 20); contentPane.add(textExpensesName); textExpensesName.setColumns(10); + + ausgabenName = new JLabel(" Name"); + ausgabenName.setBounds(10, 224, 46, 14); + contentPane.add(ausgabenName); + + ausgabenBetrag = new JLabel(" Betrag"); + ausgabenBetrag.setBounds(10, 253, 46, 14); + contentPane.add(ausgabenBetrag); + + budgetBetrag = new JLabel(" Betrag"); + budgetBetrag.setBounds(10, 100, 46, 14); + contentPane.add(budgetBetrag); text1.addActionListener(this); text2.addActionListener(this); From 6794df143c72fcba4f625cc047712fbe0677d9dc Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Mon, 3 Feb 2020 15:04:48 +0100 Subject: [PATCH 03/11] Commit_22 --> Methode Aenderungen->leerButton() --- .../bin/MeinBudgetView/MeinGui.class | Bin 6258 -> 6253 bytes .../src/MeinBudgetView/MeinGui.java | 11 ++++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index bf994de53c4b31f1d61510e6331951c318786d4e..3c5ffdb501d6cb762b0eb0e4886981b0a5d9bde3 100644 GIT binary patch delta 92 zcmexl@YZ0%cQOA61||j&P}#&##JG)7eG@|kgt`c%gf}rCI&+wDaF7B eB;PQwGrVQsV|d3P%J7~+hT#K)@@8*wbw&W7q8Anb delta 81 zcmaEB@X27qcQL(K1||j&(A>mOB$T*~QGF9b1(d!BqJ=jxT!zwDg%T$#h>HqxFuY|D WV0gzM!SJ3zf#Cy##%4Ehbw&XDEf;wJ diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index 98b1ca4..cde50bf 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -233,11 +233,11 @@ public class MeinGui extends JFrame implements ActionListener { } public static void leerButton() { - text1.setText(""); - text2.setText(""); - budgetDispaly.setText(""); - expensesDisplay.setText(""); - balanceDisplay.setText(""); + text1.setText(null); + text2.setText(null); + budgetDispaly.setText(null); + expensesDisplay.setText(null); + balanceDisplay.setText(null); } @@ -255,4 +255,5 @@ public class MeinGui extends JFrame implements ActionListener { String result = balance + " €"; return result; } + } From a65f7127f90c48d08e43c292fa5caf4179d9e656 Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Mon, 3 Feb 2020 15:39:05 +0100 Subject: [PATCH 04/11] Commit_23 JTable hinzugefuegt --- .../bin/MeinBudgetView/MeinGui$1.class | Bin 738 -> 738 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 6253 -> 6623 bytes .../src/MeinBudgetView/MeinGui.java | 44 +++++++++++------- Hinweis El Boukhari.txt | 7 ++- 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class index 3aee88919b2a034d79a94491b4da2c1c46af3a21..aa9e0ef08f89fc41cf34292298b93a824c5eaa8a 100644 GIT binary patch delta 35 qcmaFF`iOOd3KOHnWL2h6L2CvM1{(%m23rO}20I2(28YSrOyK~JS_a|( delta 35 qcmaFF`iOOd3KOI0WL2h6K??>B21^EB1}g?Z25SaU2HVNqOyK~IMh4IT diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index 3c5ffdb501d6cb762b0eb0e4886981b0a5d9bde3..4e78d04b844be59911855831c2e9ab9366e25d9d 100644 GIT binary patch literal 6623 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 literal 6253 zcmai233yc175?wco6KZ*ftkn_P>g#BOF%0s0g*t!U=kD%O;zwE^9UoeISZQ$YF(>! z*P>Oct)<5p=wrM4=iR$CRRwpv@QZMCgy|8w7)$t3W7=KGTS-nr+TdzSy4 zdtRRV;?XAnOjEP`@Fg08PF6xJ&P7Vys@l zm$lbsrz(sdxV?nbc~LtSDX<)^5Q6UaWn=^-SOvFQ znFj^a%4Is~cEWibT6k@+vuUf7`;OAWs}Z-NG;(CkS=zfg2BWiXaW>7=){kFG>*pjR z%&=_|zbdK#hst#nl0U7}&7 zJ2O0RKkfwKMNI(5(Mkt1K`5MHVmc&=89TcqniahxN^K~HLYQZoI1#fL3Np{NS6I1N zc1|pru@|Q7v?W+)ylR@nafR6?8ZbwpoV*RmTp~iN{54Jd8Nbwz#=%vj;UC0Y)Ra^B zWD|Y_{8*qcuCz+plj(?^u4{~^vg;c3a}Z5vmf+73;Z_q1acbdE;iUq{okG33DjaD> zR%~5lVlkEwfwXl_X^j@rAvG-<#EPBPLUXay#2Gl#Ijh-Pm&_65W8KgRze8)W5-d!S z@#E_*5DKO&a7rkEvl;&ew}^sh!!mKGUIKBhi33m>K)V8DCt|{ubcv-)lF8VTXi7SR zY|WMctTYkDd4!)8i73>Tm@_9CPbCusU;TIoVvbJ*VgNDXVzDlDIXGb=j7mRJtc}tP zEGRajAd*h9GA7CqlvkRN#A*|31SCNn%vdg-$cVyqCWavB#|48kuX|Jw>#dXt_;pd~f?e2tp52i(aRshqDA}{;#H@^zL5=II=F-Ia z0Ip{I>YO%UrBahqiOwLtiR=8hmTjqDsb)9vEnLqkrOrimCYeijutE;qUxhePP1xDG z(-$?@2eAP+N*Zrc2)pcsJptVY++yNZ+~$~D=*R_gB{!O;^?Y0OY!q+$Gw1AzruDef z#CLEP%Zm}05EV6CF%wiD5#~6|x?)19*@Tb(&2zFVIe#eK~-K7?Q>e+c62TWOZZ2&Sb0r ze!^H3dU*hk@BsI25?pkdFi{b}RsyRoP9U$7yva`9#8BDk91@D@F-!@ zYOkr*w_1t1$4m?pp(jMBMbwoDJw-!iySGRHPg6x>G?7hjyT8+}b}l$M_ZKFHi;C^! zZr+yHx1G?RF)>0)_BjT&kyl?uP^iB$F;b|%7Po9&W&ymwmnoB{RPVj)A>nz+#3)qA z({D|TcAkD`qRM&ty@_#7nMDHl0|$j_x#5KSH4_JmC2vq&wR5ov`Arkmj_99E9D)id z&bLkc8Gm8?*&havCk0dsHug8b=&ZKkZ8rJr$|$RAbo2hNME0k$sLUf%7`nlbm3v-K z0*tA~1B=Vaj;0cz`mF#2Uf89%D`@6`STXzXnfMH!^9o>hSnT$O;e{G5X-uqQg)dF^ z@LIxG<{_u^ldL?Z@@ldmt3XaFpQ*}}pDs|fv|P@M0~EV88C2zJh+hSn(f-EO#3_?^ zj;TylL2#z5bjBvF*cJv3IZech8fIb)#)>^*Q&q~r6>KI><;wiax>v(ZHA3zlX)|Jy z$c-{_pd(jhsxcxrjJt*8iKK8HXyPD;Yn-VL7B0EJ+;S8q1&_rn9oP?+eL~HHD;8(1 zj#VvIO3yk$b+|gxuZ|dS5iDNEVLL9hHj8jq!~JSJn^}KooUk?IqA|_}K{Y{5@~eph zHR##TRFhR5U0rR(a`wU%61t|+tE3qI8Y~Mag3yp64yqdUHB%j{rV*9AS_nRcNiNU^ zOqPzLB_!9RdQow_sZNj}1+q!!9BND38BSX=^bK}~feAX`n-`Vw&2&FiCJQ59n-ZK^ z^j&6W*akQo@Ylx(d1S`oCr`Ot-+JW*%@xvV^~%1gSGG#M@@Cd6Cj-55G|?;jpkCSc z^vX`hwOqQHUfIj^%1)+NLQSuPj$R24t{&-cdSy4$E8CY|*}S+0sPRx7M(Ypf+X>`n zL19QAj%e$_QN5V3Su;=N-yk=EW4X@4(R?x;Rvd$`@lElLt98`)H!=uA0N=9O9voX+ zIW3RlYs>POQ5%YcB4N+z=J%ngEx?~1oRUXNt&s9KO%|2M z>11wet30a*=X7H^iOVakJUZkd)EZV*p+sm@9xH@fXnAy=;Yh5~5^)maq1MpF1Nq{@ z*M}snIDZS$T}X#!gsdIx-VO!O+R{lP+k9iADBlWN)1m#+RW$XmV(% zyFaP8|1kHb8&yVFT}h7PiyT!(k>#ht;;Zt7JqHg^QsontQja$mJ>F9EczPMl*Be!3 zMV~i|K_h9eJy+8*!M7N9o0 zQAG&4`REfrM}`h9wXLrhj3*@+Qnh3Wo8s(5(IdmiJrmb8W#k9=2_eoRGq5 zRTv+KGDT4#y28Z&FEyHXkhp_26jtF-TPf~$^m9I|Id_tCXIQ;2oXbl&cNU#^UYrP4 z1qT^Z6%4D-#FW#Drc|*4q+AHR-%w}^UhKk)T8w}-9q^GN>0Cs_7Vt&VAh}&#*tL(` zEci<`U^xWzjLw|XbxHt&hJ-MauAy=UMK?@HY1&EhWarMTOB zGw$);gL}OX;6Cr8_@4J!eBZkZKk&YRP2LajLj(AcF$519qwr&6JRUNR$HT@P{M1;8 zM+^&_jTE|!3$WF=65YlP$Q$>f$9M?6MmHWco<^VX5*{;N#}meTc+&V3Px<_K+BY2A ze23u|zB+98O~Ve~Og!Uj#IwE@Jm)(dJALQid3}SXoLds_GSX1vjFa#l{>ITR;{61F z=k@GSw|IBreLi{BR_}xOfKP^c*?SfK!6%<5>}|n^lqmBo_k4+e^2zUc*s~e`;#0u$ zmS;WwO}=vP1FD;OtROZNKE{8XTUrg_eJ(fp9TW2SFG03*6a2*07w+qhO(^SC#8x`5 zj9wMkqK3LV@l6;_@^(}bsoP<)!h2OHuMTkcmv7P+=XT82`}JLFC?6axku7Q@%fDBR zCVx?P>GoJwd9ON%+X8SeWb~LumbWaMkk#h%af{BoY>T%d=9`ERx#mImW7h<2q!QcX!zez?)tpF>ab#! zF?yot9ah=9CG(HZRa`D#9Ik>hH79U59aMRB6y0-{7rD^uUCy#wmVW(XP)7aCA#*>J zSs%fCAIMA}#vIGMC8w9mcZ7S&d_8mmReh?ajWO<3wLNOe0cvVq9g|nbol^UV7Lxcm zrhmlQ@#CWDqX@6*s$MJQM~18P6uKwAALJ+~{2w@yVYmPQ diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index cde50bf..970035b 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -20,6 +20,8 @@ import javax.swing.JComboBox; import javax.swing.JTextArea; import java.awt.Color; import javax.swing.JSeparator; +import javax.swing.JScrollPane; +import javax.swing.JTable; public class MeinGui extends JFrame implements ActionListener { @@ -45,6 +47,7 @@ public class MeinGui extends JFrame implements ActionListener { private JLabel ausgabenName; private JLabel ausgabenBetrag; private JLabel budgetBetrag; + private JTable myTable; /** * Launch the application. @@ -75,8 +78,8 @@ public class MeinGui extends JFrame implements ActionListener { contentPane.setLayout(null); this.berechne = new JButton("Berechne"); - berechne.setToolTipText(""); berechne.setBounds(78, 281, 110, 23); + berechne.setToolTipText(""); contentPane.add(berechne); this.senden = new JButton("Senden"); @@ -94,16 +97,16 @@ public class MeinGui extends JFrame implements ActionListener { text2.setColumns(10); labelHauptImage = new JLabel(""); + labelHauptImage.setBounds(10, 0, 86, 61); Image image0 = new ImageIcon(this.getClass().getResource("/budgetapp.png")).getImage(); labelHauptImage.setIcon(new ImageIcon(image0)); labelHauptImage.setFont(new Font("Tahoma", Font.BOLD, 13)); - labelHauptImage.setBounds(10, 0, 86, 61); contentPane.add(labelHauptImage); JLabel budgetEingeben = new JLabel("Budget eingeben"); - budgetEingeben.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); budgetEingeben.setBounds(10, 72, 110, 20); + budgetEingeben.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); contentPane.add(budgetEingeben); JLabel labelBudget = new JLabel("Budget"); @@ -119,34 +122,31 @@ public class MeinGui extends JFrame implements ActionListener { contentPane.add(labelBalance); labelBudgetImage = new JLabel(""); + labelBudgetImage.setBounds(255, 22, 46, 55); Image image1 = new ImageIcon(this.getClass().getResource("/money.png")).getImage(); labelBudgetImage.setIcon(new ImageIcon(image1)); - - labelBudgetImage.setBounds(255, 22, 46, 55); contentPane.add(labelBudgetImage); labelExpensesImage = new JLabel(""); + labelExpensesImage.setBounds(400, 22, 46, 55); Image image2 = new ImageIcon(this.getClass().getResource("/wings-icon.png")).getImage(); labelExpensesImage.setIcon(new ImageIcon(image2)); - - labelExpensesImage.setBounds(400, 22, 46, 55); contentPane.add(labelExpensesImage); labelBalancetImage = new JLabel("New labelBalance"); + labelBalancetImage.setBounds(543, 22, 34, 55); Image image3 = new ImageIcon(this.getClass().getResource("/Money-icon.png")).getImage(); labelBalancetImage.setIcon(new ImageIcon(image3)); - - labelBalancetImage.setBounds(543, 22, 34, 55); contentPane.add(labelBalancetImage); JLabel budgetAusgeben = new JLabel("Ausgaben"); - budgetAusgeben.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); budgetAusgeben.setBounds(10, 185, 63, 14); + budgetAusgeben.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); contentPane.add(budgetAusgeben); this.leeren = new JLabel("Eintr\u00E4ge leeren"); - leeren.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); leeren.setBounds(363, 246, 115, 14); + leeren.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); contentPane.add(leeren); this.loeschen = new JButton("L\u00F6schen"); @@ -158,28 +158,28 @@ public class MeinGui extends JFrame implements ActionListener { contentPane.add(exit); JLabel beendne = new JLabel("Beenden"); - beendne.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); beendne.setBounds(508, 246, 81, 14); + beendne.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); contentPane.add(beendne); budgetDispaly = new JLabel("0.0 \u20AC"); - budgetDispaly.setFont(new Font("Tahoma", Font.BOLD, 12)); budgetDispaly.setBounds(255, 82, 86, 14); + budgetDispaly.setFont(new Font("Tahoma", Font.BOLD, 12)); contentPane.add(budgetDispaly); expensesDisplay = new JLabel("0.0 \u20AC"); - expensesDisplay.setFont(new Font("Tahoma", Font.BOLD, 12)); expensesDisplay.setBounds(390, 82, 110, 14); + expensesDisplay.setFont(new Font("Tahoma", Font.BOLD, 12)); contentPane.add(expensesDisplay); balanceDisplay = new JLabel("0.0 \u20AC"); - balanceDisplay.setFont(new Font("Tahoma", Font.BOLD, 12)); balanceDisplay.setBounds(543, 82, 85, 14); + balanceDisplay.setFont(new Font("Tahoma", Font.BOLD, 12)); contentPane.add(balanceDisplay); textExpensesName = new JTextField(); - textExpensesName.setToolTipText(""); textExpensesName.setBounds(60, 221, 128, 20); + textExpensesName.setToolTipText(""); contentPane.add(textExpensesName); textExpensesName.setColumns(10); @@ -194,6 +194,17 @@ public class MeinGui extends JFrame implements ActionListener { budgetBetrag = new JLabel(" Betrag"); budgetBetrag.setBounds(10, 100, 46, 14); contentPane.add(budgetBetrag); + + JScrollPane scrollPane = new JScrollPane(); + scrollPane.setBounds(511, 205, -186, -67); + contentPane.add(scrollPane); + + JScrollPane scrollPane_1 = new JScrollPane(); + scrollPane_1.setBounds(323, 126, 197, 88); + contentPane.add(scrollPane_1); + + myTable = new JTable(); + scrollPane_1.setViewportView(myTable); text1.addActionListener(this); text2.addActionListener(this); @@ -255,5 +266,4 @@ public class MeinGui extends JFrame implements ActionListener { String result = balance + " €"; return result; } - } diff --git a/Hinweis El Boukhari.txt b/Hinweis El Boukhari.txt index c5819b2..ca25228 100644 --- a/Hinweis El Boukhari.txt +++ b/Hinweis El Boukhari.txt @@ -1,2 +1,5 @@ -Ich möchte hier darauf hinweisen, dass ich sowohl von meinem git Bash(User: Adah Boukhari) als auch direkt auf der Webseite(Mohamed El Boukhari) pushen werde. -Vielen Dank. +Ich möchte hier darauf hinweisen, dass ich meistens von meinem git Bash(User: Adah Boukhari) pushen werde. + +Name: Mohamed El Boukhari +Matrikel-Nr: 344691 +fdlt3054 From 58db6673f2b0cc137f46a7981c8e9547370fa14a Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Mon, 3 Feb 2020 15:55:16 +0100 Subject: [PATCH 05/11] Commit_24 JTable implementiert und angepasst --- .../bin/MeinBudgetView/MeinGui$1.class | Bin 738 -> 738 bytes .../bin/MeinBudgetView/MeinGui$2.class | Bin 0 -> 1086 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 6623 -> 6791 bytes .../src/MeinBudgetView/MeinGui.java | 25 +++++++++++++++--- 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 Budget Projekt/bin/MeinBudgetView/MeinGui$2.class diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class index aa9e0ef08f89fc41cf34292298b93a824c5eaa8a..46a9523230d4bc896f7d4ec0362845373b3be2ad 100644 GIT binary patch delta 35 qcmaFF`iOOd3KOH{WL2h6K^q1R23rPR20I2p273lk2FJan-qO0X`+4Fwj(TAcFleW{3jnY zk(e0u2N>TpF+TWLjAyo0k(7jonZ0-B-gECgXZG{2_n!dV#j1{!z|^L6y!E)ZEu)qr z_p8c%6g#Dw4o%?3uKm(JsD}HFw_T0wjw`DVN>#_kI=a}1YJoz}@>&PHslC(AauI;w$z){Q&4mHIOvrZYjR3ksRlI{84;hrCd zBywWd4F3h)5f~prj=&h-Ks`}1QH@w-t1?8(f!vnYlLrFAVx|+;rR)AtS74-USrzJ= z4*Y#8*cV?Q+w|k0D<3+p6fg!)ZCNo!MmD^z>xX1)Q${;}Pe)atIQ&&8!8k^`tQ0jY z&yzvYvJ5d#lGA+OYLRp9P>cilywaPVy2-&{+<96aqcnc!&4nY3nTt#BkT8xy zLW#Soy~Z1Lr<-pvIa7O0vtJ^^0N{H9S?q`Wh178qw|Fmb8|4Ae24mD%3TS$E_0QbdQHR!&V;PW@3$sZEDsmRcUw`|T3cj7>YU``*6yzMpr$uLj>c#CY$I zmtFyo%Q?G^0=MeI344r^JbI7|Cy8!zCNJ_W^<`K1D$BB`Em&kN4CcA;D-qWro)N4r zuPigriqj@CafZlGpS&(EK9o1-BCjtZ8c<~52mEg0EY1-z0V_DgUusnlY3UK~%d-Q^ z#6xz_x1hqxp6UEX4Dy_ZM{&W#ANZ5#EDwvytz}jI>Ik(LyHj1HNrkGt&OJgQ?GN3J zUNf+;+Fwy|t*_FWH_(32xWsNYa@+|_axsxewm&kGb(6_Vu@gM~b5c!Sf-J(YmX`qeB>RNfCt*D1$8aj4UHZ)(I}DEJwI-+YIy=*w z7c-tSOce1QoZS-J%iRqwn1H^$;YjQVJv1(Ebr-x9H!Fn2UFD13tn$e1Z8g+&-Mb0$e~T4OmRXP0T_W^H9#ISj5?=U?~=} z3YEMKAwSnh)ooOBD*~)T4I8nP`>>23Udkmu4dMy)c5G4C<4JW3o>J?uO>M%{>V7<<9z?DB6`oa(<2ene z(>&O&C18iv4=-p#u~Qp|UD`D4)^0?-R)q%b7VOdPL0H>>z1mhZX*=+uwg=7HKD?}b zj27)nysCwM#B16)yso?OhTa`->b>!no{e|(p?Fs>zv2TijHCKCe5XH;?~x;&T^SuR>g*)l&eB43F-G>JR4bqxUMRG+ zL>eJsRW_<;=n+oiA@viQ!s$wyx|Uvf(n;~FBN!{3OKDM#v$Jq9%3;a;mxc11vDH718%rN6+E)UegC8O9g`Zt9AwdmBuUNXmFUe?5Z z4a{n@^w%O$#BZakO!wO`>v6D&SA;pRP4BBkK}0_`qR*>mmM~G2(gx<#!d8jDGb1AjKLXMm9sM9=VTeqV}*?P zLvoEbl97tXN7IZ}+)0?DI9f_EM)(+LoxPdoWUc62*l20QBkjyYch=bUwUkYiT2Yfu z=n+s;OyyX#fx4My&reJYT_cGwOd$t_NPeG2$svbyfF;A}y);fb9xKb(Lz>Z3+S{An z2)NT0w{wcy;wg|SIPQ{~Ile@y*~AHZIk_9BggGtD8Iv-0iBir-NJuo$E=XY4_COP4 zs)|?~L6t+@hB`@3jDwmQMa>c5(*Htk2aZPy6WW1O{sAnveaXe+9rnMdDH3kacGQk= X70wdR3QOcV0bM1>{z9EkYn1#2{jJ=q delta 1907 zcmah}dr(wm6#t!jzq<=}@A6O)7BC8$Tn z^>npzYDHN|$w)`3lVHoA;h5#9O0Aq-Tw0WxThOM;AZYD|lY8q6E$Jo;S?w zN!DnQV5SUxzBMX_`qQIk8bAnX=UU*Z;2dc*kOt`+tzE^8GzIIJ;KgE3~6iuObhK4kHa3-k^ zIW~(2#bX^)55?Y)C+}KlhDA~X&a%n*9k^iA*ztk~7i-{3^59Ah z<{E-8%UE7x>1dS)T4j?Vw{rtYZlnQp7%u+EfSWfc=<=Z!ifzVKUBQ3OAwye`6}CD5MBDDFxFg z1Jh|ZifKIDPf;OCs2oqz0+iA+l#`BUXag!}Gh9@MnY0J9=n$%?1#{>W=F&y3|1CTx zX_zm?!7cU10;xY1Nx67l8jrK=@yRSTN;gR2Q-E|*Y9^WO z0_Dw85D7l1OxH~cnP5>SU?Q3Mr166R#N&qqCSifZe_&m*hukW+XHzxINgfK}Z{zbo zHB4UW$ldIr&R&YFrPx+YSv4Z~dLKG)kMDz4gJv(?@1bt3dPg;~eELB?eMSw%^1+W% zSWDe&aKuaeQnxm2_r3a_HE8itD(j8ekd4tmI)?-tg$2iWEKcxh`k6=LBzoW!2J+g? z!5MDyvpf>#FbC(c0vC8BF8Olb*&n7q_eQ|hrw919{bl#0g{{r4=cV!dBTL+>bDK@(_z=797(Nzi2T;J60r2?0b#Z&UFNF z7ld&KM04@tx&8(dqZEP0qV<=D*MRJM&DKEnahyRf^{c1Mjx^XqLp+p|m$c32l;&pP z Date: Mon, 3 Feb 2020 16:04:53 +0100 Subject: [PATCH 06/11] Commit_25 Text Spalte implementiert --- .../bin/MeinBudgetView/MeinGui$2.class | Bin 1086 -> 1086 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 6791 -> 6810 bytes .../src/MeinBudgetView/MeinGui.java | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$2.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$2.class index f044e2c754388b6d908b8ec0ad5283c820ffdbde..aac8149442a474ee18c23bd23ce247d1c5678ab9 100644 GIT binary patch delta 14 VcmdnTv5#ZJM)P5bX`8iO=LIj6S-JHHBi6Xo&Yj!kMe|UUxyOSt%_~v zCLDKuHaEIIm&;}x$+khU!)sUd*0qWoneeu$j@HfW3b2!?eLQ_2-TOp3Gt;{>lXGX> zXB4}6op(?rGQA2-X!bK~QM{fBB0T3x-su@Pw|CZk*1gb>ny>$lbDxwzDt1>u{X+C{A*Z_f>c(IL^I_`N%b-zp=$HgN4h=w|k;m0DbUhgV0BEz0uL_p?SUp<~& zgjHg@?54)j^j+#^R6QA zF7jUQm1sP9AE!iN`+vFW+6ANRid9^LVw}F(c|IE7@{d#g_y5-$y4tn9DPCJ~X}n*m NYJ7kXdQUes{tW{l`S$<- delta 1167 zcmZuwTWl0%7(Hh$JG-<0bfFd4EiL7;WuaYZp%*Tt2o+ioEGmegF>ymDwT5gfyJ$m5 znrNbiHyvN#4Ii4I#H71q*l6$(0-;ZceKm+856Xj46cqhtXEBC2^KicZ`_B0;|K)Vg z`#tv6hhKaJpqH=A*dNCdHtym#g?8K{23GC)aNa_1Hnt}6hr)e4@Mw2M{!(~|zr9U% zXM~Cxb#KD%C(EDP4U8;e%3{*H9B|`t96kMq?GU^r&jJa>yIKg#_UFat)iR^bLi!ovMC^Ut-^@~C>Ue@W23~;-}r@hymCS#q&A@2icNo1GeGu-W+ zbJB|j@miF_gt7GIJLhZ;@;Sxl`GR-b>5C3>zv7E*Ew|O>8Eb$A1(=_e&m_joVf`Y0 zxqx4N{GN)poySi;{w$%`<`X3x4?vvbf`(wOhF5Ah8{mwbtA;Ls-{4sJ)de%0n!q)) zfN#wcxM{wN@6409WqyS3&C~e7`~4+ktjq96PCzhpM)P9~~Ld>XkOS{Z@LX7EWHI4Jd zvds-Bu$~QwOPMFQ0K`fu9hV6-Y3NkD&xJDR>@+Nyt*N%WGL1-uEwV2@mshy5%xo<( zK8>WfFQHy`>k?E6*DKt&#^>4^AvcYoDq&ld&{twsj4;hencXGasIXV~|0e%$cw-53 z74}KkJDeO|U)`smO>W^+GQd``qc9Rq`vVNiT3$dnkQ@i)ms8d&+~)n5T)rjL#wgFB z#yMCW8AwZM`rILfL%1#={oDv)E&y+5s&lp6{F-zKdNqCOOAa2Akt*DIfqNSGtk1nZ z_jzYh>7E08Ng9X+_r9ju4Wp`R4prSE9C=)MKb2nlNGWgO|LbjhT(!3`oe5PM4@y;y RhxoE!y^NR<48FS|`~&MS{HXu{ diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index b25fd2e..0d6115c 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -205,7 +205,7 @@ public class MeinGui extends JFrame implements ActionListener { new Object[][] { }, new String[] { - + "Name" } ) { Class[] columnTypes = new Class[] { @@ -214,7 +214,7 @@ public class MeinGui extends JFrame implements ActionListener { public Class getColumnClass(int columnIndex) { return columnTypes[columnIndex]; } - boolean[] columnEditables = new boolean[] { + public boolean[] columnEditables = new boolean[] { false }; public boolean isCellEditable(int row, int column) { From b8904400f309adb26e571af1bbd53a1d408cee16 Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Mon, 3 Feb 2020 16:10:02 +0100 Subject: [PATCH 07/11] Commit_26 andere Spalte _Kosten_ hinzugefuegt --- .../bin/MeinBudgetView/MeinGui$2.class | Bin 1086 -> 1122 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 6810 -> 6827 bytes .../src/MeinBudgetView/MeinGui.java | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$2.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$2.class index aac8149442a474ee18c23bd23ce247d1c5678ab9..6907ef33fe653ff2ac1388978c424cfdf8a057eb 100644 GIT binary patch delta 430 zcmZ9IJx>Bb5Qg7{J?=QroET5}@DoLD0Z&0~tSzjuA+e!A5@RTgv9aJc82^TaL@y>r z={0tm7)@;aA;xzPVu-uhnKwH#&&+P$`nK%npZh+5ZEW@ILs2j>BQSB)JZt*L%}(3j z>zuaQt&=zeGD#SSX_dR_ijt5U0`7(58c8HjyL^fiyMPG`a2&*8lN#koAjy(3s&m#$ zdQX)CjH`0x4vsP&G1-Wwrs@runyv>(E8{^nq}&gX?J+rmS=tO@v@e9cB84~JeISod z6nQtt$U@kv>tUW!FAs}YVzE|vEHf;yg2Hf;9Y%D_RJTZHtJjo+J~1W$?;+D2r2HXG ztg@fr_MnEKUFPUVYEU+JP`mm^`Wl(e93hoLlK!qTm1b1J$~E}(66>g9lgbYJQ2@WL C2QM7} delta 355 zcmZ9GO-=$q5QV?)X&4w$2*d#d#DB2|{DH)c3lHJSjZ2qa!84diJcSF0PDqS$0OL** zXkZjuY0e(op0A%jtHu8MgSwE`KkDO$R{R*^D$itwrw zW(v%45P#~9QgPmEU0w*!hLcN38j?d%z_a+g zQ0A2y@3f_FrY?9cw^){%_H7C6&?;-PRjjiid0u8m=wr9^?H$!de<-u*jjS->&3T4X z3V)tHn{3Hmu}vrb_9|!f=HTX^^ke27e@43Fq~K!(X?ZAe$}T;rhF$jQ3kuu;0q_eX CUnS!J diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index 6658711d4145900f8a8688d4d516d35dfb5e7070..3af0a07733b79ef60e7fc04ad88dcc3bf65fe902 100644 GIT binary patch delta 1177 zcmZuwOKenS7(M4c=5go0EldSEeNb9PhCZYP+ES?nsX(E{0v3V#p3s|GLuQbU+BA|T zE{HB%n9D|ENJvN%V`Jh>y-YN?aDl+SMsSA+4P_^DPR7D5+*N4BJ)(c@o)4BRcNe1TLVqdT z$KNik4PjDIqwa3DIzpymh++4b)km}NnN`J5E$hRqbH9x>=quUa-i)O>8x@<-Mp(|& zM6UmhTrMkB$fV+IIW#MghD{ev`5thgSXDSyJ_Tvh5 zfv#8a313$!(H&FAoXn&%=_`HK7KQqN^`zo9pH<;!PfIUH9G~R2+1;U?+!f}4`>I`M zbcZ?QzH6@xJ*_y*z3!ZyTrr4OB7BB0R$Y5%&f*{sC_c-B?hU&)GRVV*y^!HW?Ps=SjJgZK3<$f zsL0i_3Xf}wY$>p#9Ldh2THF^9mjzvb%Hv9rBO5$+l?mxt43r4lN`&4#JH!amj1}0E z$JHV?3;*Bb{|)!$u~_6*3A;zChc}h>5_-9nja zZAgg5gEtcAVC0~lYK$6nmn<6$96XR<;6zB{%^+$#7!D0l1ktxUixT3@;rr&j_q~6a z_gVj`e&@TpXU_u|;45D{AKH$C8~8(^3%C69_E_k)!X5nON1d$}{#FF(k2t*{UD2TF zA9seR7tcCPv}0_w7$@R>DjGKx+t}{kj3oQkD6T~};kffTZ+Oo0X7Y|?S+CepHBY^<{QKCHNbNq?{EShJB`7CVU*uV!A)^h{^+Q$1sO&z*8-6}!2~e@`XTJqmHOR`P98 z+{z>oJ?2W4?3C;6&$(|nILC{>N&i-&EHcPIJHFOH39A>hiSP zU_$}sSH&;tbLNO~4$G5zs5!7t{Q_!WKfi!1~U&|(;1xA6{b zR(78?_Ar7dH2Ow6l`x&B^*f9TGq|LG&pKhIwoX6EdQpV589l`YVU~7ITRy=RLc`j1 z?GhU$(AGcIEH(*q%pI8LO0Ggg$~1E|hz(LY0!?1vgRT-=WVXwTuw#xUCkDS;S~HAXN<*EO4`sAWgQ&fda0U zxkKXrO@6<7uz;m9hs5oBE#up(d#bd_Cz+A~hJ}Y=)JMB+V_d%FE`ouuO_1U>^)jFG zZ?&x78EEawk Date: Mon, 3 Feb 2020 21:01:51 +0100 Subject: [PATCH 08/11] Commit_27 Button exit und loeschen bearbeitet --- .../bin/MeinBudgetView/MeinGui$1.class | Bin 738 -> 738 bytes .../bin/MeinBudgetView/MeinGui$2.class | Bin 1122 -> 1122 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 6827 -> 6817 bytes .../src/MeinBudgetView/MeinGui.java | 11 ++++++----- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class index 46a9523230d4bc896f7d4ec0362845373b3be2ad..b7dca50bccb76423317aa438f197c9c1a5d5fd22 100644 GIT binary patch delta 35 qcmaFF`iOOd3KOH%WL2h6L0bk620I2`273lU1_uUF2B*p0OyK~K5(e%7 delta 35 qcmaFF`iOOd3KOH{WL2h6K^q1R23rPR20I2p273lk2FJlY9eG0oaqz14sehlNba_ DN4X9| delta 45 zcmV+|0Mh^B2;vB^X9E??01E)q01^Py0386?03!g}04M;=lY9eG0oRky14seglNba_ DM+Xi& diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index 3af0a07733b79ef60e7fc04ad88dcc3bf65fe902..66011f56a7e6b90edcff39d2c3868fb202ea81af 100644 GIT binary patch delta 661 zcmWmBYfR2@7{>AM?^LPO>d`vjh1wd!%%(|}85V^KS*bLq6h@6EL{Awx=FlHKqa|dD zDT}UtnR=`dTf9Qwfr2B`sM#4+7Yfl*_AuX;gHUFGzs=*HvY_EICB|EA~7T}jbyu- zPbv$@A%%Pvveiy|NW;Y8(DO*gcmI3Bg^>Cat6p2-mDZMHC4Pb zwY)bCd@xOXbjJlx5#zt$!&h6jk1)R3x<44jPp0yVcz)Yn{kG}=oB6{*{^AnSY7R*; z1}!`+ztD`JL3rARe!_% z8ZGD2)HMDu{=g`Pt){JPiuwBQdEU>Szh0L@YeO3%Ts?-(OU=m1eo~c^JUY!e+jY8& z3CE2nXP#HI(%Zc0w_1F{b(XjAwzThf-Ti-<;yYFk+9zk6udj4OqgiPG#NfpuMzNR) zEMW$*%w?%vm$RA`q_C1K;@Hb7itSQKJXIu6Pa;hu@tieuu#R`E=Q|tdVC&vM1g}$QOtH>ku5H=L)5TSG_p%PX18b~SG-}5=ps+_ zkS_+=Cp~b;F%-xU3S|WQWef*o0taO#Mbg0`SwgX_nIxZQf}zA+|*e(bso2L5x4b8?&yo$)pgv{x45q#^FY6% zNx!E#UjN{s9^jF2;fWc}Q!|cdW-2WvjOS(nt!6ndOcHG-nRb)POOr{5*<``9+G5ZrtgyWq%S#udUn1MEaS-FWdaLZ8c!44w7qI zmGPHKA*@>eIHS?RSUMnagexv$2t#eh5yG8d;lViJY2^gWH{SROAFDYa&Wt2T_*wpe O%S@2ng01wxY5xEY!L8%~ diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index d368a32..7be8d26 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -50,6 +50,7 @@ public class MeinGui extends JFrame implements ActionListener { private JLabel budgetBetrag; private JTable myTable; + /** * Launch the application. */ @@ -145,21 +146,21 @@ public class MeinGui extends JFrame implements ActionListener { budgetAusgeben.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); contentPane.add(budgetAusgeben); - this.leeren = new JLabel("Eintr\u00E4ge leeren"); - leeren.setBounds(363, 246, 115, 14); + this.leeren = new JLabel("Leeren"); + leeren.setBounds(317, 253, 115, 14); leeren.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); contentPane.add(leeren); this.loeschen = new JButton("L\u00F6schen"); - loeschen.setBounds(368, 273, 89, 23); + loeschen.setBounds(301, 281, 89, 23); contentPane.add(loeschen); this.exit = new JButton("Exit\r\n"); - exit.setBounds(494, 273, 95, 23); + exit.setBounds(477, 281, 95, 23); contentPane.add(exit); JLabel beendne = new JLabel("Beenden"); - beendne.setBounds(508, 246, 81, 14); + beendne.setBounds(491, 253, 81, 14); beendne.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); contentPane.add(beendne); From 080f7a2cb9d11a0c0faec76be9c7409244e571da Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Tue, 4 Feb 2020 00:35:47 +0100 Subject: [PATCH 09/11] Commit_28 Funktionalitaet Table_Inhalt loeschen implementiert --- .../bin/MeinBudgetView/MeinGui$1.class | Bin 738 -> 738 bytes .../bin/MeinBudgetView/MeinGui$2.class | Bin 1122 -> 1110 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 6817 -> 6922 bytes .../src/MeinBudgetView/MeinGui.java | 50 ++++++++---------- 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class index b7dca50bccb76423317aa438f197c9c1a5d5fd22..46a9523230d4bc896f7d4ec0362845373b3be2ad 100644 GIT binary patch delta 35 qcmaFF`iOOd3KOH{WL2h6K^q1R23rPR20I2p273lk2FJ!f=K` q4k)g`zzovBAP;1LfGUF`gAz~=$dEbAMvNCGpJ(=9yf#^a#R~vJdk~HQ delta 114 zcmcb{@rYxC8Z&1#11kdy0|SHRWPN5upGX##kgW{T8-W5$46;B{ih&JCo@L->xWXXB za1|(ai$R&;HiHIGOb#fcz`zV7H5ufAED+FSP-IX7>IE4%f!T=h#^l4y9*p-U^RRdU E096+gS^xk5 diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index 66011f56a7e6b90edcff39d2c3868fb202ea81af..7902d792f14eed3889d7eb4f29f393cf41d63179 100644 GIT binary patch delta 1440 zcmaiyeN2^Q7{-71`#vvl4(GrDK}1VA(@cr^vC>(D)2J;`FvUdh6FW!5p{N{0MLm$2 zQ*)MYmgTfeS2E4%!44KuR<`_HZEZPH(J`7u`B7&5;YU3OoaOq%_mBI&-h0<`z1RJ` z*Y+W6hdPhn{^V0&sLbB)T<#7!X_wJ186&wuOo=~`Tki9h32FWMkC{`vsCe+{SjZj`z%i>@bh9)BKM2&GURUt8%M z)ww%nWpl#H<)k&2W~-7j)-ujoD>-Maqs6j0Z*Ad%wS!h3(?4@*XEw#5FCNKIizQZE zi1^e9aqB!AVygs+)5w%j2h6Jyuc4CD<|*-LWEoy_r6lMhQAW8rL=rWMHkyo!(nX^f zqs=%hNt)*{>*R(cYvj~6m)hZ!BZDsz%TGE(?R4iCoukY2=L#dZs?&8%r{WKtpX)5) zPd4zE&d&{dcenfj+}82?yTiNosW-4Xz2lIF$k3C%dRB^|D-5FNn|nCbj!Bk@Lf}gzvr@9(qW^U5y@{8d}jIBkh{h nr0Ef*toy1YYbRars@!oBaV!3gI!j7)Pt>j-);;oE>1_W1>_k#H delta 1373 zcmah}ZBUd|6n@UV_XT!YmgQq-1tHlmQKZNziBV}9Yie8+L^N1L6k9^bfRM2GaKSMQ zKPr7KnR1MhCTYk*mxVN(Vysa|8?7G>mSlw0*awYF<&0vT-Bp_UTLuV9F%e%8P4@Q`Z((l&0p^RF_qh&VROSt*fNkh%s7Z zqAbeRlgv|X4y+2HB?Of)ys^tj4q9rWW%Rhd+B`SNLHQif)Nc7Z!!b>FVch6zWBeoodJe@|>XkeB2%d5FVqFgg zlRX%;%!|N<2sBxuy{PqVM7q5Anw15D>A|nb z9=+UZ7c90}Gu-D<%hfJ`f`e}&6X95hcr3znWMK}nF&~TBvIKd^MJbk|3d_*It5)Qr z4Ni1mIS!x@{aAtHD8d=6!g&S1)NY#dZYIHaoJQT6bu7WAs!=u_?ZNOj?`>cPiq0R8GqH;$?ye4>8Fr|KF8 zv|t?5qVbuQh|jfD9M{ruLVFA+wH%z%3UOL1!53N?&S;f5tJU$k5#MPo_+HzN5p5SP zX?yU4)`1_jF8ri<_z`@>t_zTt4EzwF6xB+h#AGLz${}YM_kti@-AQKFBzY83IBSZ| z$sw|^rU|>;MG@>0Br4^j6vn8?bSk<)I}&6AGJ8s&ca zojG*{u^3}s{fQa)3lHHcGwvEQOBcaQf+#u5U_#nM7W{M%7+t)Xy z>YHK`@9Jhv;69#X5yZ6^5X?21DHK*tC62<7NM`*)OoH3tJV^KU(ZXI@97Q=^%JouS zX7Yy<{zhM1iiC}#CYs;I7g0dV8DpS%G$YXb+!D(FF~lDsU(j@p>$+`Vs|}Nx^0&T~ s$$`lFj@a0hz91R54G_nf#ZUPEo0*_OUk$W^idaT+6-g|8V>BTC0of`vM*si- diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index 7be8d26..75db528 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -44,12 +44,11 @@ public class MeinGui extends JFrame implements ActionListener { public static int budget; public static int expenses; public static int balance; - private JTextField textExpensesName; - private JLabel ausgabenName; - private JLabel ausgabenBetrag; - private JLabel budgetBetrag; - private JTable myTable; - + public static JTextField textExpensesName; + public static JLabel ausgabenName; + private static JLabel ausgabenBetrag; + private static JLabel budgetBetrag; + private static JTable myTable; /** * Launch the application. @@ -178,46 +177,39 @@ public class MeinGui extends JFrame implements ActionListener { balanceDisplay.setBounds(543, 82, 85, 14); balanceDisplay.setFont(new Font("Tahoma", Font.BOLD, 12)); contentPane.add(balanceDisplay); - + textExpensesName = new JTextField(); textExpensesName.setBounds(60, 221, 128, 20); textExpensesName.setToolTipText(""); contentPane.add(textExpensesName); textExpensesName.setColumns(10); - + ausgabenName = new JLabel(" Name"); ausgabenName.setBounds(10, 224, 46, 14); contentPane.add(ausgabenName); - + ausgabenBetrag = new JLabel(" Betrag"); ausgabenBetrag.setBounds(10, 253, 46, 14); contentPane.add(ausgabenBetrag); - + budgetBetrag = new JLabel(" Betrag"); budgetBetrag.setBounds(10, 100, 46, 14); contentPane.add(budgetBetrag); - + JScrollPane scrollPane_1 = new JScrollPane(); scrollPane_1.setBounds(323, 126, 197, 88); contentPane.add(scrollPane_1); - + myTable = new JTable(); - myTable.setModel(new DefaultTableModel( - new Object[][] { - }, - new String[] { - "Name", "Kosten" - } - ) { - Class[] columnTypes = new Class[] { - String.class, Integer.class - }; + myTable.setModel(new DefaultTableModel(new Object[][] {}, new String[] { "Name", "Kosten" }) { + Class[] columnTypes = new Class[] { String.class, Integer.class }; + public Class getColumnClass(int columnIndex) { return columnTypes[columnIndex]; } - boolean[] columnEditables = new boolean[] { - false, true - }; + + boolean[] columnEditables = new boolean[] { false, false }; + public boolean isCellEditable(int row, int column) { return columnEditables[column]; } @@ -253,8 +245,9 @@ public class MeinGui extends JFrame implements ActionListener { expensesDisplay.setText(setExpensesView()); balance = Integer.parseInt(text1.getText()) - Integer.parseInt(text2.getText()); balanceDisplay.setText(setBalanceView()); - } + } + } public void exitButton() { @@ -267,9 +260,9 @@ public class MeinGui extends JFrame implements ActionListener { budgetDispaly.setText(null); expensesDisplay.setText(null); balanceDisplay.setText(null); + ((DefaultTableModel)myTable.getModel()).setRowCount(0); } - public static String setBudgetView() { String result = budget + " €"; return result; @@ -283,5 +276,6 @@ public class MeinGui extends JFrame implements ActionListener { public static String setBalanceView() { String result = balance + " €"; return result; - } + } + } From 9b63770209fd07e1ce03e1b1aca2b0cef7b227a7 Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Tue, 4 Feb 2020 00:43:59 +0100 Subject: [PATCH 10/11] Commit_29 Funktionalitaet add (Table) implementiert --- .../bin/MeinBudgetView/MeinGui.class | Bin 6922 -> 7107 bytes .../src/MeinBudgetView/MeinGui.java | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index 7902d792f14eed3889d7eb4f29f393cf41d63179..2bad1bdf45dbfc91e3c444453a9425125326e905 100644 GIT binary patch delta 761 zcmaiwPfQb05XR^0pIy4{R-u8mpah~Ipn(z;Oi&Vw0<|E2s%V7@i(P7KZ53NgJZNHK zV!V-e@v0uYc#x8;jYebO=EV?WhzBnoO^gR`8jZ8m(8LSx@Vu^e6)H~98 zCeabfM{H=7VqEh` zlQ=KqoJeW)eGHgVF-^xoJ8l>`2J~n1nVgJ^Aa8kKB)5>vB!c;5I&Lf|^aHb&MO}2d zYrQd=tw0>)X!vsXnSvPRRU~j(%(;7|7*Z;(tUPf)m87X%w=3!X%2@Tf%{53)vhyO= zM4RtnPl3Lf2)@O@$U*08x)-$<=#z=&NYqiFTO1V8R>V-m#PBlr*r|)}KH4eX`?@-R z(qsBXtMr==akimEg$oM5n2#}x6S$@k6Nr!vXGEjFsphN&vTcGCR<0liAg2B8ktolE z36>8mhYR$vBpW69=hSZELYYxdGBX?`!%1#PR1KMSqk{IrMFA+{v%ld^ELuRIh?y6d z^Wc&R!$dON_WVB|8hPQ~{EEt^ylgm)t6by4QM7WVnd2}yEW@lW(L3%nBDdVN8NZ*!Uxz)by!kS^CtcR+AQv6SZj3 zvSk;f{sK25sW3^42%=5kqHUX?RkVp{DX902qO|h6@SXd?Ip?1HeZKrEExvAl_y{1) znN@Mdl)ucg&8D4qCLVS>j|ZIboGaMQYdSlK$OEU~)aRVp>3aLweBOOzAchu!Crk_c zX4c?!cFRUH#a?;eJYU_zK7;*eAwu(RzJKm%W^Q3NuXBKizpjX%5ctO-gEx7L&Es)8Ro#4O@ID4p7OEOfZ{d=fVtX8xQ>aO?d6gNEt@3+SZLH0cX(gE`5x3#T zj*MCtf}Lx4<Ty*0L^kePWNV$Qy_BQ_ulw(CI^%eneS@Y6eh49VrIoqLpm2hu4_e z;NW`>ALs2NM~WQF*1h}xNrn)oQOasS?FkwuI4S>H))i0Rs4OOr^oStA$^(zYzDHNW j8udJykJLw1hS-6AKZBQ(ZmCakTH!IZqH_wp`m+bSYVB`| diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index 75db528..a0fe154 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -197,7 +197,7 @@ public class MeinGui extends JFrame implements ActionListener { contentPane.add(budgetBetrag); JScrollPane scrollPane_1 = new JScrollPane(); - scrollPane_1.setBounds(323, 126, 197, 88); + scrollPane_1.setBounds(347, 126, 136, 88); contentPane.add(scrollPane_1); myTable = new JTable(); @@ -247,6 +247,8 @@ public class MeinGui extends JFrame implements ActionListener { balanceDisplay.setText(setBalanceView()); } + DefaultTableModel tab = (DefaultTableModel)myTable.getModel(); + tab.addRow(new Object [] {(textExpensesName.getText()) , Integer.parseInt(text2.getText())}); } From 3c4d110777bc44e59d3847f3bf093321432a9bed Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Tue, 4 Feb 2020 01:11:21 +0100 Subject: [PATCH 11/11] Commit_30 Table angepasst --- .../bin/MeinBudgetView/MeinGui$1.class | Bin 738 -> 738 bytes .../bin/MeinBudgetView/MeinGui$2.class | Bin 1110 -> 1110 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 7107 -> 7392 bytes .../src/MeinBudgetView/MeinGui.java | 10 ++++++++++ 4 files changed, 10 insertions(+) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class index 46a9523230d4bc896f7d4ec0362845373b3be2ad..83412196ab26e3b5475a768542720ded8e56c4bb 100644 GIT binary patch delta 35 qcmaFF`iOOd3KOHy9kTmqgk~z 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 diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index a0fe154..f690b85 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -23,6 +23,11 @@ import javax.swing.JSeparator; import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.table.DefaultTableModel; +import javax.swing.border.EtchedBorder; +import javax.swing.border.MatteBorder; +import javax.swing.border.BevelBorder; +import javax.swing.border.TitledBorder; +import javax.swing.UIManager; public class MeinGui extends JFrame implements ActionListener { @@ -201,6 +206,10 @@ public class MeinGui extends JFrame implements ActionListener { contentPane.add(scrollPane_1); myTable = new JTable(); + myTable.setColumnSelectionAllowed(true); + myTable.setCellSelectionEnabled(true); + myTable.setBorder(UIManager.getBorder("Tree.editorBorder")); + myTable.setFont(new Font("Tahoma", Font.BOLD, 11)); myTable.setModel(new DefaultTableModel(new Object[][] {}, new String[] { "Name", "Kosten" }) { Class[] columnTypes = new Class[] { String.class, Integer.class }; @@ -262,6 +271,7 @@ public class MeinGui extends JFrame implements ActionListener { budgetDispaly.setText(null); expensesDisplay.setText(null); balanceDisplay.setText(null); + textExpensesName.setText(null); ((DefaultTableModel)myTable.getModel()).setRowCount(0); }