From da3f9a0f1ba050cd18d6db1b5d5b64737d9699eb Mon Sep 17 00:00:00 2001 From: Agnieszka Janicka Date: Tue, 7 Jun 2016 20:03:50 +0200 Subject: [PATCH] start dalszych prac --- build/classes/library/AlbumFieldPattern.class | Bin 8616 -> 8653 bytes .../classes/library/BookFieldPattern$1.class | Bin 795 -> 795 bytes .../classes/library/BookFieldPattern$2.class | Bin 795 -> 795 bytes .../classes/library/BookFieldPattern$3.class | Bin 795 -> 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 10207 -> 11225 bytes build/classes/library/BookFieldPattern.form | 22 +- 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 11749 -> 14333 bytes build/classes/library/MainMenu.form | 265 +++++++++++++++--- build/classes/library/MovieFieldPattern.class | Bin 8656 -> 8693 bytes src/library/AlbumFieldPattern.java | 2 +- src/library/BookFieldPattern.form | 22 +- src/library/BookFieldPattern.java | 34 ++- src/library/ListResult.form | 14 +- src/library/ListResult.java | 14 +- src/library/MainMenu.form | 265 +++++++++++++++--- src/library/MainMenu.java | 241 ++++++++++++---- src/library/MovieFieldPattern.java | 2 +- 27 files changed, 725 insertions(+), 156 deletions(-) diff --git a/build/classes/library/AlbumFieldPattern.class b/build/classes/library/AlbumFieldPattern.class index 0ed422e51c0e767e7cc6f32f7dd7fb0357d8971e..d316e4e215c8ac158181f232bd252a7feabc0c20 100644 GIT binary patch delta 3507 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 A)&Kwi diff --git a/build/classes/library/BookFieldPattern$1.class b/build/classes/library/BookFieldPattern$1.class index 3d993bb52db87fe3beb1cdcd03f6a72f4fa22dc0..b550c6bdd85b9510242bc3a486e1c4f630715b15 100644 GIT binary patch delta 23 ecmbQuHk)ljHxr}VhLFj(nH&IA1O}l1 diff --git a/build/classes/library/BookFieldPattern$3.class b/build/classes/library/BookFieldPattern$3.class index d6b23009aa8ec27f6a2a0f90c67e810737bbaabd..f4263f600196909e2663ad20214238786bb7814b 100644 GIT binary patch delta 360 zcmbQu_J&R6)W2Q(7#J8#7}Pl#SQ(_b7}ywOxELfEWI==+JA*tsgTh3mEwS8b`N^fl z?unUssVR&MavDBaiDilUiRC5wsb#5oCHih4X;%=_S~HB1fjPCTgpolSk19q6POy68RRFbYzgO2OfJdH z&kIN`O3N?GO-*5Bkk|0ZN-Rs%Pb@FdPc2K$E75lZD{%#}tu@0K8JJVcN*Ebr@F|;Y z%4jK}z{8-(pv1$#&cMOLzzJe0GpH~!NKG`9Fjg^UWDo$`larX2uJ50em6{ARR2Hk% zKAFWOsd22qe4gBXK2kY)h}i6jF*ki`Ym%>tx>007-;NgV(H diff --git a/build/classes/library/BookFieldPattern$4.class b/build/classes/library/BookFieldPattern$4.class index bc3f9c95e418f7ec1a92b4cb84b4c7e635d74efe..b4ecd7f79ce0dca3f3115297033dab24c1bf0ca0 100644 GIT binary patch delta 14 VcmbQuHk)k&I}@YHW)3D{MgSa^0|Ed5 delta 14 VcmbQuHk)k&I}@YvW)3D{MgSa;0|5X4 diff --git a/build/classes/library/BookFieldPattern$5.class b/build/classes/library/BookFieldPattern$5.class index aaae77bd27015f5085d1f0dfc6b2aebdbd84a67a..c1f41cecb5afb8e13e589173bbf958ad000ed23a 100644 GIT binary patch delta 29 lcmbQuHk)k&I}@YnWDcfg#+u1JOkS*Y3>*yglW#LQ004B|2lM~{ delta 29 lcmbQuHk)k&I}@YHWDcfg#=6NpOkS)F3>*xNlW#LQ004CY2l)U1 diff --git a/build/classes/library/BookFieldPattern.class b/build/classes/library/BookFieldPattern.class index a4efe162af83d0a4d4dc9332bfeff00707288e97..10b07da4e0fbcc0b15ec97be3c33fd0a943023cd 100644 GIT binary patch literal 11225 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 z zcjt{9vF&S+C+R{Ff>9S?0y+qbT`sFj290&VMGm+C>ZO{^ARFyyg86<5CaFafNwFMd zt2!p{c;2}^`V`u@aduVWP75td>kVc$-hiHHpoF5La0(6Kr7|%TN!pONRQ{}4wI->p zj}?VBNufNy{MnY;2pa>PG9^sp>M>C798x4=W>CVW1CkWjB%=l)8Eumk4nk67lfYI3 z3L0yZjLSwMUIRUgZITiPN$=b8wOoO+{3#zyUA~k$5_t zPBUmO&7>-tMJs7GolA2l2uy^|pl&*oE~j}o@8;tregO`Gh4eI?h0g<(^cF^ZK-Kgc zs-Z7w1?N&752t#bKn*;b&f#iW$Lr`^zKGUyjLzeW=>ooiF67;G5$~gBK0+=00U7)u zwelC##($-VYdD#%LfYh7Ls3@?ZEt(va^(I~E zdXILven>lAKc=f(AJWyXPv{!gXLPOW_jH}>OS<0mXTV?64engJ(LIuGa!;U}-KPMa zO1HSD(>3ndbgO$I-R7>P+udvE4!2Hsx;tr?dmG*5-VXduy4!st-Q&K4?se~>``r8J ze)oQQz9#aZvpHf7RD<$-VGLfECrqNT%TzXnrOwTAw0N2reB|y(A>*+aV107I8fK5s& zo9Uo(2^~_dqUV)s0pCn7D7)ye@&LW4JWekuPXRtaN0b-oW#x5xMR}iIRel8c=k%KL zDZQ?IPDhnL(lO;vfWM+Qa$NLgj+frb8AWgB6ap@#cXG<<-JEIkUd~L~motYR%{i0a z&sj)6OrO^|i|q5-^)lAwDfj}Dc-Ju0`|_YwKX4R)Pir|zQVhpD5<4H&^Af@-8)A-G9v45~w90zya=1Ol8?B}wW`(x!tH zU3q$vVtbJZJV)MLq_IDKh!T4#4{gsb^0I$3+SrF(qP3eO`8t)nC_g5ZKB1-bDXpMi z(i-{|eTRNc26j|CeNHC*)|ycX#we=THA&yyMZ*NV_z+#Pm%Nv|dGFUB?WKk~|F$H3{}5fepSCl+=d!)D zAPcTM3vOgT++o^*6mRDty6PF|M2MfW=zCVZ43SdW=hGEd-APxbR=XYvHqqCV53es_ zd;nk_xnkpW+OqP98#=SffkXPuFmvWwk}v zMEOYH-=Mdl$87wx>K%F))~dCj_W)gBLH__~lLh@FAXt#z$9^Vy1^*|J=Qw#)`hdCg zFO*ZI(vJcv{TTm0!T&$y<$36*^fL^TJva}ZC3`S;(&U4bliq;#Ue0$cWiGa&+#5hk zzmUBQJ|AZ1qns$8kFxV|pD3S?v-5GCD4&1M&Zl3j8`M6q>nE_53xVKj)Xlhm?GW=J zsI9VUq9v(%ZmOQ1s;8vtH+eM>{o}eJL?dL47&uYf)dPFn%X?JKuSB G(cb`+Hx1JO diff --git a/build/classes/library/BookFieldPattern.form b/build/classes/library/BookFieldPattern.form index e5683ab..9f78550 100644 --- a/build/classes/library/BookFieldPattern.form +++ b/build/classes/library/BookFieldPattern.form @@ -1,6 +1,6 @@ -
+ @@ -55,6 +55,8 @@ + + @@ -100,6 +102,7 @@ + @@ -211,8 +214,11 @@ + + + @@ -266,5 +272,19 @@ + + + + + + + + + + + + + + diff --git a/build/classes/library/MainMenu$1.class b/build/classes/library/MainMenu$1.class index c313a1e3460a6df47832b283a956b22bc6c345bb..aa64097dbe9366b5aebfa3f933bd6336d9876df4 100644 GIT binary patch delta 23 ecmaFN`j~Y?FcYKOgnH&IG2?nSD delta 23 ecmaFN`j~Y?FcYKyudnH&IEkOqMO diff --git a/build/classes/library/MainMenu$5.class b/build/classes/library/MainMenu$5.class index 22d569460c1641dc2ed25690274f6f1b214156d8..bf7afd2574df028a9beaf695f1f98076474cc4f5 100644 GIT binary patch delta 23 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 Sw=o|FH@^cO-{trC-TwzmYkyAw literal 11749 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 - - + + + + + + + + + + + + + + + + + + - - - - - - - - @@ -56,13 +64,17 @@ - - - + - - + + + + + + + + @@ -94,26 +106,25 @@ - - - - - - - - - - + + + + + + + - + + + + - @@ -124,15 +135,14 @@ - + - @@ -186,6 +196,17 @@
+ + + + + + + + + + + @@ -198,34 +219,192 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - diff --git a/build/classes/library/MovieFieldPattern.class b/build/classes/library/MovieFieldPattern.class index 625e0bbf8eca0a46454c00fe45b326f007e38b0d..235bd3c180dd914e28d898cf216edda3dfd81f9b 100644 GIT binary patch delta 3553 zcma)933yc175>jmX6~Dp3we2gtR!JTBPL)7n-GDr3m6ueKpg@~f(St%5D2R}vWSX7 z)Il^VE{H~Hr9#L{N-Eu?i>x~p%?|ZcTy&1 zl3`Ma%n+rL7O{_zz9yxSWl}oX!et2QCt`mgnPQwJcG-$@VzQVkQl4-FWHCQP1ym^F zKv@V&vO$Ulb8B>&NtaU**GgBIG=#1+v5bm^lo&MBq+xWGL8am_+@vxZVbDkuEi}qR z8I2ZhjHs_xG*;0#lgg=Rlu6gn_z+E?iNbwM(IiEa6-`kz)x>tZZqhWG9?$ocsNlvG z)%D9)waoC9`)NjeXW)FFYu!i*kNE!Jq1m6n3mVNrJ|!fMgBo`rrg5i`okDgYMzB{` zZ?4{2x^YYGx|OA~XVh1(U7=|v&C+;6TpmPYe3dF16sOsmuA_BFZK_+RaX0RX z7aHTT;xtFoT$)EvmD@HooZVHfX+Dm|>x_{`oUYfjfFki@#$gsJH7%q?@p+*M{*TkF z_<_)(*bNlrEuh7Usx&R3rHXFUw2Z1X)zHnFR?tdCt2EULuGVxbtplU_8Yl_jGIz~Hbm!{paxCaLb zeb&_0)K}MUE1grfxt90)F50W;ZcX>ly_)vXeTo`2?Wes`^!=I+h);0(v}onR*@_;} z^dLP%2rP^&JiA*HKUzfxH9bs+*lKR=+L{Kg_YwA{N2y8EV-#feao((V%*mNgC_1d^ zNqS1r)0&>4BbuJ2qwz_p2ZPUPdY+nF-bx*oLNBx!R+*1pY$>-_r|{(v;=8FYNJfY` zk|}bL2gyaAB}Sh-PhP#t<@d78&(Gy~KwRY6aFGYaMIH_pd0brNQE-vx&PAReaOhMH z%6&3@nAJ--Ffk4)ZbM43zZC%?K_Ng{}7Iz>$+6KE78O-)$wtp*hQk$97 zW+k=RNo`J2o6Bq-M;OqG{G_&k*+SM1Y(=;@=pbempF&0l21o77{8ryKT<)MqRQ44P zhA_j8_guS@Rhhk2VxDOid*)fa*Tg)#w@S>j?Gn#CC)RsW>~lIWG|JCpn1icW%*MuyVsSJoJ56#In2*>Fwc`>u9#TiAQ=wkGh{M2xZWBo9|sGP23b~T zI?h?04kB!)S)$clQh`WeS7K)em6D2G7jhem*gDteOOKuRJhOe)5*A`CNuqT5^h%Ut zby^i&k@F?%+g%c;=#soV5~05v`UcMGAbLTsoV&omV#}6~m!*n#g4MA^!`z6ktMHRp z;$SJ)ov@M3U{mh=k|x=n3DOX#m{A0 z@(ytiKi^LV-%Z^q_*(YvEOx1bGQuOfm*_#~{3jW4!JI z|M!px@hTMj>`}!f1)4Cr1Iwa*=Cy-rhAaC1%N^X@h81&$I=H1716iw@ zpvhj@j#bUDSPnKJM0PF9ynm~uIzJA@8wyI??HkC_2)->piI?2+tGX+!N>q59Jp%BL zOVez?|KNO7zsLV)zahMg6JCfIHE?2iRW!Ea){2rd6Z{kN2OL3BN&blP6njlhii5Qd z)-|E8uyyTN-;B^6KQ*5}*NpiUcD;j*?bvh@4a5&{b2G+YL^tFjx_+*1LQm%oZ0B2e zM>}pi!9@XO7=;Zk&cqfMmtd=l>#@zXn@nyw zKL?q#U~&AVfo4qJxZb3t_1O6!UUlEFvUXM`jYE9tA|XoJ;Ja{QKPt|bd&Y^638(+R zHE`Kq;c9*ODsE?7z^~cujNp?t-9_-P67O$l0$ZpIr+9!<`B%YBlX57XaXE<67;j-* R$5>~k5dVC*jqaF~^Iy=S?{feE delta 3550 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 -
+ @@ -55,6 +55,8 @@ + + @@ -100,6 +102,7 @@ + @@ -211,8 +214,11 @@ + + + @@ -266,5 +272,19 @@ + + + + + + + + + + + + + + diff --git a/src/library/BookFieldPattern.java b/src/library/BookFieldPattern.java index 940fa97..624ec12 100644 --- a/src/library/BookFieldPattern.java +++ b/src/library/BookFieldPattern.java @@ -32,7 +32,7 @@ public class BookFieldPattern extends javax.swing.JFrame { //bookTitle.setInputVerifier(new library.Validation("[a-zA-z0-9]+", required)); } - public boolean add = false, delete = false, edit = false; + public boolean add = false, delete = false, edit = false, search=false; /** * This method is called from within the constructor to initialize the form. @@ -59,6 +59,7 @@ public class BookFieldPattern extends javax.swing.JFrame { Category = new javax.swing.JComboBox<>(); mainlabel = new javax.swing.JLabel(); SaveChanges = new javax.swing.JButton(); + jLabel1 = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); @@ -101,6 +102,15 @@ public class BookFieldPattern extends javax.swing.JFrame { lISBN.setText("ISBN:"); ISBN.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N + ISBN.setToolTipText("XXX-X-XXXX-X"); + ISBN.addFocusListener(new java.awt.event.FocusAdapter() { + public void focusGained(java.awt.event.FocusEvent evt) { + ISBNFocusGained(evt); + } + public void focusLost(java.awt.event.FocusEvent evt) { + ISBNFocusLost(evt); + } + }); ISBN.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { ISBNActionPerformed(evt); @@ -129,6 +139,12 @@ public class BookFieldPattern extends javax.swing.JFrame { } }); + jLabel1.setLabelFor(ISBN); + jLabel1.setText("XXX-X-XXXX-X"); + jLabel1.setToolTipText(""); + jLabel1.setDoubleBuffered(true); + jLabel1.setName(""); // NOI18N + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -160,6 +176,8 @@ public class BookFieldPattern extends javax.swing.JFrame { .addComponent(ISBN) .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) .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) @@ -194,7 +212,8 @@ public class BookFieldPattern extends javax.swing.JFrame { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(lISBN) - .addComponent(ISBN, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(ISBN, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel1)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(lcategory) @@ -204,6 +223,8 @@ public class BookFieldPattern extends javax.swing.JFrame { .addContainerGap(33, Short.MAX_VALUE)) ); + jLabel1.setVisible(false); + pack(); }// //GEN-END:initComponents @@ -242,6 +263,14 @@ public class BookFieldPattern extends javax.swing.JFrame { // TODO add your handling code here: }//GEN-LAST:event_ISBNActionPerformed + private void ISBNFocusGained(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_ISBNFocusGained + jLabel1.setVisible(true); + }//GEN-LAST:event_ISBNFocusGained + + private void ISBNFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_ISBNFocusLost + jLabel1.setVisible(false); + }//GEN-LAST:event_ISBNFocusLost + /** * @param args the command line arguments */ @@ -289,6 +318,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.JLabel jLabel1; private javax.swing.JLabel lISBN; private javax.swing.JLabel lcategory; private javax.swing.JLabel lpublishing; diff --git a/src/library/ListResult.form b/src/library/ListResult.form index 601a0ff..70d22a7 100644 --- a/src/library/ListResult.form +++ b/src/library/ListResult.form @@ -26,15 +26,15 @@ - + - - + + - + @@ -43,9 +43,9 @@ - - - + + + diff --git a/src/library/ListResult.java b/src/library/ListResult.java index 5ff57ed..7f735fd 100644 --- a/src/library/ListResult.java +++ b/src/library/ListResult.java @@ -65,21 +65,21 @@ public class ListResult extends javax.swing.JFrame { .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(390, 390, 390) + .addGap(436, 436, 436) .addComponent(mainlabel, javax.swing.GroupLayout.PREFERRED_SIZE, 289, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 1197, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addContainerGap(20, Short.MAX_VALUE)) + .addGap(23, 23, 23) + .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 1180, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addContainerGap(26, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() .addComponent(mainlabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 545, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(45, Short.MAX_VALUE)) + .addGap(13, 13, 13) + .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 533, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(30, Short.MAX_VALUE)) ); pack(); diff --git a/src/library/MainMenu.form b/src/library/MainMenu.form index 41829cb..5305172 100644 --- a/src/library/MainMenu.form +++ b/src/library/MainMenu.form @@ -34,21 +34,29 @@ - - + + + + + + + + + + + + + + + + + + - - - - - - - - @@ -56,13 +64,17 @@ - - - + - - + + + + + + + + @@ -94,26 +106,25 @@ - - - - - - - - - - + + + + + + + - + + + + - @@ -124,15 +135,14 @@ - + - @@ -186,6 +196,17 @@ + + + + + + + + + + + @@ -198,34 +219,192 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - diff --git a/src/library/MainMenu.java b/src/library/MainMenu.java index 0a44708..5146129 100644 --- a/src/library/MainMenu.java +++ b/src/library/MainMenu.java @@ -40,10 +40,23 @@ public class MainMenu extends javax.swing.JFrame { bBook = new javax.swing.JButton(); radioBAdd = new javax.swing.JRadioButton(); radioBEdit = new javax.swing.JRadioButton(); - radioBSearch = new javax.swing.JRadioButton(); - bUser = new javax.swing.JButton(); radioBDelete1 = new javax.swing.JRadioButton(); + radioBSearch = new javax.swing.JRadioButton(); + jPanel1 = new javax.swing.JPanel(); + allMovieShow = new javax.swing.JButton(); + allAlbumsShow1 = new javax.swing.JButton(); allBooksShow = new javax.swing.JButton(); + newestBook = new javax.swing.JButton(); + newestMovie = new javax.swing.JButton(); + newestAlbum = new javax.swing.JButton(); + newestBook1 = new javax.swing.JButton(); + newestMovie1 = new javax.swing.JButton(); + newestAlbum1 = new javax.swing.JButton(); + jPanel2 = new javax.swing.JPanel(); + jLabel2 = new javax.swing.JLabel(); + jLabel3 = new javax.swing.JLabel(); + jLabel4 = new javax.swing.JLabel(); + jToggleButton1 = new javax.swing.JToggleButton(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); @@ -90,6 +103,14 @@ public class MainMenu extends javax.swing.JFrame { } }); + mode.add(radioBDelete1); + radioBDelete1.setText("Usuwanie"); + radioBDelete1.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + radioBDelete1ActionPerformed(evt); + } + }); + mode.add(radioBSearch); radioBSearch.setSelected(true); radioBSearch.setText("Wyszukiwarka"); @@ -99,21 +120,6 @@ public class MainMenu extends javax.swing.JFrame { } }); - bUser.setText("Czytelnika..."); - bUser.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - bUserActionPerformed(evt); - } - }); - - mode.add(radioBDelete1); - radioBDelete1.setText("Usuwanie"); - radioBDelete1.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - radioBDelete1ActionPerformed(evt); - } - }); - javax.swing.GroupLayout searchButtonsPanelLayout = new javax.swing.GroupLayout(searchButtonsPanel); searchButtonsPanel.setLayout(searchButtonsPanelLayout); searchButtonsPanelLayout.setHorizontalGroup( @@ -121,23 +127,22 @@ public class MainMenu extends javax.swing.JFrame { .addGroup(searchButtonsPanelLayout.createSequentialGroup() .addContainerGap() .addGroup(searchButtonsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(searchButtonsPanelLayout.createSequentialGroup() - .addComponent(radioBAdd) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(radioBEdit) - .addGap(7, 7, 7) - .addComponent(radioBDelete1) - .addGap(39, 39, 39) - .addComponent(radioBSearch)) .addGroup(searchButtonsPanelLayout.createSequentialGroup() .addComponent(bBook) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(bMovie) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(bAlbum) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(searchButtonsPanelLayout.createSequentialGroup() + .addComponent(radioBSearch) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 61, Short.MAX_VALUE) + .addComponent(radioBAdd) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(bUser))) - .addContainerGap(111, Short.MAX_VALUE)) + .addComponent(radioBEdit) + .addGap(18, 18, 18) + .addComponent(radioBDelete1) + .addGap(78, 78, 78)))) ); searchButtonsPanelLayout.setVerticalGroup( searchButtonsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -146,17 +151,32 @@ public class MainMenu extends javax.swing.JFrame { .addGroup(searchButtonsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(radioBAdd) .addComponent(radioBEdit) - .addComponent(radioBSearch) - .addComponent(radioBDelete1)) + .addComponent(radioBDelete1) + .addComponent(radioBSearch)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(searchButtonsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(bBook) .addComponent(bMovie) - .addComponent(bAlbum) - .addComponent(bUser)) + .addComponent(bAlbum)) .addGap(83, 83, 83)) ); + jPanel1.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + + allMovieShow.setText("Wszystkie filmy"); + allMovieShow.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + allMovieShowActionPerformed(evt); + } + }); + + allAlbumsShow1.setText("Wszyskie albumy"); + allAlbumsShow1.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + allAlbumsShow1ActionPerformed(evt); + } + }); + allBooksShow.setText("Wszyskie książki"); allBooksShow.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -164,6 +184,100 @@ public class MainMenu extends javax.swing.JFrame { } }); + newestBook.setText("Najnowsza książka"); + + newestMovie.setText("Najnowszy film"); + + newestAlbum.setText("Najnowszy album"); + + newestBook1.setText("Najnowsza książka"); + + newestMovie1.setText("Najnowszy film"); + + newestAlbum1.setText("Najnowszy album"); + + javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); + jPanel1.setLayout(jPanel1Layout); + jPanel1Layout.setHorizontalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(allAlbumsShow1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(allMovieShow, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(allBooksShow, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGap(31, 31, 31) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addComponent(newestMovie, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(newestBook, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(newestAlbum, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 139, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(34, 34, 34) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addComponent(newestMovie1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(newestBook1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(newestAlbum1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 139, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap(67, Short.MAX_VALUE)) + ); + jPanel1Layout.setVerticalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addComponent(newestBook1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(newestMovie1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(newestAlbum1)) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addComponent(newestBook) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(newestMovie) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(newestAlbum)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addComponent(allBooksShow) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(allAlbumsShow1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(allMovieShow)))) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + + jPanel2.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + + jLabel2.setText("Ilość albumów:"); + + jLabel3.setText("Ilość książek:"); + + jLabel4.setText("Ilość filmów:"); + + javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); + jPanel2.setLayout(jPanel2Layout); + jPanel2Layout.setHorizontalGroup( + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel2Layout.createSequentialGroup() + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(0, 66, Short.MAX_VALUE)) + ); + jPanel2Layout.setVerticalGroup( + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup() + .addContainerGap() + .addComponent(jLabel2) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel3) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel4) + .addContainerGap(25, Short.MAX_VALUE)) + ); + + jToggleButton1.setText("Własne zapytanie SELECT"); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -174,29 +288,38 @@ public class MainMenu extends javax.swing.JFrame { .addContainerGap() .addComponent(programTitle, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(layout.createSequentialGroup() - .addGap(359, 359, 359) - .addComponent(jLabel1) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(359, 359, 359) + .addComponent(jLabel1)) + .addGroup(layout.createSequentialGroup() + .addGap(26, 26, 26) + .addComponent(searchButtonsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(layout.createSequentialGroup() + .addGap(19, 19, 19) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jToggleButton1)))) .addGap(0, 0, Short.MAX_VALUE))) .addContainerGap()) - .addGroup(layout.createSequentialGroup() - .addGap(26, 26, 26) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(allBooksShow) - .addComponent(searchButtonsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(21, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addGap(24, 24, 24) .addComponent(programTitle, javax.swing.GroupLayout.PREFERRED_SIZE, 38, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jLabel1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGap(13, 13, 13) .addComponent(searchButtonsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 87, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(allBooksShow) - .addGap(0, 250, Short.MAX_VALUE)) + .addComponent(jLabel1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .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)) ); pack(); @@ -239,10 +362,6 @@ public class MainMenu extends javax.swing.JFrame { } }//GEN-LAST:event_bAlbumActionPerformed - private void bUserActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bUserActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_bUserActionPerformed - private void radioBEditActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioBEditActionPerformed // TODO add your handling code here: }//GEN-LAST:event_radioBEditActionPerformed @@ -269,7 +388,7 @@ public class MainMenu extends javax.swing.JFrame { if (radioBSearch.getModel().isSelected()) { BookFieldPattern b = new BookFieldPattern(); b.setVisible(true); - b.delete = true; + b.search = true; } }//GEN-LAST:event_bBookActionPerformed @@ -297,9 +416,18 @@ public class MainMenu extends javax.swing.JFrame { "Wydawnictwo", "Kategoria"}; ListResult table = new ListResult(data, columnNames); + table.setVisible(true); }//GEN-LAST:event_allBooksShowActionPerformed + private void allMovieShowActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_allMovieShowActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_allMovieShowActionPerformed + + private void allAlbumsShow1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_allAlbumsShow1ActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_allAlbumsShow1ActionPerformed + /** * @param args the command line arguments */ @@ -335,13 +463,26 @@ public class MainMenu extends javax.swing.JFrame { } // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton allAlbumsShow1; private javax.swing.JButton allBooksShow; + private javax.swing.JButton allMovieShow; private javax.swing.JButton bAlbum; private javax.swing.JButton bBook; private javax.swing.JButton bMovie; - private javax.swing.JButton bUser; private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; + private javax.swing.JLabel jLabel3; + private javax.swing.JLabel jLabel4; + private javax.swing.JPanel jPanel1; + private javax.swing.JPanel jPanel2; + private javax.swing.JToggleButton jToggleButton1; private javax.swing.ButtonGroup mode; + private javax.swing.JButton newestAlbum; + private javax.swing.JButton newestAlbum1; + private javax.swing.JButton newestBook; + private javax.swing.JButton newestBook1; + private javax.swing.JButton newestMovie; + private javax.swing.JButton newestMovie1; private javax.swing.JLabel programTitle; private javax.swing.JRadioButton radioBAdd; private javax.swing.JRadioButton radioBDelete1; diff --git a/src/library/MovieFieldPattern.java b/src/library/MovieFieldPattern.java index 727b77b..5391f21 100644 --- a/src/library/MovieFieldPattern.java +++ b/src/library/MovieFieldPattern.java @@ -27,7 +27,7 @@ public class MovieFieldPattern extends javax.swing.JFrame { this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); movieTitle.setInputVerifier(new library.Validation("[a-zA-z0-9]+", required)); } - public boolean add = false, delete = false, edit = false; + public boolean add = false, delete = false, edit = false, search=false; /** * This method is called from within the constructor to initialize the form.