From f7ae9275117db61d800bf582e466e1b7cf1a322a Mon Sep 17 00:00:00 2001 From: Agnieszka Janicka Date: Mon, 6 Jun 2016 14:41:34 +0200 Subject: [PATCH] =?UTF-8?q?Dzia=C5=82a=20dodawanie=20ksi=C4=85=C5=BCek,=20?= =?UTF-8?q?praca=20nad=20dodawaniem=20reszty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/classes/library/Album.class | Bin 1622 -> 1412 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 build/classes/library/AlbumFieldPattern.class | Bin 8254 -> 8254 bytes build/classes/library/Book.class | Bin 2324 -> 2324 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 -> 795 bytes .../classes/library/BookFieldPattern$4.class | Bin 795 -> 795 bytes .../classes/library/BookFieldPattern$5.class | Bin 558 -> 795 bytes build/classes/library/BookFieldPattern.class | Bin 9724 -> 10207 bytes build/classes/library/BookFieldPattern.form | 6 +- build/classes/library/Item.class | Bin 1140 -> 1140 bytes build/classes/library/MainMenu.class | Bin 11892 -> 11935 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 802 -> 802 bytes build/classes/library/MovieFieldPattern.class | Bin 8916 -> 8916 bytes build/classes/library/Validation.class | Bin 1556 -> 1556 bytes src/library/Album.java | 2 +- src/library/AlbumFieldPattern.java | 32 +++-- src/library/Book.java | 113 ++++++++++-------- src/library/BookFieldPattern.form | 6 +- src/library/BookFieldPattern.java | 67 ++++++----- src/library/Database.java | 91 +++++++++----- src/library/Item.java | 61 +++++----- src/library/ListResult.java | 4 +- src/library/MainMenu.java | 73 +++++------ src/library/MovieFieldPattern.java | 32 +++-- src/library/Validation.java | 67 +++++------ 32 files changed, 299 insertions(+), 255 deletions(-) diff --git a/build/classes/library/Album.class b/build/classes/library/Album.class index b148cf2d8c76e1ac1eb926ba1239c723ff2e27c3..ad04557609760547ce8b1475adb945a3e14c14ed 100644 GIT binary patch delta 731 zcmah`O-~b16g_X+nJL2qq|%nsmRbY~LrYbPASfRK2?Tb;g?kCOkQLc1bgC47H6>8VPu1DUIBqXNnwt}j0k+te^U2vT#q;03K zJ-_Mh?<&N98fcFf4_vQPaaWTG!@IHI}?cuh1Khs%n3Oi*rH=PkfN>a4C)#D?@d!;SXjTLGl)hq*hmajXmbSz=L zeytt$c;ju#UXw6-I|(GIc7#ALMBv#N_xniiNt4D(o~XM{<3A0O}}1@cjWpP89pBr64q z>qATx7h^+A7w^W0h!r<}M|@oNUXXf&Wp82z85X}qehXx?7{F|Yr7mHz6hVsZcgRnG>y delta 23 fcmZ3)wuo)RBqm0m$&;D9Sp66{82l$cVsZcgRh0&{ diff --git a/build/classes/library/AlbumFieldPattern$3.class b/build/classes/library/AlbumFieldPattern$3.class index aafb8b11d9ca758f6dbce8bdd5572d33ddca2f62..66fe435e0b5e496940332b189d706404563c5f42 100644 GIT binary patch delta 23 fcmZ3)wuo)RBqqkF$&;D9SYsGC7-A%ynd=WyloiV)s8}Zx^ANTzXJ)Il{+c>Xb5_=> z9~tB!P@@onVhBMnf(}u15$aG7Bm@P~C4}%0^yPDTJ-m-kF;a{?FY`&rEBB>WuA+nx zEAUfAH37Fef`z>Aon_Zi!FqhuQo{zfI<^s}k&Q&zL@S$#vxOA(WZ24xt9iCFNdvR& zq{wdOi13{~{ARB}lPu$atl^;45|tQ-Bu%pnb6Cb`k^8jDQ;x_B+T=Cu@*&GH`AAGY z6PK?fmV0&l#4pfC7tH7K5?FL?HL`Koux-#lF(Pgv`DYMp-pNYyBV)Bi+{GeTa(IJ27R5-3ihn8_d{d8%NcCF;3hUnH>PU#L3+Q4aT=8VQk zYNyLxu1|1Qdr0X3=X8YgI?e^1<)S`xe(bs@#5FU=C4Ej*Ul7p(X?;bHzNS~-(x>xW z)=y+~fqwnYfd1x+{&D`tpcOG>rChaghRyH1hOAXFVj-?s9oKD_^L}nvBcs;DO^a~L zV$R*EM-CfC4)FPn( diff --git a/build/classes/library/BookFieldPattern$1.class b/build/classes/library/BookFieldPattern$1.class index 4dc26be39b94741073cd2270e883cce13218ead7..3d993bb52db87fe3beb1cdcd03f6a72f4fa22dc0 100644 GIT binary patch delta 23 ecmbQuHk)ljHxr}lhLFj(nH&IA1O}l1 delta 23 ecmbQuHk)ljHxr}Z7hTO@wnH&IC*#_(Y diff --git a/build/classes/library/BookFieldPattern$4.class b/build/classes/library/BookFieldPattern$4.class index a5e643ad3d6ae526caee2a3fc328140f78aba87b..bc3f9c95e418f7ec1a92b4cb84b4c7e635d74efe 100644 GIT binary patch delta 23 ecmbQuHk)ljHxpygmWo)-zc4coH@kR6} z6)K7k{s4cJIC};aF*&%|o#C5rzMYxxKfZngu!Z{}8d#1nhg%Vruo9ph;C6sjfeY?f zmC2^Sa#pB;mG)iw*qGM`ii+W(bdIdvVbmj~mD?3)cc#PE`vQ%g8InLVQ<|Qgjs|33 z%0a=Ah0Nr#=u4}-KM6K`ae?@W)?|ByEK6c{Won6Jo3%7$?v&AoWM3IOqM^WQCp(d2 znaZ~=r7>xj?p2U|f8X)4>NIwqcm_-$dSOm&P6x{CUHrET4}30H-`9CzN~MpUk~=oT z0BbSs;BJfn7h{C}b`J^nb6Pu-ZGl!Lq>%b3eLgs$oW-^Ot1VNdBW{ks(lkDSc|V+< z8ND%@AIu%Bcl@IxndelN$<`*1_u-7e&1%bfA8WikbKoU_Xtn$^d8caphln_OiEq2? z`$*K?_yp1YjM`a+iP>@%+xNK4_WCar=Fwu0@fDk3#1$+|xb`MoVfP$j;|uD4sG=(U n0}J^07hU+9F2q$_W12b^nY_m3Zt&UQjlYRzRgM>wPyT)azr?$T delta 356 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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 literal 9724 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 diff --git a/build/classes/library/BookFieldPattern.form b/build/classes/library/BookFieldPattern.form index 3edb734..e5683ab 100644 --- a/build/classes/library/BookFieldPattern.form +++ b/build/classes/library/BookFieldPattern.form @@ -127,9 +127,6 @@ - - - @@ -215,6 +212,9 @@ + + + diff --git a/build/classes/library/Item.class b/build/classes/library/Item.class index ce18cdd7f188ea0548cbc879b313b444a1611b4d..f2abe1aaf6ca420a69b07ed65615eff6c6d5b003 100644 GIT binary patch delta 93 zcmeyu@r7eUArq?@11p30WIkr`$-PVllR24XfHcSChfEr*azGh*po}}K5|E_~WXVsi iWL9TXo4k|{-P`0)YOd*m5vH&)1U!_u% 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 diff --git a/build/classes/library/MovieFieldPattern$1.class b/build/classes/library/MovieFieldPattern$1.class index 30c9031c1d2825e309c11e8a7c9e9834beb0802f..51953248d8a7868ed8635618c5053de5e8d5480f 100644 GIT binary patch delta 23 fcmZ3)wuo)RBqm1Z$&;D9SX~)77~Cd5VsZcgRFDRm delta 23 fcmZ3)wuo)RBqm13$&;D9Se+R-7+fYlVsZcgR8|I* diff --git a/build/classes/library/MovieFieldPattern$2.class b/build/classes/library/MovieFieldPattern$2.class index 6be2ba30e27acc16a628632e14bf12be9bb4b6f4..a0306945594332b09f871a7f3e6d8cd8f4a4b109 100644 GIT binary patch delta 23 fcmZ3)wuo)RBqqjy$&;D9Sc4ci7=kB1VsZcgRtW~d 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 b992d78b18c9699ce6368a19252fe6da5a1f5ff4..e3b2db2dfe3c3dec95ae440c558ed9eaff180aff 100644 GIT binary patch delta 23 fcmZ3)wuo)RBqqkF$&;D9SYsGC7-AX^QHuQo}LUT&c=h>d;;@OiZOO%b3x{Nov#nqU;5C<>w z$iRi0OsgC`@ei&VC$x-ImNTCfWRY!^Ljk#zkVge8sbUqitR_G{t*oJ)bwntnkM#_* zfmdu|l425U=DTf8Q)*_j-DI-EETP;KQeph;G<(@)YN<3W>@y+un>SRONe-JYA!^Jw zj+kE@72%kqQYRUlkfqd1E&<8sq!iE~MKp?^CMn~Tl+!GGI4#w*$N|fBoRNCYN|08G za86pkF`Jt5XbUl0p5+L;cH;PBZ8zkDL@9J9ByBq|@On zAmX?gaeO?DCOrpdj53So(XHMRGZr27d7>lU%CtB$8D|a?_V1VR6yGOfe#E~n`eXhB DN~L}Z delta 535 zcmWNOZ%oW_9LHbZ&*x{TwHeE$`=`x+De@=Mnu}Wv*-W_E6wW+Qogz_(OR}6lk)u<( z$aX9?ldH|l6CRl!*={__X1lTRz{~?%Pxw7~@AcYV&)#W&+W%s!!?)DPRSKtfbW5N;{~bhycX|SxtyFv{OPi>xi;}A-hVl ziC1i9l5)~i@SQD8<1@3VGA^pkVz!%&>@YrROf9=ikXqBmUK3%zc|*WVQfIzIs5jp@ zWPWi(grH<|RPs44OK6ZH8f7g_Qc6h5I3Yfo#ZQaueEHQmj14RAy2>D2~qYRKkRZfTf4?c%of64O4Lt7z|Gzm+2Xk{^C&E=7mOVrAv z$8wUiygZI&+;uZXnZ?ssm8a4?k3I9cV^2K$a>kg+OXe_c|2>h)@_sVrN9yasKjuG9 Ct9=^) diff --git a/build/classes/library/Validation.class b/build/classes/library/Validation.class index ae56ac39369db3f82a6526b4254eadd3c68fe610..460328c5b891110d1cd7c5af4c24ea2824f999e3 100644 GIT binary patch delta 71 zcmbQjGlgfvCKg8H$(vaYo60hqdDhwtJstgVc>I|L? anhf3y+6?gwIt+;ndJI_%`jc0)W&!}latoRO delta 71 zcmbQjGlgfvCKg7E$(vaYo60b-GRQLUGRQHAGspu;1qL++MFtH96$TRqRR#wj%acKi Y!J9#kA)Y~>A(6p|A&bFy@@m#h0LN1csQ>@~ diff --git a/src/library/Album.java b/src/library/Album.java index f8590b2..2b313eb 100644 --- a/src/library/Album.java +++ b/src/library/Album.java @@ -21,7 +21,7 @@ public class Album extends Item { } @Override public void insertToDB(){ - String query = "INSERT INTO albums VALUES(NULL, '" +this.getName() + "', '" + this.getMusican() + "', '" + this.getYear() + "', '"+ this.getCategory() + "');"; + // String query = "INSERT INTO albums VALUES(NULL, '" +this.getName() + "', '" + this.getMusican() + "', '" + this.getYear() + "', '"+ this.getCategory() + "');"; }; @Override public void delFromDB(){ diff --git a/src/library/AlbumFieldPattern.java b/src/library/AlbumFieldPattern.java index be65dfe..c1d4fe1 100644 --- a/src/library/AlbumFieldPattern.java +++ b/src/library/AlbumFieldPattern.java @@ -21,12 +21,14 @@ public class AlbumFieldPattern extends javax.swing.JFrame { this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); initComponents(); } - public AlbumFieldPattern(boolean required) { + + public AlbumFieldPattern(boolean required) { initComponents(); this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); albumTitle.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; + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -150,23 +152,21 @@ public class AlbumFieldPattern extends javax.swing.JFrame { public void ChangeOkButtonText(String s) { this.SaveChanges.setText(s); - } - + } + private void CategoryActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_CategoryActionPerformed // TODO add your handling code here: }//GEN-LAST:event_CategoryActionPerformed private void SaveChangesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_SaveChangesActionPerformed - if(this.add){ - JOptionPane.showMessageDialog(null, "DODAJ"); + if (this.add) { + JOptionPane.showMessageDialog(null, "DODAJ"); + } else if (this.edit) { + JOptionPane.showMessageDialog(null, "EDYTUJ"); + } else if (this.delete) { + JOptionPane.showMessageDialog(null, "USUŃ"); } - else if(this.edit){ - JOptionPane.showMessageDialog(null, "EDYTUJ"); - } - else if(this.delete){ - JOptionPane.showMessageDialog(null, "USUŃ"); - } - dispose(); + dispose(); }//GEN-LAST:event_SaveChangesActionPerformed private void yearActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_yearActionPerformed @@ -209,9 +209,7 @@ public class AlbumFieldPattern extends javax.swing.JFrame { new AlbumFieldPattern().setVisible(false); } }); - - - + } // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/src/library/Book.java b/src/library/Book.java index c5f8f86..efaa79b 100644 --- a/src/library/Book.java +++ b/src/library/Book.java @@ -9,62 +9,77 @@ package library; * * @author Agnieszka */ -public class Book extends Item{ - Book(){ - //nothing to do +public class Book extends Item { + + Book() { + //nothing to do } - Book(int id, String n, String an, String asn, int y, String isbn, String p, String c){ - this.setId(id); - this.setName(n); - this.authorName = an; - this.authorSurname = asn; - this.setYear(y); - this.setCategory(c); - this.ISBN = isbn; - this.publishing = p; - } - + + Book(int id, String n, String an, String asn, int y, String isbn, String p, String c) { + this.setId(id); + this.setName(n); + this.authorName = an; + this.authorSurname = asn; + this.setYear(y); + this.setCategory(c); + this.ISBN = isbn; + this.publishing = p; + } + + @Override + public void insertToDB() { + db.insertBookQ(this); + } + + ; @Override -public void insertToDB(){ - db.insertBookQ(this); -}; -@Override -public void delFromDB(){ + public void delFromDB() { String query = "DELETE FROM books WHERE id=" + this.getId() + ";"; -}; + } + + ; @Override -public void editInDB(){ - -}; + public void editInDB() { + + } + + ; /*public void insertQuery(){ System.out.println("INSERT INTO books VALUES('NULL', '" +name + "', '" + authorName + "', '" + authorSurname + "', '"+ publishing + "', '"+ year + "', '"+ ISBN + "', '"+ category + "');"); }*/ -public void setPublishing(String s){ - this.publishing = s; - } -public void setAuthorName(String s){ - this.authorName = s; - } -public void setAuthorSurname(String s){ - this.authorSurname = s; - } -public void setISBN(String s){ - this.ISBN = s; - } -public String getAuthorName(){ - return this.authorName; - } -public String getAuthorSurname(){ - return this.authorSurname; - } -public String getPublishing(){ - return this.publishing; - } -public String getISBN(){ - return this.publishing; - } -private String authorName, authorSurname, publishing, ISBN; -private Database db = new Database(); +public void setPublishing(String s) { + this.publishing = s; + } + + public void setAuthorName(String s) { + this.authorName = s; + } + + public void setAuthorSurname(String s) { + this.authorSurname = s; + } + + public void setISBN(String s) { + this.ISBN = s; + } + + public String getAuthorName() { + return this.authorName; + } + + public String getAuthorSurname() { + return this.authorSurname; + } + + public String getPublishing() { + return this.publishing; + } + + public String getISBN() { + return this.ISBN; + } + private String authorName, authorSurname, publishing, ISBN; + private Database db = new Database(); } diff --git a/src/library/BookFieldPattern.form b/src/library/BookFieldPattern.form index 3edb734..e5683ab 100644 --- a/src/library/BookFieldPattern.form +++ b/src/library/BookFieldPattern.form @@ -127,9 +127,6 @@ - - - @@ -215,6 +212,9 @@ + + + diff --git a/src/library/BookFieldPattern.java b/src/library/BookFieldPattern.java index 9bfc9bf..940fa97 100644 --- a/src/library/BookFieldPattern.java +++ b/src/library/BookFieldPattern.java @@ -5,7 +5,10 @@ */ package library; +import java.sql.SQLException; import java.util.Arrays; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.JFrame; import javax.swing.JOptionPane; @@ -22,14 +25,15 @@ public class BookFieldPattern extends javax.swing.JFrame { initComponents(); this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); } - public BookFieldPattern(boolean required) { + + public BookFieldPattern(boolean required) { initComponents(); this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - bookTitle.setInputVerifier(new library.Validation("[a-zA-z0-9]+", required)); - } - - - public boolean add= false, delete = false, edit = false; + //bookTitle.setInputVerifier(new library.Validation("[a-zA-z0-9]+", required)); + } + + public boolean add = false, delete = false, edit = false; + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -62,7 +66,6 @@ public class BookFieldPattern extends javax.swing.JFrame { Title.setText("Tytuł:"); bookTitle.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N - bookTitle.setInputVerifier(new library.Validation("[a-zA-z0-9]+", this.add)); bookTitle.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { bookTitleActionPerformed(evt); @@ -98,6 +101,11 @@ public class BookFieldPattern extends javax.swing.JFrame { lISBN.setText("ISBN:"); ISBN.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N + ISBN.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + ISBNActionPerformed(evt); + } + }); lcategory.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N lcategory.setText("Kategoria:"); @@ -202,33 +210,24 @@ public class BookFieldPattern extends javax.swing.JFrame { private void CategoryActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_CategoryActionPerformed // TODO add your handling code here: }//GEN-LAST:event_CategoryActionPerformed - + public void ChangeOkButtonText(String s) { this.SaveChanges.setText(s); - } - - + } + + private void SaveChangesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_SaveChangesActionPerformed - if(this.add){ - Book b = new Book(); - /* - b.name = bookTitle.getText(); - b.authorName = authorName.getText(); - b.authorSurname = authorSurname.getText(); - b.publishing = publishing.getText(); - b.year = Integer.parseInt(year.getText()); - b.ISBN = ISBN.getText(); - b.category = Category.getSelectedItem().toString(); - b.insertQuery(); - */ + if (this.add) { + + Book b = new Book(0, bookTitle.getText(), authorName.getText(), authorSurname.getText(), Integer.parseInt(year.getText()), ISBN.getText(), publishing.getText(), Category.getSelectedItem().toString()); + b.insertToDB(); + + } else if (this.edit) { + JOptionPane.showMessageDialog(null, "EDYTUJ"); + } else if (this.delete) { + JOptionPane.showMessageDialog(null, "USUŃ"); } - else if(this.edit){ - JOptionPane.showMessageDialog(null, "EDYTUJ"); - } - else if(this.delete){ - JOptionPane.showMessageDialog(null, "USUŃ"); - } - dispose(); + dispose(); }//GEN-LAST:event_SaveChangesActionPerformed private void authorSurnameActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_authorSurnameActionPerformed @@ -239,6 +238,10 @@ public class BookFieldPattern extends javax.swing.JFrame { // TODO add your handling code here: }//GEN-LAST:event_bookTitleActionPerformed + private void ISBNActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ISBNActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_ISBNActionPerformed + /** * @param args the command line arguments */ @@ -273,9 +276,7 @@ public class BookFieldPattern extends javax.swing.JFrame { new BookFieldPattern().setVisible(false); } }); - - - + } // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/src/library/Database.java b/src/library/Database.java index 7b08a47..179d443 100644 --- a/src/library/Database.java +++ b/src/library/Database.java @@ -4,6 +4,7 @@ * and open the template in the editor. */ package library; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; @@ -13,27 +14,27 @@ import java.sql.Statement; import java.util.LinkedList; import java.util.List; import javax.swing.JOptionPane; + /** * - * @author Agnieszka - * insert, delete i update do przeniesienia tutaj (9metod) + * @author Agnieszka insert, delete i update do przeniesienia tutaj (9metod) */ public class Database { - + public static final String DRIVER = "org.sqlite.JDBC"; public static final String DB_URL = "jdbc:sqlite:biblioteka.db"; // ścieżka do bazy - + private Connection conn; private Statement stat; - + public Database() { try { Class.forName(Database.DRIVER); } catch (ClassNotFoundException e) { System.err.println("Brak sterownika JDBC"); e.printStackTrace(); - } - + } + try { conn = DriverManager.getConnection(DB_URL); stat = conn.createStatement(); @@ -41,27 +42,40 @@ public class Database { System.err.println("Problem z otwarciem polaczenia"); e.printStackTrace(); } - + createTables(); } - - 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(12), 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))"; + + public void selectAllFromBooks() { + try { + ResultSet result = stat.executeQuery("SELECT * FROM books"); + + while (result.next()) { + System.out.println("WYniki"); + System.out.println(result.getInt("id") + " " + result.getInt("year") + result.getString("name") + result.getString("author_name") + result.getString("author_surname") + result.getString("publishing") + result.getString("isbn") + result.getString("category")); + } + } catch (SQLException e) { + JOptionPane.showMessageDialog(null, "Błąd przy odczycie z bazy.", "Error:", JOptionPane.INFORMATION_MESSAGE); + } + } + + 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 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); stat.execute(createAlbums); stat.execute(createMovies); } catch (SQLException e) { - JOptionPane.showMessageDialog(null, "Błąd przy tworzeniu tabel bazy danych.", "Error:", JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, "Błąd przy odczycie zbazy danych.", "Error:", JOptionPane.INFORMATION_MESSAGE); return false; } return true; } - - public void insertBookQ(Book b){ - try { + + public void insertBookQ(Book b) { + try { PreparedStatement prepStmt = conn.prepareStatement( "INSERT INTO books VALUES (NULL, ?, ?, ?, ?, ?, ?, ?);"); prepStmt.setString(1, b.getName()); @@ -71,10 +85,10 @@ public class Database { prepStmt.setInt(5, b.getYear()); prepStmt.setString(6, b.getISBN()); prepStmt.setString(7, b.getCategory()); - + prepStmt.execute(); - - /* String sel = "SELECT * FROM books WHERE name LIKE ? AND author_name LIKE ? AND author_surname LIKE ? AND publishing LIKE ? AND year = ? AND isbn LIKE ? AND category LIKE ? ;"; + + /* String sel = "SELECT * FROM books WHERE name LIKE ? AND author_name LIKE ? AND author_surname LIKE ? AND publishing LIKE ? AND year = ? AND isbn LIKE ? AND category LIKE ? ;"; PreparedStatement prepStmt2 = conn.prepareStatement(sel); prepStmt.setString(1, b.getName()); prepStmt.setString(2, b.getAuthorName()); @@ -86,20 +100,36 @@ public class Database { ResultSet rs = stat.executeQuery(sel); b = new Book(rs.getInt("id"), rs.getString("name"), rs.getString("author_name"), rs.getString("suthor_surname"), rs.getInt("year"), rs.getString("isbn"), rs.getString("publishing"), rs.getString("category")); - */ + */ } catch (SQLException e) { JOptionPane.showMessageDialog(null, "Błąd przy dodawaniu do bazy", "Error:", JOptionPane.INFORMATION_MESSAGE); - } - + } + } - + + public void insertAlbumQ(Album a) { + try { + PreparedStatement prepStmt = conn.prepareStatement( + "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(); + } catch (SQLException e) { + JOptionPane.showMessageDialog(null, "Błąd przy dodawaniu do bazy", "Error:", JOptionPane.INFORMATION_MESSAGE); + } + + } + public List selectBooks() { List books = new LinkedList(); try { ResultSet result = stat.executeQuery("SELECT * FROM books"); int id, year; String name, authorName, authorSurname, isbn, category, publishing; - while(result.next()) { + while (result.next()) { id = result.getInt("id"); year = result.getInt("year"); name = result.getString("name"); @@ -108,7 +138,6 @@ public class Database { publishing = result.getString("publishing"); isbn = result.getString("isbn"); category = result.getString("category"); - books.add(new Book(id, name, authorName, authorSurname, year, isbn, publishing, category)); } } catch (SQLException e) { @@ -123,13 +152,13 @@ public class Database { ResultSet result = stat.executeQuery("SELECT * FROM albums"); int id, year; String name, musican, category; - while(result.next()) { + while (result.next()) { id = result.getInt("id"); year = result.getInt("year"); name = result.getString("name"); musican = result.getString("musican"); category = result.getString("category"); - + albums.add(new Album(id, name, musican, year, category)); } } catch (SQLException e) { @@ -137,27 +166,28 @@ public class Database { } return albums; } - + public List selectMovies() { List movies = new LinkedList(); try { ResultSet result = stat.executeQuery("SELECT * FROM movies"); int id, year; String name, category, director; - while(result.next()) { + while (result.next()) { id = result.getInt("id"); year = result.getInt("year"); name = result.getString("name"); director = result.getString("director"); category = result.getString("category"); movies.add(new Movie(id, name, director, year, category)); + } } catch (SQLException e) { JOptionPane.showMessageDialog(null, "Błąd przy odczycie z bazy.", "Error:", JOptionPane.INFORMATION_MESSAGE); } return movies; } - + public void closeConnection() { try { conn.close(); @@ -167,4 +197,3 @@ public class Database { } } } - diff --git a/src/library/Item.java b/src/library/Item.java index d4ea49a..41a6665 100644 --- a/src/library/Item.java +++ b/src/library/Item.java @@ -8,41 +8,48 @@ package library; /** * * @author Agnieszka - + * */ public abstract class Item { - -public abstract void insertToDB(); -public abstract void delFromDB(); -public abstract void editInDB(); - - public void setName(String s){ + + public abstract void insertToDB(); + + public abstract void delFromDB(); + + public abstract void editInDB(); + + public void setName(String s) { this.name = s; } - public void setCategory(String s){ + + public void setCategory(String s) { this.category = s; } - public void setYear(int i){ + + public void setYear(int i) { this.year = i; - } - public void setId(int i){ + } + + public void setId(int i) { this.id = i; } - - public String getName(){ - return this.name; - } - public String getCategory(){ - return this.category; - } - public int getYear(){ - return this.year; - } - public int getId(){ - return this.id; - } - - private String name, category; - private int year, id; + public String getName() { + return this.name; + } + + public String getCategory() { + return this.category; + } + + public int getYear() { + return this.year; + } + + public int getId() { + return this.id; + } + + private String name, category; + private int year, id; } diff --git a/src/library/ListResult.java b/src/library/ListResult.java index 62b774e..d6a25c0 100644 --- a/src/library/ListResult.java +++ b/src/library/ListResult.java @@ -92,9 +92,7 @@ public class ListResult extends javax.swing.JFrame { new ListResult().setVisible(true); } }); - - - + } // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/src/library/MainMenu.java b/src/library/MainMenu.java index d9f6fbf..c981475 100644 --- a/src/library/MainMenu.java +++ b/src/library/MainMenu.java @@ -203,40 +203,40 @@ public class MainMenu extends javax.swing.JFrame { }// //GEN-END:initComponents private void bMovieActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bMovieActionPerformed - if(radioBAdd.getModel().isSelected()){ + if (radioBAdd.getModel().isSelected()) { MovieFieldPattern b = new MovieFieldPattern(true); b.setVisible(true); - b.add=true; - } - if(radioBEdit.getModel().isSelected()){ + b.add = true; + } + if (radioBEdit.getModel().isSelected()) { MovieFieldPattern b = new MovieFieldPattern(); b.setVisible(true); - b.edit=true; - } - if(radioBSearch.getModel().isSelected()){ + b.edit = true; + } + if (radioBSearch.getModel().isSelected()) { MovieFieldPattern b = new MovieFieldPattern(); b.setVisible(true); - b.delete=true; - } + b.delete = true; + } }//GEN-LAST:event_bMovieActionPerformed private void bAlbumActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bAlbumActionPerformed - if(radioBAdd.getModel().isSelected()){ + if (radioBAdd.getModel().isSelected()) { AlbumFieldPattern b = new AlbumFieldPattern(true); b.setVisible(true); - b.add=true; - } - if(radioBEdit.getModel().isSelected()){ + b.add = true; + } + if (radioBEdit.getModel().isSelected()) { AlbumFieldPattern b = new AlbumFieldPattern(); b.setVisible(true); - b.edit=true; - } - if(radioBSearch.getModel().isSelected()){ + b.edit = true; + } + if (radioBSearch.getModel().isSelected()) { MovieFieldPattern b = new MovieFieldPattern(); b.setVisible(true); - b.delete=true; - } + b.delete = true; + } }//GEN-LAST:event_bAlbumActionPerformed private void bUserActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bUserActionPerformed @@ -256,22 +256,22 @@ public class MainMenu extends javax.swing.JFrame { }//GEN-LAST:event_radioBAddActionPerformed private void bBookActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bBookActionPerformed - if(radioBAdd.getModel().isSelected()){ + if (radioBAdd.getModel().isSelected()) { BookFieldPattern b = new BookFieldPattern(true); b.setVisible(true); - b.add=true; - } - if(radioBEdit.getModel().isSelected()){ + b.add = true; + } + if (radioBEdit.getModel().isSelected()) { BookFieldPattern b = new BookFieldPattern(); b.setVisible(true); - b.edit=true; - } - if(radioBSearch.getModel().isSelected()){ + b.edit = true; + } + if (radioBSearch.getModel().isSelected()) { BookFieldPattern b = new BookFieldPattern(); b.setVisible(true); - b.delete=true; - } - + b.delete = true; + } + }//GEN-LAST:event_bBookActionPerformed private void radioBDelete1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioBDelete1ActionPerformed @@ -279,15 +279,18 @@ public class MainMenu extends javax.swing.JFrame { }//GEN-LAST:event_radioBDelete1ActionPerformed private void allBooksShowActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_allBooksShowActionPerformed - + ListResult n = new ListResult(); n.setVisible(true); Database d = new Database(); - List books = new LinkedList<>(); - books = d.selectBooks(); - System.out.println("Lista książek:"); - for(Book k: books) - System.out.println(k); + List books = new LinkedList<>(); + books = d.selectBooks(); + System.out.println("Lista książek:"); + for (Book k : books) { + System.out.println(k); + } + + d.selectAllFromBooks(); }//GEN-LAST:event_allBooksShowActionPerformed /** @@ -321,7 +324,7 @@ public class MainMenu extends javax.swing.JFrame { /* Create and display the form */ java.awt.EventQueue.invokeLater(() -> { new MainMenu().setVisible(true); - /* java.awt.EventQueue.invokeLater(() ->*/ }); + /* java.awt.EventQueue.invokeLater(() ->*/ }); } // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/src/library/MovieFieldPattern.java b/src/library/MovieFieldPattern.java index 25075b3..18acabf 100644 --- a/src/library/MovieFieldPattern.java +++ b/src/library/MovieFieldPattern.java @@ -21,12 +21,14 @@ public class MovieFieldPattern extends javax.swing.JFrame { this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); initComponents(); } - public MovieFieldPattern(boolean required) { + + public MovieFieldPattern(boolean required) { initComponents(); 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; + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -167,23 +169,21 @@ public class MovieFieldPattern extends javax.swing.JFrame { public void ChangeOkButtonText(String s) { this.SaveChanges.setText(s); - } - + } + private void CategoryActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_CategoryActionPerformed // TODO add your handling code here: }//GEN-LAST:event_CategoryActionPerformed private void SaveChangesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_SaveChangesActionPerformed - if(this.add){ - JOptionPane.showMessageDialog(null, "DODAJ"); + if (this.add) { + JOptionPane.showMessageDialog(null, "DODAJ"); + } else if (this.edit) { + JOptionPane.showMessageDialog(null, "EDYTUJ"); + } else if (this.delete) { + JOptionPane.showMessageDialog(null, "USUŃ"); } - else if(this.edit){ - JOptionPane.showMessageDialog(null, "EDYTUJ"); - } - else if(this.delete){ - JOptionPane.showMessageDialog(null, "USUŃ"); - } - dispose(); + dispose(); }//GEN-LAST:event_SaveChangesActionPerformed private void scriptActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_scriptActionPerformed @@ -228,9 +228,7 @@ public class MovieFieldPattern extends javax.swing.JFrame { new MovieFieldPattern().setVisible(false); } }); - - - + } // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/src/library/Validation.java b/src/library/Validation.java index 4e01177..fbd6e81 100644 --- a/src/library/Validation.java +++ b/src/library/Validation.java @@ -14,44 +14,39 @@ import javax.swing.JTextField; /** * - * @author Agnieszka - * walitator używający wyrażeń regularnych do sprawdzania pól formularzy - * wyrażenia regularne jako parametr konstuktora + * @author Agnieszka walitator używający wyrażeń regularnych do sprawdzania pól + * formularzy wyrażenia regularne jako parametr konstuktora */ public class Validation extends InputVerifier { - public Validation(String ex, boolean rq){ - expression=ex; + + public Validation(String ex, boolean rq) { + expression = ex; required = rq; } + @Override - public boolean verify(JComponent input) { - JTextField tf = (JTextField) input; - Pattern p = Pattern.compile(expression); - Matcher m = p.matcher(tf.getText()); - if(required) { - if (m.matches()){ - return true; - } - else{ - if("".equals(tf.getText())){ - JOptionPane.showMessageDialog(null, "Pole wymagane!", "Sprawdzenie pola:", JOptionPane.INFORMATION_MESSAGE); - } - else{ - JOptionPane.showMessageDialog(null, "Niepoprawne dane!", "Sprawdzenie pola:", JOptionPane.INFORMATION_MESSAGE); - } - return false; - } - } - else{ - if (m.matches() || "".equals(tf.getText())){ - return true; - } - else{ - JOptionPane.showMessageDialog(null, "Niepoprawne dane!", "Sprawdzenie pola:", JOptionPane.INFORMATION_MESSAGE); - return false; - } - } - } - String expression; - boolean required = false; -} \ No newline at end of file + public boolean verify(JComponent input) { + JTextField tf = (JTextField) input; + Pattern p = Pattern.compile(expression); + Matcher m = p.matcher(tf.getText()); + if (required) { + if (m.matches()) { + return true; + } else { + if ("".equals(tf.getText())) { + JOptionPane.showMessageDialog(null, "Pole wymagane!", "Sprawdzenie pola:", JOptionPane.INFORMATION_MESSAGE); + } else { + JOptionPane.showMessageDialog(null, "Niepoprawne dane!", "Sprawdzenie pola:", JOptionPane.INFORMATION_MESSAGE); + } + return false; + } + } else if (m.matches() || "".equals(tf.getText())) { + return true; + } else { + JOptionPane.showMessageDialog(null, "Niepoprawne dane!", "Sprawdzenie pola:", JOptionPane.INFORMATION_MESSAGE); + return false; + } + } + String expression; + boolean required = false; +}