tmp

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

diff --git a/ruralHouses/src/businessLogic/OfferManager.java b/ruralHouses/src/businessLogic/OfferManager.java
index 4ac0255..955d64e 100644 (file)
--- a/ruralHouses/src/businessLogic/OfferManager.java
+++ b/ruralHouses/src/businessLogic/OfferManager.java
@@ -3,9 +3,6 @@ package businessLogic;
 import java.rmi.RemoteException;
 import java.sql.Date;
 
-import com.db4o.ObjectContainer;
-import com.db4o.ObjectSet;
-
 import dataAccess.DB4oManager;
 import domain.Offer;
 import domain.RuralHouse;
@@ -16,7 +13,6 @@ public final class OfferManager {
 
        private int offerNumber = 0;
        dataAccess.DB4oManager dbMngr;
-       private static OfferManager theOfferManager;
 
        public OfferManager() {
                try {
@@ -26,31 +22,6 @@ public final class OfferManager {
                }
        }
 
-       public static int getNumber() {
-               ObjectContainer db=DB4oManager.getContainer();
-               OfferManager o=getInstance();
-               o.offerNumber++;
-               db.store(o);
-               db.commit();
-               return o.offerNumber;
-       }
-
-       /**
-        * This method returns the instance of the OfferManager class 
-        * 
-        * @return the offer manager
-        */
-       public static OfferManager getInstance()  {
-               ObjectContainer db=DB4oManager.getContainer();
-               OfferManager b = new OfferManager();
-               ObjectSet result = db.queryByExample(b);
-               if (!result.hasNext()){
-                       theOfferManager = new OfferManager();
-                       db.store(theOfferManager);
-                       db.commit();
-               } else theOfferManager=(OfferManager)result.next();
-               return theOfferManager;
-       }
        
        /**
         * This method creates an offer with a house number, first day, last day and price
@@ -66,8 +37,8 @@ public final class OfferManager {
 
                boolean b = dbMngr.existsOverlappingOffer(ruralHouse,firstDay,lastDay); // The ruralHouse object in the client may not be updated
                if (!b) {
-                       ruralHouse.createOffer(offerNumber, firstDay, lastDay, price);
-                       return dbMngr.createOffer(ruralHouse,firstDay,lastDay,price);                   
+                       dbMngr.createOffer(ruralHouse,firstDay,lastDay,price);
+                       return ruralHouse.createOffer(offerNumber, firstDay, lastDay, price);                   
                }
                return null;
        }