From 57172c7a727935c993c9425f64610f580d69b3b4 Mon Sep 17 00:00:00 2001 From: Agnieszka Janicka Date: Tue, 7 Jun 2016 21:27:17 +0200 Subject: [PATCH] no i jest problem z dispose_on_close --- build/classes/library/Album.class | Bin 1566 -> 1724 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 -> 562 bytes build/classes/library/AlbumFieldPattern.class | Bin 8653 -> 8653 bytes 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 14333 -> 15586 bytes build/classes/library/MainMenu.form | 77 ++++++++-- src/library/Album.java | 3 +- src/library/AlbumFieldPattern.java | 1 + src/library/Database.java | 77 ++++++---- src/library/ListResult.java | 2 + src/library/MainMenu.form | 77 ++++++++-- src/library/MainMenu.java | 140 +++++++++++++----- 22 files changed, 287 insertions(+), 90 deletions(-) diff --git a/build/classes/library/Album.class b/build/classes/library/Album.class index fb0743d87ba03dc7b396820d44a97d444c1854b2..182cc90dd243602a3777c14699d01be9eb50f246 100644 GIT binary patch literal 1724 zcmah~?QRoS5Ixsfdu?YSUv^puq_niDvp`Hq10{jbd^F(JB!#4r5WlYNTX&JYE3Mb5 zc!It|pQ4o@RIStp=tEUKv%8MnBoaUNdhXo0XU@!-UH|j%pML}R5;Vtp;khAf-1Y{}hi8{gR2QBW;~>3YX&ggSg(-PVzA z=$=_qu)F=9*VMioztTs#+R=Wyx*vs}-{x`df#-YCy24mx@le6q3R*^CqVD--x8H4; z@IW^@^i0=-rtTc-(35@Yw4$H9oYJiwX@02dd>+F5*d%hs2U%#R$V@? z`7{+KJ-=td=y~w-L6A~dt-O3W0=(CFWt!1i?G&TM^MY72yQEM$|4@ZYsuhY!(t}`o zQ{j3LwwHVpHH`LqOZ!1TY?`_`GMx?I44_q2u{{!4sw|$3WK61SjrS=STfldKDv$44=f z1;&-hmw8!vIcB_oPk3s@zU%a5QNX9fO6vZFF;drxJ9lS{+zNki>S$ZE$HmCfaKy;b zxR9ROv@hk*33845zT{Q%fFfe2YqRs_b zdOyhWdqJwW&2%zn>*OyL;L*CmIs~YdYd3uBV UP>ZCpha;r2DU9O3l_<9I9|ue=pa1{> literal 1566 zcmah|+fLL_6kTVSnL;UY5l|U#h?k*UMnO~rQ9#ieghYsm@u@R&97|@}q|?Fp1wQyQ znkX6{`~W}7xOQ7)5E34`yUyu4Yp=8S?(aW8e*w6S=O%h^(}aav5@saKb}`%*G-u)t z?h3jmVP3+02@3`m4LndV8m*>Raeak>^&NNDE!ADWR@#a}&#x^go zva3N=EA*~=zTRjx$~xS3%XRJytOpgh{>lwKS*M%X=$+RTcHJw7Zup_JTram8R9z@K zN0S}hIff)AGG0|dIeh3^HTZnsQ&H&i{H6}0m%;n(AhmG6_~uQU@Md{OSE2>yKS$%o zk$C6GEh`Kj|51fZ>MEE?((T~!io#eB)~0i^LEj+=Rg{PRZFe%{~RxLP~Qs_C< zUIlA^?L?a0G3bB8Z7`pp*V<*_vPDN+cXMOajdU#t*}@$CJ8UgSjm_;pm`2AZMe~@k z>(*O(^R2=#1={YHGFU`|B55|FBwIJpej1E&`g{26aE|1DM4fzid+rPn&GN1I&e`9g zz7S+^n$hGNJdh=IkjP3%7{V}DB5)=Z_(W!&I|UK2C-;!Chq8Op2#dm3F7?xmnej!;h0EG1I^(iCtO=i<}_a(ZJ^1r&%nBqh%CYc@s~xR;~mMO;da zeI!R%b9P~-gTC@VU~Ca*i8}@42)YF13C#4XLEOD%f9AoY5{cyzR-iyz=b7LFY{pq! zjxAqKl5jQ3GfamospUD0@oE{`xyo{9;&M-rA?0o>bw1v>-d1Ln-v1hj^7VRr=*Gz+ zlP8K4PZpUuQDmG2NTz3r*OEcW+Y^WSoQ%&sc4R(QlQPI%_QxlW3HD1Sk3UzcRf^X# YiC>XBsDDzP#Wqv9R7PQ%q8XI_0>aw{v;Y7A diff --git a/build/classes/library/AlbumFieldPattern$1.class b/build/classes/library/AlbumFieldPattern$1.class index 0d5f889941f294333aac5475144280f39f12d4b5..78f252e386517b1d8cb2bf8b8d5709e6a4cfb965 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/AlbumFieldPattern$2.class b/build/classes/library/AlbumFieldPattern$2.class index c0f31f8033a013fd2f54a057b6ddfde84a004822..a808a1af0565bed0e5dade19d9dbc7acd4f493f8 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/AlbumFieldPattern$3.class b/build/classes/library/AlbumFieldPattern$3.class index 66fe435e0b5e496940332b189d706404563c5f42..4eab41b311c477df737f84a460b19688ff8b21cd 100644 GIT binary patch delta 23 fcmZ3)wuo)RBqqk_$&;D9SYsJD7~&>BVsZcgS4alp delta 23 fcmZ3)wuo)RBqqkF$&;D9SYsGC7-A52G0XYW@hT delta 23 fcmdnQvWaEGW=6&fleaKBvtDB0X1F~052G0XYT*c| diff --git a/build/classes/library/AlbumFieldPattern.class b/build/classes/library/AlbumFieldPattern.class index d316e4e215c8ac158181f232bd252a7feabc0c20..2dd8afa9ca5462ced6850ea6fa26323edd69d0e1 100644 GIT binary patch delta 600 zcmXYuOGwmF6o!zo0Qs`c4Ao}+gfOPEU*^T=gB+qCFsAt4q~ zrAZS@X(xjlte}rf23W}$tNE%MKUiZR$4q9unZX8=%0^SjCR52)(}>Tsk!LQEZ@MWk z57=&=vd6p*Q)u4eH}5GjA1OAU*=xoLnD3OBpOl(E1O@hqrBq@llLX4eO^J92NgDel zoeEh_rFc0YKB}aMgA&kpQ1cLnq=v&%&k`v zpjHMsE<=Q6ggP0cUOsR_zR)1wXp~=^l;6sKX|ho?+h|&>i&Hj1IhoUTCapG&Hk-j2 zo2k5(vo@D@yM=RhH|MQixr__83ddG+(bf`MUa|38b)`bXJhfN(wYwP9j0p z(5P-3Npz9SAnO@sBa>|6E1UU2s(~$LCOgbRb{Ze)CZAmK%IQytbC(he$gPmmH%?ihS6xlX|f)gtyejg^L7yzYyvHI9j$hQ z@-{BobS~Kp+H4+|ZGmzrS8R~0wi4G?Qxjopsj~I7+a@~PBxnD$>&)PW+v%j3o9-v4 zGp>v2bZZ4Y`uf5Bz%WnF}q@P^wxScUs=ALF9H*+7PpNL@bY4to8U9(hA44 pzNf6_8C#XNGom-1lcT(s7wqFDWy%$d65theOwhu+f%w>N^A9RwjPC#d diff --git a/build/classes/library/MainMenu$1.class b/build/classes/library/MainMenu$1.class index aa64097dbe9366b5aebfa3f933bd6336d9876df4..08ea20f7cba8e104a8053ac8febe8540bb59a9e1 100644 GIT binary patch delta 23 ecmaFN`j~Y?FcYKKhLFjNnH&IE$_9r3 delta 23 ecmaFN`j~Y?FcYKignH&IG2?nSD diff --git a/build/classes/library/MainMenu$5.class b/build/classes/library/MainMenu$5.class index bf7afd2574df028a9beaf695f1f98076474cc4f5..f329183a57494839ffc66c2f8a3f1e1aa1e04d4f 100644 GIT binary patch delta 23 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

