Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code

[RRRRHHHH_Code] / ruralHouses / src / businessLogic / BookingManager.java

diff --git a/ruralHouses/src/businessLogic/BookingManager.java b/ruralHouses/src/businessLogic/BookingManager.java
index 601eb3a..138484b 100644 (file)
--- a/ruralHouses/src/businessLogic/BookingManager.java
+++ b/ruralHouses/src/businessLogic/BookingManager.java
@@ -5,6 +5,8 @@ import java.rmi.server.UnicastRemoteObject;
 import java.util.Date;
 import java.util.Vector;
 
+import javax.mail.MessagingException;
+
 import com.db4o.ObjectContainer;
 import com.db4o.ObjectSet;
 import common.BookingInterface;
@@ -23,10 +25,8 @@ public final class BookingManager extends UnicastRemoteObject implements Booking
         * 
         */
        private static final long serialVersionUID = 1L;
-       private int bookingNumber = 0;
        dataAccess.DB4oManager dbMngr;
 
-       private static BookingManager theBookingManager;
 
        public BookingManager() throws RemoteException {
                super();
@@ -37,59 +37,23 @@ public final class BookingManager extends UnicastRemoteObject implements Booking
                }
        }
 
-       /**
-        * This method returns the next Booking number
-        * 
-        * @return the book number
-        */
-
-    public int getNumber() throws RemoteException{
-               ObjectContainer db=DB4oManager.getContainer();
-       BookingManager b=getInstance();
-       b.bookingNumber++;
-       db.store(b);
-       db.commit();
-       return b.bookingNumber;
-    }
        
-       /**
-        * This method returns the instance of the BookingManager class
-        * 
-        * @return the booking manager
-        * @throws RemoteException 
-        */
-
-       public BookingManager getInstance() throws RemoteException  {
-               ObjectContainer db=DB4oManager.getContainer();
-           BookingManager b = new BookingManager();
-           ObjectSet<BookingManager> result = db.queryByExample(b);
-           if (!result.hasNext()){
-               theBookingManager = new BookingManager();
-               db.store(theBookingManager);
-               db.commit();
-           } else theBookingManager=(BookingManager)result.next();
-               return theBookingManager;
-       }
 
-       public void removeDenyBooking(Booking b) throws RemoteException{
-                               b.getOffer().getBookings().remove(b);
+       public void denyBooking(Booking b) throws RemoteException{
                                this.dbMngr.removeBooking(b);
        }
 
 
        public void acceptBooking(Booking b) throws RemoteException{
                b.getOffer().setBooked(true);
-               for(Booking boo : b.getOffer().getBookings()){
-                       if(!boo.equals(b))
-                               b.getOffer().getBookings().remove(b);
-               }
+               b.getOffer().getBookings().clear();
+               b.getOffer().getBookings().add(b);
                this.dbMngr.acceptBooking(b.getOffer());
-               /*try {
+               try {
                        MailManager.getInstance().Send(b.getClient().getMailAccount(), "Your booking has been accepted","Here should be the bill");
                } catch (MessagingException e) {
-                       // TODO Auto-generated catch block
                        e.printStackTrace();
-               }*/
+               }
                
        }
        /**