From 5f0fb40d462480d6fcfd594b45b66b92ba0b5004 Mon Sep 17 00:00:00 2001 From: Agnieszka Janicka Date: Tue, 7 Jun 2016 22:04:40 +0200 Subject: [PATCH] =?UTF-8?q?ju=C5=BC=20nie.=20dodawanie=20w=20miar=C4=99=20?= =?UTF-8?q?ok.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/classes/library/Album.class | Bin 1724 -> 1734 bytes .../classes/library/AlbumFieldPattern$1.class | Bin 802 -> 802 bytes .../classes/library/AlbumFieldPattern$2.class | Bin 802 -> 802 bytes .../classes/library/AlbumFieldPattern$3.class | Bin 802 -> 802 bytes .../classes/library/AlbumFieldPattern$4.class | Bin 562 -> 802 bytes build/classes/library/AlbumFieldPattern.class | Bin 8653 -> 9047 bytes build/classes/library/AlbumFieldPattern.form | 19 +++++++- .../classes/library/BookFieldPattern$1.class | Bin 795 -> 795 bytes .../classes/library/BookFieldPattern$2.class | Bin 795 -> 795 bytes .../classes/library/BookFieldPattern$3.class | Bin 876 -> 876 bytes .../classes/library/BookFieldPattern$4.class | Bin 795 -> 795 bytes .../classes/library/BookFieldPattern$5.class | Bin 795 -> 795 bytes build/classes/library/BookFieldPattern.class | Bin 11225 -> 11608 bytes build/classes/library/BookFieldPattern.form | 20 ++++++-- build/classes/library/MainMenu$1.class | Bin 739 -> 739 bytes build/classes/library/MainMenu$2.class | Bin 739 -> 739 bytes build/classes/library/MainMenu$3.class | Bin 739 -> 739 bytes build/classes/library/MainMenu$4.class | Bin 739 -> 739 bytes build/classes/library/MainMenu$5.class | Bin 739 -> 739 bytes build/classes/library/MainMenu$6.class | Bin 739 -> 739 bytes build/classes/library/MainMenu$7.class | Bin 739 -> 739 bytes build/classes/library/MainMenu$8.class | Bin 739 -> 739 bytes build/classes/library/MainMenu.class | Bin 15586 -> 16149 bytes build/classes/library/MainMenu.form | 25 ++++++++-- build/classes/library/Movie.class | Bin 1986 -> 1986 bytes .../classes/library/MovieFieldPattern$1.class | Bin 802 -> 802 bytes .../classes/library/MovieFieldPattern$2.class | Bin 802 -> 802 bytes .../classes/library/MovieFieldPattern$3.class | Bin 802 -> 802 bytes .../classes/library/MovieFieldPattern$4.class | Bin 562 -> 802 bytes build/classes/library/MovieFieldPattern.class | Bin 8693 -> 9166 bytes build/classes/library/MovieFieldPattern.form | 21 +++++++-- src/library/Album.java | 16 +++---- src/library/AlbumFieldPattern.form | 19 +++++++- src/library/AlbumFieldPattern.java | 25 ++++++++-- src/library/BookFieldPattern.form | 20 ++++++-- src/library/BookFieldPattern.java | 23 ++++++++-- src/library/Database.java | 9 ++-- src/library/MainMenu.form | 25 ++++++++-- src/library/MainMenu.java | 43 ++++++++++++++---- src/library/Movie.java | 2 + src/library/MovieFieldPattern.form | 21 +++++++-- src/library/MovieFieldPattern.java | 26 +++++++++-- 42 files changed, 254 insertions(+), 60 deletions(-) diff --git a/build/classes/library/Album.class b/build/classes/library/Album.class index 182cc90dd243602a3777c14699d01be9eb50f246..bfce847613ae006edfd4e145a0b9fb970f05d620 100644 GIT binary patch delta 881 zcmah{O-~b16g_V`?X=B93fe+JN)a4!sti(S6}0lD0`j5Y$HGmV^-Llz`VeMz@p?nklcq39ywT2aNh0h?!2xy6uMX6)c5QD z+j?W$-}>-=r?EYw@aa|lF#NA#J?IS&tn7RiIgMr9(pbS`ja6ae0&7@zu%Yn;Pc=3% zsZkc#!n(#YVbAeG<03AFf31JRU7Q8%#S#yh0)=@d`DZEG`S4F{$nT?l0Wo3*He)-P z*H23`LVTAoz*BMxCa2#X3yzRHq|1UN7vK=H&Ey=5_0ZpoBJ#LOCSo-th;B>F#UQ^+ z0T)BeunfCGCXKil=2zRW5&GgtQOT9^^nFD5%bp9Qbf1wOV6O!>Fi0%IqhOf=QnqO1 zrf?0Tw16pGr%xH?aW0Fz#8xdMTs1b3^1i_Kj?mejQ7#n}Nm3wMP9Q3&=0G>d6V$rN zQ(>&7STZ(!Z6yfQcFCm(3`czl(rjFw3C8}})o1R9< delta 857 zcmaizOHUe66vzLA0|VqzsR~+NLakT_6J&5ye%SSb48 zLcxb17W@N2E*w!bmd7B*rwX3=e(MJy@Di<2pf_ej$?NYl@l_lE!_0 zHMKTDn;SknAd4l__7Uw%v(l8*5si(q))?L5geG7!G)I*5kkq(5fm7T8c|7c<&10G| zG98;`x-__`_khp-0@MD6!G4c&cv6>_AZIvDnU1g9P=>mPtQoEbW_v`ji=WXai5uwB zAF**GWbPJ7la$=8lq}|%Po`F82hxMb&ir?JPG=>~cu~{Bj#uxbJb1*>8hm)qx~weM cg0$i0q`aT0I5)xRZRww?++B{rzev3D*I|=E{{R30 diff --git a/build/classes/library/AlbumFieldPattern$1.class b/build/classes/library/AlbumFieldPattern$1.class index 78f252e386517b1d8cb2bf8b8d5709e6a4cfb965..5da79c89838c0435f0ecb20baea7951d7defaae6 100644 GIT binary patch delta 23 fcmZ3)wuo)RBqm0;$&;D9SUngx7(6FGVsZcgRObex delta 23 fcmZ3)wuo)RBqm1J$&;D9Slt;o7(6CFVsZcgRLTaR diff --git a/build/classes/library/AlbumFieldPattern$2.class b/build/classes/library/AlbumFieldPattern$2.class index a808a1af0565bed0e5dade19d9dbc7acd4f493f8..1dec74fdbd59944c7f295ded0e5ef5895b7fdb70 100644 GIT binary patch delta 23 fcmZ3)wuo)RBqqjy$&;D9Sc4ci7=kB1VsZcgRtW~d delta 23 fcmZ3)wuo)RBqm1x$&;D9SOXb27=k80VsZcgRqO`7 diff --git a/build/classes/library/AlbumFieldPattern$3.class b/build/classes/library/AlbumFieldPattern$3.class index 4eab41b311c477df737f84a460b19688ff8b21cd..554ef818130a3c7e0ec51cdea225e439397797a5 100644 GIT binary patch delta 23 fcmZ3)wuo)RBqqj~$&;D9SmPKt7~&^CVsZcgS7ip} delta 23 fcmZ3)wuo)RBqqk_$&;D9SYsJD7~&>BVsZcgS4alp diff --git a/build/classes/library/AlbumFieldPattern$4.class b/build/classes/library/AlbumFieldPattern$4.class index e4fec39ad68d7ec6492f2e5b0eed769e9bbe275e..2bfe998a960b96f93b467bf4b950ca43d93d72ed 100644 GIT binary patch literal 802 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 delta 4054 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 - + + + + + @@ -82,7 +86,10 @@ - + + + + @@ -186,5 +193,13 @@ + + + + + + + + diff --git a/build/classes/library/BookFieldPattern$1.class b/build/classes/library/BookFieldPattern$1.class index b550c6bdd85b9510242bc3a486e1c4f630715b15..d3887be484c47368fcdef7d7f5493dc3a25bb600 100644 GIT binary patch delta 23 ecmbQuHk)ljHxr}#7hTO?_fvkKWs{qK7o$Sf13;^hO3mX6c diff --git a/build/classes/library/BookFieldPattern$4.class b/build/classes/library/BookFieldPattern$4.class index b4ecd7f79ce0dca3f3115297033dab24c1bf0ca0..ec8cf7b65912dc1f48e0eea2f314ee1f4360817e 100644 GIT binary patch delta 23 ecmbQuHk)ljHxpy=bfkk(Dm`U7 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 wrkH`|%x3rJ&V~a=q4~UnTqyPW_ literal 11225 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 - + + + + @@ -110,8 +113,11 @@ - - + + + + + @@ -286,5 +292,13 @@ + + + + + + + + diff --git a/build/classes/library/MainMenu$1.class b/build/classes/library/MainMenu$1.class index 08ea20f7cba8e104a8053ac8febe8540bb59a9e1..cfb474249a3b0816c803389732dd330f477e758e 100644 GIT binary patch delta 23 ecmaFN`j~Y?FcYKqhLFjNnH&IE$_9r3 diff --git a/build/classes/library/MainMenu$3.class b/build/classes/library/MainMenu$3.class index 51bb30087eb2ce7e18ebe9890205b418f0102c37..b15bf8ad3c372e3e0525eb692cbda00bce96ffff 100644 GIT binary patch delta 23 ecmaFN`j~Y?FcV|suicXoDWc6N7m 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 literal 15586 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

&q;p^GhK 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 diff --git a/build/classes/library/MainMenu.form b/build/classes/library/MainMenu.form index a3824a3..5138dfa 100644 --- a/build/classes/library/MainMenu.form +++ b/build/classes/library/MainMenu.form @@ -74,7 +74,7 @@ - + @@ -374,11 +374,16 @@ - + + + + + + @@ -397,9 +402,10 @@ - + - + + @@ -428,6 +434,7 @@ + @@ -440,7 +447,7 @@ - + @@ -450,6 +457,14 @@ + + + + + + + + diff --git a/build/classes/library/Movie.class b/build/classes/library/Movie.class index f43617813c2912f580323105647bac7b45d274a1..a8bc7f1ec6b73a14c99b43b5577f800800909939 100644 GIT binary patch delta 89 zcmX@ae~5pBHJhj!0}q2bgD8UrgB*hFuq!}4(fg}@y9RP@{3+Vs= delta 89 zcmX@ae~5pBHJhj^0}q25gD8VKgB*hfgBF7(gE52lSF|wtU#R_K$?-k7DzHN*Z}~A0Sngv diff --git a/build/classes/library/MovieFieldPattern$1.class b/build/classes/library/MovieFieldPattern$1.class index 98f939349d1521e1e282c282d30476ac2040a68a..8258a23bc1f66d5086887b7f5f6c9c1e437a172f 100644 GIT binary patch delta 23 fcmZ3)wuo)RBqm1J$&;D9Slt;o7(6CFVsZcgRLTaR delta 23 fcmZ3)wuo)RBqm0e$&;D9Slt*n7~Cg6VsZcgRILV` diff --git a/build/classes/library/MovieFieldPattern$2.class b/build/classes/library/MovieFieldPattern$2.class index 6be2ba30e27acc16a628632e14bf12be9bb4b6f4..050a8e174959bc5e9db761c6663272def2bee4aa 100644 GIT binary patch delta 23 fcmZ3)wuo)RBqm1x$&;D9SOXb27=k80VsZcgRqO`7 delta 23 fcmZ3)wuo)RBqm0`$&;D9SOXY17y>6hVsZcgRnG>y diff --git a/build/classes/library/MovieFieldPattern$3.class b/build/classes/library/MovieFieldPattern$3.class index e3b2db2dfe3c3dec95ae440c558ed9eaff180aff..77a465f1cba3b916e99c1dac605f044ec0eb206b 100644 GIT binary patch delta 23 fcmZ3)wuo)RBqqk_$&;D9SYsJD7~&>BVsZcgS4alp delta 23 fcmZ3)wuo)RBqqkF$&;D9SYsGC7-AtVygroat*rmAR9 zU@a+BTFUZMd~7C)UMec`6KO4#dY@r0lvegYV52t&w=)uG4NXo0?L=vMeKAg{d?(X_ zBTI?NWHFMZa{e^fa`FPm+;Czjd|-|AhV3BDtflZLw-JQdh=SdGr|_{&;ocBAUYjaDX&(8e;)xyZ?Sd2zKaC? z-7ARxH5#95Ovop{;xol#`M8T^rfK3HlQ&rIKHn`~{8hATIo?vf`TGe^?!IaO delta 348 zcmYjMOG*Pl6s$KrGp(KWlW5{En(f5R1a%=Qp1_sDfVyfS#Fp4#GI2X+khy_3&_x0Y z9zYOtBJqt8?vuo49LSCq5lGXRf+!f`4nQBh;eH zlc{``_N?n1HWPyCx6{P-?Zg~iG!wKCa4&-7k{%y^i8sY8W+cX7djxv=kxM)aGmw2i zGw6u}b6DVwu=scTfYS=2euZ~Ff)GRa(~#o(z$Z!=|I5+8IRa%?Jyfv7=rdc!JTt|K I0VB8k26Lt_kN^Mx diff --git a/build/classes/library/MovieFieldPattern.class b/build/classes/library/MovieFieldPattern.class index 235bd3c180dd914e28d898cf216edda3dfd81f9b..f4d794c931284c7b2433fdda1ab7fb5c191888c9 100644 GIT binary patch literal 9166 zcmbVS349dib$@S1(yW#N#BvI8gKZ%J;`G5SkO097WLAI$cH+@$kOo#WVs;lKd|`aw z#y7UH9mg?oP8*vQjuLW`)=8SwPGS<jg>Mplpt1(JJUqxF#E3rx zd8E|ut6UbM^+Gfa!g-X+;Sg=2KdC$#p5QSdYUHsY9>?QLc>C&7b#Y`cdC3F|4e4+GRBt@kZvjtrx1l6THhvy1zp5SUk;e3@BV4%D(#EW>b zjAKcNFXl@^w3{!L;<6ww4e>Hw9^@6murkD}cy*9#L)6D>LbQn23REZPdX?9yygtMm z(8CS9v6MG)M4(2MH>`NhOoE1*+m^GZ}~MG5P%w zz14`LyCkMtF(VFR+f2uZC2fakLOyA;(Vbjp8u2!e56@CLmfi`erSVv9jK%RD3>>&l z-L&E&pDEO7?>CK%2}NFi$#T;&lPlrE%GulDwY7E|B#n%ima#e2*=jh=daGC*j@U6h zzFl`rX=ji{$qo~vt%$_UR!4VwY8pj>YhII{Od5`ixu|ldNDey2z7$4QC1k>r>gsZgL}G{TScp>sLW=k6@szkKWyLy-*j_Ow?1gR1UN21IVMMUfFUX6t z41=K~Jh%&!Dm%YwV`55^;q11ZPLV$~BT7Gztbx5&vc@B+7kHTnRgC>mnK8XE8Pi1H z3>&0_J0)m&VUP(DP3p0|je1umUZW-EgLub!vu+T+NTv?cxXN9F$Lr1&)7ovT+$@@H zdvC4Pw$3o(4L~woch$|BKYu>c(#rgpm7C{eE2x;()dcgib-wmNv6&mUaIjY=<~=c zTa7bc?MWEUQY5~u_FhyKS@#SI$gBk->602?%{t<`$xGg*4yI{-yXuVHdMYj%)7_^U zk)n~!%Ut7p`w+Bma(X&VOFwfM`L?;kF|h!!2ZWlOgFWpw#)i$WwAL~^?E|_6xVUz2 zY>x?oy0|{A?VxGI&`>woNLwZ>D%oH=j_rt%ts2J|x$HcHS%?(nw>m1jYtES(8@vM> z-;SOxKmYb3Gd=cnC z{t&8Lq_|bY+@|sEe22z&GLq!o8sE$JX?#B)(f9#DKS)ntg5}K(jUVENRenU{NBJ?0 zkMiRxKcVrH{ID2)Oyj47r=-5FrFq*%m7mu58U7TaxGlQv%uO0UOHZi$X^o%b&wy&P z+1Z*(X#705`8a=8;}-<_oXk>pc6obb;cSbYIL|VF-ctGVDt|%aFY=dE{<6j|@=F?@ z;Ft5n7S7N4Bn7iG&RzZpZaaT&KJRQ;qVg*mpX4;t1$i=u+KrepTiu_tZ%s%T$?U?6 z+X-V!m*He`Ur}X)ju7rqs0^$PR#z&y-Ehp^rYzAZ9&J`}UaxyZ7+*kGgR4e` zG%r1ceFqJ}xQx>69ciFr$e_BUqi~A$P5}`!ku-3?#-{6&=|8+=DO|?*S z!3iPjB+1zQc!`C(>$sUbhes-eM(=oudE^_XhszvUT-&Dm=Z`O|%<`F8>VwrteQjOC z=JhzW<{dQ(vcmAuF~>mmZ_*tdt0L}_Av+9cM?4#|lccaP&ozZ;@}xoOSWjsb=W@8# z)U#?w4#HGt99~H30Ak3!Xeeh5AVmVjgv-Taz1}roq521yXFQG)g(EfHQ&ZA(!P~nvlQ6WQ|SJ{AtJLI$&%(=SY;La-~&s$Kw z;r~C9fue%VTWcF4?%Zx1T54`BEZaHsPzQ=$^YI5d*juX#3K`mn!4l>oKp%%boR_#V zb0?EG3$2*U+(A|fuBnaI!8`!xG@T(!+ibm2HM;Bu6^f#X35-f)j+*lGM1Ufg%8Drb9F-0ZZ? zu@$(uOSCq-?@lGyLG(EI^BzsIM(sql2B~+@bm>RPzT5v|kav)F$zY@#=~U8;*T4ns z@=g~)Edeiuuq-?;;~9TMyt!CYfEP2!y&eqclQ$&f=V<-*`mOcZH>d(MU{~CDtj%c6 zS0Q4S`GS&p9Q0vuBg4fD&u8wL!o8ZhM-ulT=<<{y4^zWTYrnnMh~PAUv1Si6?)bK* zEGx%7*`F-jW#lc->q@)cWYezQ3vE6jo!Ol z_-?duZ+2l^*WDUdXt&1Q+^um@cWYeE-5S?*x5ic6t?^vo*0{l=9uC=fctH6iT313o zqn=UKOT|^nNh*;-l_DrbX;pEWhM`k?$(3;oq z;jRcT@VKY+(ZZIp;MZtTixOTOZ7B*biMAAnFOIg9gfEGIvt3FjYy@8tDqJ_4Lii(s+KVL*I;WeVWz@&`0Y< z+=etYpgA+V(ZkQ|qfLU30N+QAEmdjS+)G;`Qdg&`sk-_EU7n_`fTL+@_O&t~gpEnl zHdNzLrD=QFrSePDj(&m(W#>lG+hym{bOq>!qs4o&t*O$Q?zX_3rWVlz)}0vLE>Kql z0;6vD(Bmu*lwIjHM9(Ps<>{GNcCIXv6+A_hzT>t;Bt*@~VXi6*%MZ*z&rH)Npx4tb zg2%c#KI!7F9^e4bPX&FBAC~HH56~GeV03}(XiiXTnqvJV;vrDN9Yd0odn6dikR%lz z3C5QrDVr`o&leeUW_VN>oEwyK-x3Z!TSe?}clq zh8k%;T|o;dhV)?}RrJsjx*okp=u+gZrSwHwPT!yv^ct*XhQ;!x@J*c$PLyAQYD+lQjp_2IRf=@{C##8z6sF_ zfbg`2QueZ1q;=V0N--5@U}>z&O$BVd((yb6!JJb;rMZ2gl)iv)%RYhE`HZ+F;1DkE z7gK^Rg1&wcoD;$HBE95_z$<@7#CJ#~1st;8OODc#KHA-)03M#Ec3Cf8H4)V*>HuO& zn#?rq>7~7m$m{XrG!4k$QPMcvd5Wy#RED;Clu9{lqmAj_CB`Wv+wz4N55ayF>KDS8 zi($@cd~#@@m#K+fq3!tSuoK@Q#Q168S%_WqW#DCuyK=+Wl^MoKV2eq)Y@`MPe67fg zXh^5@eS}l+{Uak{1!~b*oHak-n(u|^G>rPXPgHTvu;PqirF4p3^+a(B)N&TN`xNbq zRG(gVW+$(O^GxmkJ1PMQ>SSEaVou8;o~2^eVm#i;qEl`oT7s# z=o-d!x%N0MFMz8ofEzOi*GGr2&);~84!;DO2w7z@9dPRnbe&sYiQFRiF1jHTu+20Y znD3+f0Rr+@R7pQXmij(ueh%)}k&WJsEkg-pA3G1z5(be7y2fkeJ=DZK=2@ao4$iu!akLP z=crVrGtAT9r{Xm#eK)GoU*PXA@%LI;S&+U5GrdK(6tR?OmQ+>uQqjPrGSU~y5)AVh zP=XeN#ZrNs9~PFQd|Wv{Dl7--P}Z=l4sYpxls$i4Sk9mna9%mk_`0k24Y~>SPHaGj zP!qDxCbuU1pAzri%1k{kQ}^*I`YM+91pJSW&ei2S1@%5+o`gDy`dZZ26*14@yZD~f G<^KoPg5wMT delta 4017 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 - + + + + + @@ -81,8 +85,11 @@ - - + + + + + @@ -186,5 +193,13 @@ + + + + + + + + diff --git a/src/library/Album.java b/src/library/Album.java index 517e44d..dab8af8 100644 --- a/src/library/Album.java +++ b/src/library/Album.java @@ -11,6 +11,8 @@ package library; */ public class Album extends Item { + private String musican; + Album() { } @@ -20,7 +22,7 @@ public class Album extends Item { this.setName(n); this.setYear(y); this.setCategory(c); - this.musican = m; + this.setMusican(m); } public static Object[][] insertRowToTable(Object[][] tab, int r, Album a) { @@ -38,28 +40,22 @@ public class Album extends Item { d.insertAlbumQ(this); } - ; -@Override + @Override public void delFromDB() { } - ; -@Override + @Override public void editInDB() { } - ; - - -public void setMusican(String s) { + public void setMusican(String s) { this.musican = s; } public String getMusican() { return this.musican; } - private String musican; } diff --git a/src/library/AlbumFieldPattern.form b/src/library/AlbumFieldPattern.form index 042a88a..fa48ce0 100644 --- a/src/library/AlbumFieldPattern.form +++ b/src/library/AlbumFieldPattern.form @@ -47,7 +47,11 @@ - + + + + + @@ -82,7 +86,10 @@ - + + + + @@ -186,5 +193,13 @@ + + + + + + + + diff --git a/src/library/AlbumFieldPattern.java b/src/library/AlbumFieldPattern.java index e401903..3305d5d 100644 --- a/src/library/AlbumFieldPattern.java +++ b/src/library/AlbumFieldPattern.java @@ -49,6 +49,7 @@ public class AlbumFieldPattern extends javax.swing.JFrame { Category = new javax.swing.JComboBox<>(); mainlabel = new javax.swing.JLabel(); SaveChanges = new javax.swing.JButton(); + cancel = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); @@ -94,6 +95,13 @@ public class AlbumFieldPattern extends javax.swing.JFrame { } }); + cancel.setText("Anuluj"); + cancel.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + cancelActionPerformed(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -118,7 +126,10 @@ public class AlbumFieldPattern extends javax.swing.JFrame { .addComponent(lcategory, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(SaveChanges, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(layout.createSequentialGroup() + .addComponent(SaveChanges, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(37, 37, 37) + .addComponent(cancel)) .addComponent(Category, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE)))) .addContainerGap(26, Short.MAX_VALUE)) ); @@ -144,7 +155,9 @@ public class AlbumFieldPattern extends javax.swing.JFrame { .addComponent(lcategory) .addComponent(Category, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGap(18, 18, 18) - .addComponent(SaveChanges) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(SaveChanges) + .addComponent(cancel)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); @@ -163,18 +176,23 @@ public class AlbumFieldPattern extends javax.swing.JFrame { if (this.add) { Album a = new Album(0, albumTitle.getText(), musican.getText(), Integer.parseInt(year.getText()), Category.getSelectedItem().toString()); a.insertToDB(); + this.dispose(); } else if (this.edit) { JOptionPane.showMessageDialog(null, "EDYTUJ"); } else if (this.delete) { JOptionPane.showMessageDialog(null, "USUŃ"); } - dispose(); + }//GEN-LAST:event_SaveChangesActionPerformed private void yearActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_yearActionPerformed // TODO add your handling code here: }//GEN-LAST:event_yearActionPerformed + private void cancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelActionPerformed + this.dispose(); + }//GEN-LAST:event_cancelActionPerformed + /** * @param args the command line arguments */ @@ -219,6 +237,7 @@ public class AlbumFieldPattern extends javax.swing.JFrame { private javax.swing.JButton SaveChanges; private javax.swing.JLabel Title; private javax.swing.JTextField albumTitle; + private javax.swing.JButton cancel; private javax.swing.JLabel lcategory; private javax.swing.JLabel lmusican; private javax.swing.JLabel lyear; diff --git a/src/library/BookFieldPattern.form b/src/library/BookFieldPattern.form index 9f78550..ad9bb3d 100644 --- a/src/library/BookFieldPattern.form +++ b/src/library/BookFieldPattern.form @@ -56,7 +56,10 @@ - + + + + @@ -110,8 +113,11 @@ - - + + + + + @@ -286,5 +292,13 @@ + + + + + + + + diff --git a/src/library/BookFieldPattern.java b/src/library/BookFieldPattern.java index 624ec12..9c1b7ca 100644 --- a/src/library/BookFieldPattern.java +++ b/src/library/BookFieldPattern.java @@ -60,6 +60,7 @@ public class BookFieldPattern extends javax.swing.JFrame { mainlabel = new javax.swing.JLabel(); SaveChanges = new javax.swing.JButton(); jLabel1 = new javax.swing.JLabel(); + cancel = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); @@ -145,6 +146,13 @@ public class BookFieldPattern extends javax.swing.JFrame { jLabel1.setDoubleBuffered(true); jLabel1.setName(""); // NOI18N + cancel.setText("Anuluj"); + cancel.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + cancelActionPerformed(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -177,7 +185,9 @@ public class BookFieldPattern extends javax.swing.JFrame { .addComponent(Category, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(SaveChanges, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGap(18, 18, 18) - .addComponent(jLabel1) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel1) + .addComponent(cancel)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -219,8 +229,10 @@ public class BookFieldPattern extends javax.swing.JFrame { .addComponent(lcategory) .addComponent(Category, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGap(18, 18, 18) - .addComponent(SaveChanges) - .addContainerGap(33, Short.MAX_VALUE)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(SaveChanges) + .addComponent(cancel)) + .addContainerGap(32, Short.MAX_VALUE)) ); jLabel1.setVisible(false); @@ -271,6 +283,10 @@ public class BookFieldPattern extends javax.swing.JFrame { jLabel1.setVisible(false); }//GEN-LAST:event_ISBNFocusLost + private void cancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelActionPerformed + this.dispose(); + }//GEN-LAST:event_cancelActionPerformed + /** * @param args the command line arguments */ @@ -318,6 +334,7 @@ public class BookFieldPattern extends javax.swing.JFrame { private javax.swing.JLabel authorname; private javax.swing.JLabel authorsurname; private javax.swing.JTextField bookTitle; + private javax.swing.JButton cancel; private javax.swing.JLabel jLabel1; private javax.swing.JLabel lISBN; private javax.swing.JLabel lcategory; diff --git a/src/library/Database.java b/src/library/Database.java index d398f51..2ddec0f 100644 --- a/src/library/Database.java +++ b/src/library/Database.java @@ -73,7 +73,7 @@ public class Database { public boolean createTables() { String createBooks = "CREATE TABLE IF NOT EXISTS books (id INTEGER PRIMARY KEY AUTOINCREMENT, name varchar(255), author_name varchar(50), author_surname varchar(50), publishing varchar(50), year int, isbn varchar(20), category varchar(100))"; - String createAlbums = "CREATE TABLE IF NOT EXISTS albums (id INTEGER PRIMARY KEY AUTOINCREMENT, name varchar(255), musican varchar(50), author_surname varchar(50), year int, category varchar(100))"; + String createAlbums = "CREATE TABLE IF NOT EXISTS albums (id INTEGER PRIMARY KEY AUTOINCREMENT, name varchar(255), musican varchar(50), year int, category varchar(100))"; String createMovies = "CREATE TABLE IF NOT EXISTS movies (id INTEGER PRIMARY KEY AUTOINCREMENT, name varchar(255), director varchar(50), year int, category varchar(100))"; try { stat.execute(createBooks); @@ -89,7 +89,7 @@ public class Database { public void insertBookQ(Book b) { try { PreparedStatement prepStmt = conn.prepareStatement( - "INSERT INTO books VALUES (NULL, '?', '?', '?', '?', ?, '?', '?');"); + "INSERT INTO books VALUES (NULL, ?, ?, ?, ?, ?, ?, ?);"); prepStmt.setString(1, b.getName()); prepStmt.setString(2, b.getAuthorName()); prepStmt.setString(3, b.getAuthorSurname()); @@ -111,13 +111,12 @@ public class Database { public void insertAlbumQ(Album a) { try { PreparedStatement prepStmt = conn.prepareStatement( - "INSERT INTO albums VALUES (NULL, '?', '?', ?, '?');"); + "INSERT INTO albums VALUES (NULL, ?, ?, ?, ?);"); prepStmt.setString(1, a.getName()); prepStmt.setString(2, a.getMusican()); prepStmt.setInt(3, a.getYear()); prepStmt.setString(4, a.getCategory()); prepStmt.execute(); - System.out.println(prepStmt); JOptionPane.showMessageDialog(null, "Dodano poprawnie.", "Informacja:", JOptionPane.INFORMATION_MESSAGE); } catch (SQLException e) { JOptionPane.showMessageDialog(null, "Błąd przy dodawaniu albumu do bazy", "Error:", JOptionPane.INFORMATION_MESSAGE); @@ -129,7 +128,7 @@ public class Database { public void insertMovieQ(Movie m) { try { PreparedStatement prepStmt = conn.prepareStatement( - "INSER INTO movies VALUES (NULL, '?', '?', ?, '?');"); + "INSER INTO movies VALUES (NULL, ?, ?, ?, ?);"); prepStmt.setString(1, m.getName()); prepStmt.setString(2, m.getDirector()); prepStmt.setInt(3, m.getYear()); diff --git a/src/library/MainMenu.form b/src/library/MainMenu.form index a3824a3..5138dfa 100644 --- a/src/library/MainMenu.form +++ b/src/library/MainMenu.form @@ -74,7 +74,7 @@ - + @@ -374,11 +374,16 @@ - + + + + + + @@ -397,9 +402,10 @@ - + - + + @@ -428,6 +434,7 @@ + @@ -440,7 +447,7 @@ - + @@ -450,6 +457,14 @@ + + + + + + + + diff --git a/src/library/MainMenu.java b/src/library/MainMenu.java index caa4e5d..1f7c31f 100644 --- a/src/library/MainMenu.java +++ b/src/library/MainMenu.java @@ -59,7 +59,8 @@ public class MainMenu extends javax.swing.JFrame { jLabel4 = new javax.swing.JLabel(); numberOfBooks = new javax.swing.JLabel(); numberOfAlbums = new javax.swing.JLabel(); - numberOfAlbums1 = new javax.swing.JLabel(); + numberOfMovies = new javax.swing.JLabel(); + refreshNumbersOfItems = new javax.swing.JButton(); jToggleButton1 = new javax.swing.JToggleButton(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); @@ -264,7 +265,14 @@ public class MainMenu extends javax.swing.JFrame { numberOfAlbums.setText(n); n = new Integer(d.countAll("movies")).toString(); - numberOfAlbums1.setText(n); + numberOfMovies.setText(n); + + refreshNumbersOfItems.setText("Odśwież"); + refreshNumbersOfItems.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + refreshNumbersOfItemsActionPerformed(evt); + } + }); javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); jPanel2.setLayout(jPanel2Layout); @@ -283,8 +291,12 @@ public class MainMenu extends javax.swing.JFrame { .addGroup(jPanel2Layout.createSequentialGroup() .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(numberOfAlbums1))) + .addComponent(numberOfMovies))) .addGap(0, 23, Short.MAX_VALUE)) + .addGroup(jPanel2Layout.createSequentialGroup() + .addGap(69, 69, 69) + .addComponent(refreshNumbersOfItems) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -300,8 +312,9 @@ public class MainMenu extends javax.swing.JFrame { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jLabel4) - .addComponent(numberOfAlbums1)) - .addContainerGap(25, Short.MAX_VALUE)) + .addComponent(numberOfMovies)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(refreshNumbersOfItems)) ); jToggleButton1.setText("Własne zapytanie SELECT"); @@ -347,7 +360,7 @@ public class MainMenu extends javax.swing.JFrame { .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jToggleButton1) - .addContainerGap(50, Short.MAX_VALUE)) + .addContainerGap(43, Short.MAX_VALUE)) ); pack(); @@ -384,7 +397,7 @@ public class MainMenu extends javax.swing.JFrame { b.edit = true; } if (radioBSearch.getModel().isSelected()) { - MovieFieldPattern b = new MovieFieldPattern(); + AlbumFieldPattern b = new AlbumFieldPattern(); b.setVisible(true); b.delete = true; } @@ -491,6 +504,17 @@ public class MainMenu extends javax.swing.JFrame { }//GEN-LAST:event_allAlbumsShowActionPerformed + private void refreshNumbersOfItemsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_refreshNumbersOfItemsActionPerformed + String n = Integer.toString(d.countAll("books")); + numberOfBooks.setText(n); + n = ""; + n = Integer.toString(d.countAll("albums")); + numberOfAlbums.setText(n); + n = ""; + n = Integer.toString(d.countAll("movies")); + numberOfMovies.setText(n); + }//GEN-LAST:event_refreshNumbersOfItemsActionPerformed + /** * @param args the command line arguments */ @@ -547,13 +571,14 @@ public class MainMenu extends javax.swing.JFrame { private javax.swing.JButton newestMovie; private javax.swing.JButton newestMovie1; private javax.swing.JLabel numberOfAlbums; - private javax.swing.JLabel numberOfAlbums1; - private javax.swing.JLabel numberOfBooks; + public javax.swing.JLabel numberOfBooks; + private javax.swing.JLabel numberOfMovies; private javax.swing.JLabel programTitle; private javax.swing.JRadioButton radioBAdd; private javax.swing.JRadioButton radioBDelete1; private javax.swing.JRadioButton radioBEdit; private javax.swing.JRadioButton radioBSearch; + private javax.swing.JButton refreshNumbersOfItems; private javax.swing.JPanel searchButtonsPanel; // End of variables declaration//GEN-END:variables } diff --git a/src/library/Movie.java b/src/library/Movie.java index 2c036b1..2d370f1 100644 --- a/src/library/Movie.java +++ b/src/library/Movie.java @@ -33,6 +33,7 @@ public class Movie extends Item { this.setYear(y); this.setCategory(c); } + public static Object[][] insertRowToTable(Object[][] tab, int r, Movie m) { tab[r][0] = m.getId(); tab[r][1] = m.getName(); @@ -42,6 +43,7 @@ public class Movie extends Item { return tab; } + @Override public void insertToDB() { d.insertMovieQ(this); diff --git a/src/library/MovieFieldPattern.form b/src/library/MovieFieldPattern.form index 8f266ba..6573f6e 100644 --- a/src/library/MovieFieldPattern.form +++ b/src/library/MovieFieldPattern.form @@ -47,7 +47,11 @@ - + + + + + @@ -81,8 +85,11 @@ - - + + + + + @@ -186,5 +193,13 @@ + + + + + + + + diff --git a/src/library/MovieFieldPattern.java b/src/library/MovieFieldPattern.java index 5391f21..4bb7fa4 100644 --- a/src/library/MovieFieldPattern.java +++ b/src/library/MovieFieldPattern.java @@ -48,6 +48,7 @@ public class MovieFieldPattern extends javax.swing.JFrame { Category = new javax.swing.JComboBox<>(); mainlabel = new javax.swing.JLabel(); SaveChanges = new javax.swing.JButton(); + cancel = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); @@ -93,6 +94,13 @@ public class MovieFieldPattern extends javax.swing.JFrame { } }); + cancel.setText("Anuluj"); + cancel.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + cancelActionPerformed(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -117,7 +125,10 @@ public class MovieFieldPattern extends javax.swing.JFrame { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(year, javax.swing.GroupLayout.PREFERRED_SIZE, 76, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(Category, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(SaveChanges, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addGroup(layout.createSequentialGroup() + .addComponent(SaveChanges, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(cancel))))) .addContainerGap(21, Short.MAX_VALUE)) ); layout.setVerticalGroup( @@ -142,8 +153,10 @@ public class MovieFieldPattern extends javax.swing.JFrame { .addComponent(lcategory) .addComponent(Category, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGap(33, 33, 33) - .addComponent(SaveChanges) - .addContainerGap(26, Short.MAX_VALUE)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(SaveChanges) + .addComponent(cancel)) + .addContainerGap(25, Short.MAX_VALUE)) ); pack(); @@ -166,13 +179,17 @@ public class MovieFieldPattern extends javax.swing.JFrame { } else if (this.delete) { JOptionPane.showMessageDialog(null, "USUŃ"); } - dispose(); + this.dispose(); }//GEN-LAST:event_SaveChangesActionPerformed private void yearActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_yearActionPerformed // TODO add your handling code here: }//GEN-LAST:event_yearActionPerformed + private void cancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelActionPerformed + this.dispose(); + }//GEN-LAST:event_cancelActionPerformed + /** * @param args the command line arguments */ @@ -214,6 +231,7 @@ public class MovieFieldPattern extends javax.swing.JFrame { private javax.swing.JComboBox Category; private javax.swing.JButton SaveChanges; private javax.swing.JLabel Title; + private javax.swing.JButton cancel; private javax.swing.JTextField director; private javax.swing.JLabel directorrname; private javax.swing.JLabel lcategory;