From: camjan Date: Mon, 18 May 2015 15:26:01 +0000 (+0200) Subject: Account adding and deleting fixed X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/commitdiff_plain/25898b619dd708c9f15a44200b545cac11404b73 Account adding and deleting fixed --- diff --git a/ruralHouses client/src/common/AccountInterface.java b/ruralHouses client/src/common/AccountInterface.java index 9d489d4..67e02d4 100644 --- a/ruralHouses client/src/common/AccountInterface.java +++ b/ruralHouses client/src/common/AccountInterface.java @@ -4,7 +4,6 @@ import java.rmi.Remote; import java.rmi.RemoteException; import domain.Account; -import domain.Owner; public interface AccountInterface extends Remote{ diff --git a/ruralHouses client/src/domain/Administrator.java b/ruralHouses client/src/domain/Administrator.java index d6e9d79..845d089 100644 --- a/ruralHouses client/src/domain/Administrator.java +++ b/ruralHouses client/src/domain/Administrator.java @@ -12,7 +12,6 @@ public class Administrator implements Serializable { */ private static final long serialVersionUID = 1L; - private static Administrator admin = null; private static LinkedList addRequest; private static LinkedList removeRequest; private static LinkedList newOwnerRequest; diff --git a/ruralHouses client/src/domain/Booking.java b/ruralHouses client/src/domain/Booking.java index 0f72a6c..13bc007 100644 --- a/ruralHouses client/src/domain/Booking.java +++ b/ruralHouses client/src/domain/Booking.java @@ -10,7 +10,6 @@ public class Booking implements Serializable { */ private static final long serialVersionUID = 1L; private int bookingNumber; - private boolean isPaid; private Date bookingDate; private Client client; private Offer offer; @@ -26,12 +25,10 @@ public class Booking implements Serializable { this.client=client; //Booking date is assigned to actual date this.bookingDate= new java.util.Date(System.currentTimeMillis()); - this.isPaid=false; } public void imprimete(){ System.out.println(bookingNumber); - System.out.println(isPaid); System.out.println(bookingDate); System.out.println(client.toString()); System.out.println(offer); @@ -60,20 +57,6 @@ public class Booking implements Serializable { public Date getBookDate() { return this.bookingDate; } - - public void paid() { - this.isPaid = true; - } - - public void notPaid() { - this.isPaid=false; - } - - public boolean isPaid() { - return isPaid; - } - - public Client getClient() { return client; diff --git a/ruralHouses client/src/gui/ModifyOfferGUI.java b/ruralHouses client/src/gui/ModifyOfferGUI.java index a0751ca..7cb5b85 100644 --- a/ruralHouses client/src/gui/ModifyOfferGUI.java +++ b/ruralHouses client/src/gui/ModifyOfferGUI.java @@ -68,7 +68,6 @@ public class ModifyOfferGUI extends JFrame { this.setSize(new Dimension(513, 433)); this.setTitle("Set availability"); - OfferInterface om = null; jComboBox1 = new JComboBox(v); diff --git a/ruralHouses client/src/gui/OwnerRegistrationGUI.java b/ruralHouses client/src/gui/OwnerRegistrationGUI.java index b547b82..5a4ffe9 100644 --- a/ruralHouses client/src/gui/OwnerRegistrationGUI.java +++ b/ruralHouses client/src/gui/OwnerRegistrationGUI.java @@ -16,11 +16,14 @@ import javax.swing.border.EmptyBorder; import common.AdminInterface; import configuration.___IntNames; -import domain.Account; import domain.Owner; public class OwnerRegistrationGUI extends JFrame { + /** + * + */ + private static final long serialVersionUID = 1L; private JPanel panel; private JTextField nameField; private JTextField userNameField; diff --git a/ruralHouses client/src/gui/StartWindow.java b/ruralHouses client/src/gui/StartWindow.java index 5325d56..e938084 100644 --- a/ruralHouses client/src/gui/StartWindow.java +++ b/ruralHouses client/src/gui/StartWindow.java @@ -30,8 +30,6 @@ public class StartWindow extends JFrame { private JButton boton2 = null; private JButton boton3 = null; private static configuration.ConfigXML c; - - // public static ApplicationFacadeInterface facadeInterface; private JLabel lblNewLabel; public static void main(String[] args) { diff --git a/ruralHouses client/src/gui/listOfBookingRequestsGUI.java b/ruralHouses client/src/gui/listOfBookingRequestsGUI.java index 1df8f2a..982d7f2 100644 --- a/ruralHouses client/src/gui/listOfBookingRequestsGUI.java +++ b/ruralHouses client/src/gui/listOfBookingRequestsGUI.java @@ -81,7 +81,7 @@ public class listOfBookingRequestsGUI extends JFrame { }; scrollPane.setViewportView(table); tableModel = new DefaultTableModel(null, new String[] { - "Booking Number", "Is paid", "Booking Date","Name","E-mail", "Telephone" }); + "Booking Number", "Booking Date","Name","E-mail", "Telephone" }); // Maybe there is a better way to avoid interaction. // table.setEnabled(false); @@ -123,21 +123,12 @@ public class listOfBookingRequestsGUI extends JFrame { btnDenyAddition.setBounds(390, 395, 169, 25); contentPane.add(btnDenyAddition); - JButton btnSetAsPaid = new JButton("Set as paid"); - btnSetAsPaid.setBounds(239, 395, 89, 23); - btnSetAsPaid.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - - } - }); - contentPane.add(btnSetAsPaid); Enumeration en = this.bookings.elements(); Booking book; while (en.hasMoreElements()) { book = en.nextElement(); Vector row = new Vector(); row.add(book.getBookNumber()); - row.add(book.isPaid()); row.add(book.getBookDate()); row.add(book.getClient().getName()); row.add(book.getClient().getMailAccount()); diff --git a/ruralHouses client/src/gui/listOfOwnerAddittionRequests.java b/ruralHouses client/src/gui/listOfOwnerAddittionRequests.java index 1d78a53..01aaf8f 100644 --- a/ruralHouses client/src/gui/listOfOwnerAddittionRequests.java +++ b/ruralHouses client/src/gui/listOfOwnerAddittionRequests.java @@ -94,8 +94,6 @@ public class listOfOwnerAddittionRequests extends JFrame { tableModel = new DefaultTableModel(null, new String[] { "Name", "E-mail", "Bank Account" }); - //Maybe there is a better way to avoid interaction. - //table.setEnabled(false); table.setModel(tableModel); JButton btnNewButton = new JButton("Confirm Addition"); @@ -117,7 +115,6 @@ public class listOfOwnerAddittionRequests extends JFrame { am.removeOwnerAdditionRequests(table.getSelectedRow()); am.saveInstance(); } catch (RemoteException e1) { - // TODO Auto-generated catch block e1.printStackTrace(); } @@ -136,12 +133,10 @@ public class listOfOwnerAddittionRequests extends JFrame { am.removeOwnerAdditionRequests(table.getSelectedRow()); am.saveInstance(); } catch (RemoteException e) { - // TODO Auto-generated catch block e.printStackTrace(); } ((DefaultTableModel)table.getModel()).removeRow(table.getSelectedRow()); - accounts.remove(table.getSelectedRow()); } } }); diff --git a/ruralHouses/.classpath b/ruralHouses/.classpath index 4a939f6..833b790 100644 --- a/ruralHouses/.classpath +++ b/ruralHouses/.classpath @@ -4,6 +4,6 @@ - + diff --git a/ruralHouses/src/businessLogic/AccountManager.java b/ruralHouses/src/businessLogic/AccountManager.java index 3747973..ae57126 100644 --- a/ruralHouses/src/businessLogic/AccountManager.java +++ b/ruralHouses/src/businessLogic/AccountManager.java @@ -6,6 +6,7 @@ import java.rmi.server.UnicastRemoteObject; import javax.mail.MessagingException; import common.AccountInterface; + import dataAccess.DB4oManager; import domain.Account; import domain.Administrator; diff --git a/ruralHouses/src/businessLogic/AdminManager.java b/ruralHouses/src/businessLogic/AdminManager.java index a344f2c..e7b38c9 100644 --- a/ruralHouses/src/businessLogic/AdminManager.java +++ b/ruralHouses/src/businessLogic/AdminManager.java @@ -5,6 +5,7 @@ import java.rmi.server.UnicastRemoteObject; import java.util.Vector; import common.AdminInterface; + import domain.Account; import domain.Administrator; import domain.Owner; diff --git a/ruralHouses/src/businessLogic/LoginManager.java b/ruralHouses/src/businessLogic/LoginManager.java index 1f766a3..e0f0439 100644 --- a/ruralHouses/src/businessLogic/LoginManager.java +++ b/ruralHouses/src/businessLogic/LoginManager.java @@ -31,7 +31,7 @@ public class LoginManager extends UnicastRemoteObject implements LoginInterface @Override public Account checkCredentials(String usr, String pwd) { - Account ac = new Account(usr); + Account ac = new Account(SecurityManager.getInstance().calculateHash(usr)); try { Vector account = dbMngr.getAccount(ac); if (SecurityManager.getInstance().isExpectedPassword(pwd.toCharArray(), account diff --git a/ruralHouses/src/businessLogic/OfferManager.java b/ruralHouses/src/businessLogic/OfferManager.java index d3b2a87..4c01cc0 100644 --- a/ruralHouses/src/businessLogic/OfferManager.java +++ b/ruralHouses/src/businessLogic/OfferManager.java @@ -6,6 +6,7 @@ import java.sql.Date; import java.util.Vector; import common.OfferInterface; + import dataAccess.DB4oManager; import domain.Offer; import domain.RuralHouse; diff --git a/ruralHouses/src/common/AccountInterface.java b/ruralHouses/src/common/AccountInterface.java index 8e48aeb..67e02d4 100644 --- a/ruralHouses/src/common/AccountInterface.java +++ b/ruralHouses/src/common/AccountInterface.java @@ -2,6 +2,7 @@ package common; import java.rmi.Remote; import java.rmi.RemoteException; + import domain.Account; public interface AccountInterface extends Remote{ diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java index 096a17b..6089a74 100644 --- a/ruralHouses/src/dataAccess/DB4oManager.java +++ b/ruralHouses/src/dataAccess/DB4oManager.java @@ -135,7 +135,6 @@ public class DB4oManager { Account alfredoAcc = new Account("userAlfredo", "passAlfredo", alfredo); - Account admin = new Account("admin", "admin", true); db.store(Administrator.getInstance()); db.store(jonAcc); @@ -220,9 +219,7 @@ public class DB4oManager { } } - - - public Administrator getAdminData(){ + public Administrator getAdminData() { if (c.isDatabaseLocal() == false) openSDB(); else @@ -230,8 +227,7 @@ public class DB4oManager { try { - - List admL = db.query(new Predicate(){ + List admL = db.query(new Predicate() { private static final long serialVersionUID = 1L; public boolean match(Administrator admin) { @@ -239,11 +235,8 @@ public class DB4oManager { } }); - - return admL.get(0); - } - finally { + } finally { db.close(); } @@ -301,7 +294,7 @@ public class DB4oManager { else openDB(); - Vector book = new Vector() ; + Vector book = new Vector(); try { @@ -320,11 +313,11 @@ public class DB4oManager { offer.createBooking(theDB4oManagerAux.bookingNumber++, cl); db.store(theDB4oManagerAux); // To store the new value for // bookingNumber - + db.store(offer); db.commit(); book = offer.getBookings(); - + } } catch (com.db4o.ext.ObjectNotStorableException e) { @@ -529,27 +522,50 @@ public class DB4oManager { openDB(); try { - // TODO realize if there is another account with same username. - // Quite difficult with the f***ing salt - db.store(acc); - db.commit(); + ObjectSet result = db.queryByExample(new Account(acc + .getUsername())); + if (result.isEmpty()) { + db.store(acc); + db.commit(); + return true; + } } catch (Exception exc) { exc.printStackTrace(); } finally { db.close(); } - return true; + return false; } // TODO remove account public boolean removeAccount(Account acc) { + if (c.isDatabaseLocal() == false) + openSDB(); + else + openDB(); + + try { + ObjectSet result = db.queryByExample(new Account(acc + .getUsername())); + if (!result.isEmpty()) { + db.delete(result.get(0)); + ; + db.commit(); + return true; + } + } catch (Exception exc) { + exc.printStackTrace(); + } finally { + db.close(); + } return false; } - - //TODO this method should be improved. - public void acceptBooking(Offer of){ - Offer off = new Offer(of.getOfferNumber(),of.getRuralHouse(),of.getFirstDay(),of.getLastDay(),of.getPrice()); + + // TODO this method should be improved. + public void acceptBooking(Offer of) { + Offer off = new Offer(of.getOfferNumber(), of.getRuralHouse(), + of.getFirstDay(), of.getLastDay(), of.getPrice()); if (c.isDatabaseLocal() == false) openSDB(); else @@ -560,29 +576,30 @@ public class DB4oManager { this.deleteOffer(result.get(0)); db.store(of); db.close(); - + } catch (Exception e) { - e.printStackTrace();; - } + e.printStackTrace(); + ; + } } - - public void removeBooking(Booking b){ + + public void removeBooking(Booking b) { if (c.isDatabaseLocal() == false) openSDB(); else openDB(); try { ObjectSet result = db.queryByExample(b); - ObjectSet result2= db.queryByExample(b.getClient()); + ObjectSet result2 = db.queryByExample(b.getClient()); db.delete(result.get(0)); db.delete(result2.get(0)); db.commit(); } catch (Exception e) { - e.printStackTrace();; - }finally{ + e.printStackTrace(); + ; + } finally { db.close(); } - } } diff --git a/ruralHouses/src/domain/Account.java b/ruralHouses/src/domain/Account.java index 90f3a23..0a724c3 100644 --- a/ruralHouses/src/domain/Account.java +++ b/ruralHouses/src/domain/Account.java @@ -22,8 +22,8 @@ public class Account implements Serializable { private boolean admin = false; - public Account(String usr){ - this.username = SecurityManager.getInstance().calculateHash(usr); + public Account(byte[] usr){ + this.username = usr; this.salt =null; this.password = null; this.owner = null; @@ -48,6 +48,7 @@ public class Account implements Serializable { } + public byte[] getUsername() { return username; } @@ -86,8 +87,6 @@ public class Account implements Serializable { if (getClass() != obj.getClass()) return false; Account other = (Account) obj; - if (!Arrays.equals(password, other.password)) - return false; if (!Arrays.equals(username, other.username)) return false; return true; diff --git a/ruralHouses/src/domain/Booking.java b/ruralHouses/src/domain/Booking.java index 0f72a6c..cdde621 100644 --- a/ruralHouses/src/domain/Booking.java +++ b/ruralHouses/src/domain/Booking.java @@ -10,7 +10,6 @@ public class Booking implements Serializable { */ private static final long serialVersionUID = 1L; private int bookingNumber; - private boolean isPaid; private Date bookingDate; private Client client; private Offer offer; @@ -26,12 +25,10 @@ public class Booking implements Serializable { this.client=client; //Booking date is assigned to actual date this.bookingDate= new java.util.Date(System.currentTimeMillis()); - this.isPaid=false; } public void imprimete(){ System.out.println(bookingNumber); - System.out.println(isPaid); System.out.println(bookingDate); System.out.println(client.toString()); System.out.println(offer); @@ -61,20 +58,6 @@ public class Booking implements Serializable { return this.bookingDate; } - public void paid() { - this.isPaid = true; - } - - public void notPaid() { - this.isPaid=false; - } - - public boolean isPaid() { - return isPaid; - } - - - public Client getClient() { return client; } diff --git a/ruralHouses/src/launcher/RMILauncher.java b/ruralHouses/src/launcher/RMILauncher.java index 167f1e0..008e371 100644 --- a/ruralHouses/src/launcher/RMILauncher.java +++ b/ruralHouses/src/launcher/RMILauncher.java @@ -12,6 +12,7 @@ import businessLogic.LoginManager; import businessLogic.OfferManager; import businessLogic.OwnerManager; +@SuppressWarnings("deprecation") public class RMILauncher { public static void main(String[] args) {