diff --git a/build/classes/library/Book.class b/build/classes/library/Book.class index 0ec99b5..b3c5974 100644 Binary files a/build/classes/library/Book.class and b/build/classes/library/Book.class differ diff --git a/src/library/Book.java b/src/library/Book.java index d54b5af..449818c 100644 --- a/src/library/Book.java +++ b/src/library/Book.java @@ -13,13 +13,13 @@ public class Book extends Item{ Book(){ //nothing to do } - Book(int id, String n, String an, String asn, int y, String isbn, String 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("NULL"); + this.setCategory(c); this.ISBN = isbn; this.publishing = p; } diff --git a/src/library/Database.java b/src/library/Database.java index 90aba20..3300bd3 100644 --- a/src/library/Database.java +++ b/src/library/Database.java @@ -20,7 +20,7 @@ import javax.swing.JOptionPane; public class Database { public static final String DRIVER = "org.sqlite.JDBC"; - public static final String DB_URL = "jdbc:sqlite:biblioteka.db"; + public static final String DB_URL = "jdbc:sqlite:biblioteka.db"; // ścieżka do bazy private Connection conn; private Statement stat; @@ -53,59 +53,46 @@ public class Database { stat.execute(createAlbums); stat.execute(createMovies); } catch (SQLException e) { - System.err.println("Blad przy tworzeniu tabeli"); + JOptionPane.showMessageDialog(null, "Błąd przy tworzeniu tabel bazy danych.", "Error:", JOptionPane.INFORMATION_MESSAGE); return false; } return true; } - public List selectCzytelnicy() { + public List selectBooks() { List books = new LinkedList(); try { ResultSet result = stat.executeQuery("SELECT * FROM books"); - int id; - String imie, nazwisko, pesel; + int id, year; + String name, authorName, authorSurname, isbn, category, publishing; while(result.next()) { - id = result.getInt("id_czytelnika"); - imie = result.getString("imie"); - nazwisko = result.getString("nazwisko"); - pesel = result.getString("pesel"); - books.add(new books(id, imie, nazwisko, pesel)); + id = result.getInt("id"); + year = result.getInt("year"); + name = result.getString("name"); + authorName = result.getString("author_name"); + authorSurname = result.getString("author_surname"); + 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) { JOptionPane.showMessageDialog(null, "Błąd przy odczycie z bazy.", "Error:", JOptionPane.INFORMATION_MESSAGE); } - return czytelnicy; - } - - public List selectKsiazki() { - List ksiazki = new LinkedList(); - try { - ResultSet result = stat.executeQuery("SELECT * FROM ksiazki"); - int id; - String tytul, autor; - while(result.next()) { - id = result.getInt("id_ksiazki"); - tytul = result.getString("tytul"); - autor = result.getString("autor"); - ksiazki.add(new Ksiazka(id, tytul, autor)); - } - } catch (SQLException e) { - e.printStackTrace(); - return null; - } - return ksiazki; + return books; } + + public void closeConnection() { try { conn.close(); } catch (SQLException e) { - System.err.println("Problem z zamknieciem polaczenia"); + JOptionPane.showMessageDialog(null, "Problem z zamknięciem połączenia.", "Error:", JOptionPane.INFORMATION_MESSAGE); e.printStackTrace(); } } } -}