&q;p^GhK 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 literal 14333 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 Sw=o|FH@^cO-{trC-TwzmYkyAw diff --git a/build/classes/library/MainMenu.form b/build/classes/library/MainMenu.form index 5305172..a3824a3 100644 --- a/build/classes/library/MainMenu.form +++ b/build/classes/library/MainMenu.form @@ -236,7 +236,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -299,12 +299,12 @@ - + - + @@ -361,11 +361,23 @@ - - - + + + + + + + + + + + + + + + - + @@ -373,11 +385,20 @@ - + + + + - + + + + - + + + + @@ -386,12 +407,12 @@ - + - + @@ -399,6 +420,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/library/Album.java b/src/library/Album.java index be399ff..517e44d 100644 --- a/src/library/Album.java +++ b/src/library/Album.java @@ -14,6 +14,7 @@ public class Album extends Item { Album() { } + public Database d = new Database(); Album(int id, String n, String m, int y, String c) { this.setName(n); @@ -34,7 +35,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() + "');"; + d.insertAlbumQ(this); } ; diff --git a/src/library/AlbumFieldPattern.java b/src/library/AlbumFieldPattern.java index ab1f746..e401903 100644 --- a/src/library/AlbumFieldPattern.java +++ b/src/library/AlbumFieldPattern.java @@ -17,6 +17,7 @@ public class AlbumFieldPattern extends javax.swing.JFrame { /** * Creates new form bookFieldPattern */ + public AlbumFieldPattern() { this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); initComponents(); diff --git a/src/library/Database.java b/src/library/Database.java index f12eda7..d398f51 100644 --- a/src/library/Database.java +++ b/src/library/Database.java @@ -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()); @@ -99,9 +99,11 @@ public class Database { prepStmt.setString(7, b.getCategory()); prepStmt.execute(); JOptionPane.showMessageDialog(null, "Dodano poprawnie.", "Informacja:", JOptionPane.INFORMATION_MESSAGE); + } catch (SQLException e) { JOptionPane.showMessageDialog(null, "Błąd przy dodawaniu do bazy", "Error:", JOptionPane.INFORMATION_MESSAGE); + e.printStackTrace(); } } @@ -109,15 +111,17 @@ 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 do bazy", "Error:", JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, "Błąd przy dodawaniu albumu do bazy", "Error:", JOptionPane.INFORMATION_MESSAGE); + e.printStackTrace(); } } @@ -125,7 +129,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()); @@ -202,31 +206,52 @@ public class Database { } return movies; } -//Metoda generyczna - // public Object[][] convertToTable(List l, Class clazz){ + + public int countAll(String tableName) { + try { + int count = 0; + String query = "SELECT COUNT (*) FROM " + tableName + ";"; + PreparedStatement prepStmt = conn.prepareStatement(query); + ResultSet rs = prepStmt.executeQuery(); + while (rs.next()) { + count = rs.getInt(1); + } + return count; + + } catch (SQLException e) { + JOptionPane.showMessageDialog(null, "Błąd przy odczycie ilości.", "Error:", JOptionPane.INFORMATION_MESSAGE); + e.printStackTrace(); + } + return 0; + } public Object[][] convertToTable(List l) { - Object first = l.get(0); - String type = first.getClass().getName(); - int i = l.size(); - if (type.equals("library.Book")) { - Object tab[][] = new Object[i][8]; - for (int y = 0; y < i; y++) { //kolejne wiersze danych - tab = Book.insertRowToTable(tab, y, (Book)l.get(y)); + try { + Object first = l.get(0); + String type = first.getClass().getName(); + int i = l.size(); + if (type.equals("library.Book")) { + Object tab[][] = new Object[i][8]; + for (int y = 0; y < i; y++) { //kolejne wiersze danych + tab = Book.insertRowToTable(tab, y, (Book) l.get(y)); + } + return tab; + } else if (type.equals("library.Album")) { + Object tab[][] = new Object[i][5]; + for (int y = 0; y < i; y++) { //kolejne wiersze danych + tab = Album.insertRowToTable(tab, y, (Album) l.get(y)); + } + return tab; + } else if (type.equals("library.Movie")) { + Object tab[][] = new Object[i][5]; + for (int y = 0; y < i; y++) { //kolejne wiersze danych + tab = Movie.insertRowToTable(tab, y, (Movie) l.get(y)); + } + return tab; } - return tab; - } else if (type.equals("library.Album")) { - Object tab[][] = new Object[i][5]; - for (int y = 0; y < i; y++) { //kolejne wiersze danych - tab = Album.insertRowToTable(tab, y, (Album)l.get(y)); - } - return tab; - } else if (type.equals("library.Movie")) { - Object tab[][] = new Object[i][5]; - for (int y = 0; y < i; y++) { //kolejne wiersze danych - tab = Movie.insertRowToTable(tab, y, (Movie) l.get(y)); - } - return tab; + } catch (IndexOutOfBoundsException e) { + JOptionPane.showMessageDialog(null, "Baza danych pusta", "Error:", JOptionPane.INFORMATION_MESSAGE); + throw new IndexOutOfBoundsException("Nie mozna dzielić przez 0"); } return null; diff --git a/src/library/ListResult.java b/src/library/ListResult.java index 7f735fd..3a744c2 100644 --- a/src/library/ListResult.java +++ b/src/library/ListResult.java @@ -7,6 +7,7 @@ package library; import java.util.LinkedList; import java.util.List; +import javax.swing.JFrame; /** * @@ -24,6 +25,7 @@ public class ListResult extends javax.swing.JFrame { rows = rowData; columnsNames = colNam; initComponents(); + this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); } diff --git a/src/library/MainMenu.form b/src/library/MainMenu.form index 5305172..a3824a3 100644 --- a/src/library/MainMenu.form +++ b/src/library/MainMenu.form @@ -236,7 +236,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -299,12 +299,12 @@ - + - + @@ -361,11 +361,23 @@ - - - + + + + + + + + + + + + + + + - + @@ -373,11 +385,20 @@ - + + + + - + + + + - + + + + @@ -386,12 +407,12 @@ - + - + @@ -399,6 +420,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/library/MainMenu.java b/src/library/MainMenu.java index 5146129..caa4e5d 100644 --- a/src/library/MainMenu.java +++ b/src/library/MainMenu.java @@ -21,6 +21,7 @@ public class MainMenu extends javax.swing.JFrame { public MainMenu() { initComponents(); } + public Database d = new Database(); /** * This method is called from within the constructor to initialize the form. @@ -44,7 +45,7 @@ public class MainMenu extends javax.swing.JFrame { radioBSearch = new javax.swing.JRadioButton(); jPanel1 = new javax.swing.JPanel(); allMovieShow = new javax.swing.JButton(); - allAlbumsShow1 = new javax.swing.JButton(); + allAlbumsShow = new javax.swing.JButton(); allBooksShow = new javax.swing.JButton(); newestBook = new javax.swing.JButton(); newestMovie = new javax.swing.JButton(); @@ -56,6 +57,9 @@ public class MainMenu extends javax.swing.JFrame { jLabel2 = new javax.swing.JLabel(); jLabel3 = new javax.swing.JLabel(); jLabel4 = new javax.swing.JLabel(); + numberOfBooks = new javax.swing.JLabel(); + numberOfAlbums = new javax.swing.JLabel(); + numberOfAlbums1 = new javax.swing.JLabel(); jToggleButton1 = new javax.swing.JToggleButton(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); @@ -170,10 +174,10 @@ public class MainMenu extends javax.swing.JFrame { } }); - allAlbumsShow1.setText("Wszyskie albumy"); - allAlbumsShow1.addActionListener(new java.awt.event.ActionListener() { + allAlbumsShow.setText("Wszyskie albumy"); + allAlbumsShow.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - allAlbumsShow1ActionPerformed(evt); + allAlbumsShowActionPerformed(evt); } }); @@ -203,7 +207,7 @@ public class MainMenu extends javax.swing.JFrame { .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(allAlbumsShow, 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) @@ -239,7 +243,7 @@ public class MainMenu extends javax.swing.JFrame { .addGroup(jPanel1Layout.createSequentialGroup() .addComponent(allBooksShow) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(allAlbumsShow1) + .addComponent(allAlbumsShow) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(allMovieShow)))) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) @@ -247,32 +251,56 @@ public class MainMenu extends javax.swing.JFrame { jPanel2.setBorder(javax.swing.BorderFactory.createEtchedBorder()); - jLabel2.setText("Ilość albumów:"); + jLabel2.setText("Ilość książek:"); - jLabel3.setText("Ilość książek:"); + jLabel3.setText("Ilość albumów:"); jLabel4.setText("Ilość filmów:"); + String n = new Integer(d.countAll("books")).toString(); + numberOfBooks.setText(n); + + n = new Integer(d.countAll("albums")).toString(); + numberOfAlbums.setText(n); + + n = new Integer(d.countAll("movies")).toString(); + numberOfAlbums1.setText(n); + 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)) + .addGroup(jPanel2Layout.createSequentialGroup() + .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(numberOfBooks)) + .addGroup(jPanel2Layout.createSequentialGroup() + .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(numberOfAlbums)) + .addGroup(jPanel2Layout.createSequentialGroup() + .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(numberOfAlbums1))) + .addGap(0, 23, Short.MAX_VALUE)) ); jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup() .addContainerGap() - .addComponent(jLabel2) + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel2) + .addComponent(numberOfBooks)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel3) + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel3) + .addComponent(numberOfAlbums)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel4) + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel4) + .addComponent(numberOfAlbums1)) .addContainerGap(25, Short.MAX_VALUE)) ); @@ -346,7 +374,7 @@ public class MainMenu extends javax.swing.JFrame { private void bAlbumActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bAlbumActionPerformed if (radioBAdd.getModel().isSelected()) { - AlbumFieldPattern b = new AlbumFieldPattern(true); + AlbumFieldPattern b = new AlbumFieldPattern(); b.setVisible(true); b.add = true; } @@ -398,35 +426,70 @@ public class MainMenu extends javax.swing.JFrame { }//GEN-LAST:event_radioBDelete1ActionPerformed private void allBooksShowActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_allBooksShowActionPerformed + try { - Database d = new Database(); - List books = new LinkedList<>(); - books = d.selectBooks(); - /*System.out.println("Lista książek:"); + List books = new LinkedList<>(); + books = d.selectBooks(); + /*System.out.println("Lista książek:"); for (Book k : books) { // }*/ - Object[][] data = d.convertToTable(books); - String[] columnNames = {"ID", - "Tytuł", - "Imię Autora", - "Nazwisko Autora", - "Rok", - "ISBN", - "Wydawnictwo", - "Kategoria"}; - ListResult table = new ListResult(data, columnNames); - - table.setVisible(true); + Object[][] data = d.convertToTable(books); + String[] columnNames = {"ID", + "Tytuł", + "Imię Autora", + "Nazwisko Autora", + "Rok", + "ISBN", + "Wydawnictwo", + "Kategoria"}; + ListResult table = new ListResult(data, columnNames); + + table.setVisible(true); + } catch (IndexOutOfBoundsException e) { + //nothing to do here + } }//GEN-LAST:event_allBooksShowActionPerformed private void allMovieShowActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_allMovieShowActionPerformed - // TODO add your handling code here: + try { + List movies = new LinkedList<>(); + movies = d.selectMovies(); + Object[][] data = d.convertToTable(movies); + String[] columnNames = { + "ID", + "Tytuł", + "Reżyser", + "Rok", + "Kategoria"}; + ListResult table = new ListResult(data, columnNames); + + table.setVisible(true); + } catch (IndexOutOfBoundsException e) { + //nothing to do 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 + private void allAlbumsShowActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_allAlbumsShowActionPerformed + + try { + List albums = new LinkedList<>(); + albums = d.selectAlbums(); + Object[][] data = d.convertToTable(albums); + String[] columnNames = { + "ID", + "Tytuł", + "Muzyk/Zespół", + "Rok", + "Kategoria"}; + ListResult table = new ListResult(data, columnNames); + + table.setVisible(true); + } catch (IndexOutOfBoundsException e) { + //nothing to do here + } + + }//GEN-LAST:event_allAlbumsShowActionPerformed /** * @param args the command line arguments @@ -463,7 +526,7 @@ public class MainMenu extends javax.swing.JFrame { } // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton allAlbumsShow1; + private javax.swing.JButton allAlbumsShow; private javax.swing.JButton allBooksShow; private javax.swing.JButton allMovieShow; private javax.swing.JButton bAlbum; @@ -483,6 +546,9 @@ public class MainMenu extends javax.swing.JFrame { private javax.swing.JButton newestBook1; 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; private javax.swing.JLabel programTitle; private javax.swing.JRadioButton radioBAdd; private javax.swing.JRadioButton radioBDelete1;