Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses / src / domain / Booking.java

diff --git a/ruralHouses/src/domain/Booking.java b/ruralHouses/src/domain/Booking.java
index fd72de6..0f72a6c 100644 (file)
--- a/ruralHouses/src/domain/Booking.java
+++ b/ruralHouses/src/domain/Booking.java
@@ -3,38 +3,38 @@ package domain;
 import java.io.Serializable;
 import java.util.Date;
 
-@SuppressWarnings("serial")
-public class Booking implements Serializable {
+public class Booking implements Serializable  {
+
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 1L;
        private int bookingNumber;
        private boolean isPaid;
        private Date bookingDate;
-       private String telephone;
+       private Client client;
        private Offer offer;
-       private boolean isAccepted;
        
        
        public Booking() {
        }
 
-       public Booking(int bN ,String telephone, Offer offer) {
+       public Booking(int bN , Offer offer,Client client) {
                
                this.bookingNumber = bN;
-               this.telephone=telephone;
                this.offer = offer;
-               //this.price = price;
+               this.client=client;
                //Booking date is assigned to actual date
                this.bookingDate= new java.util.Date(System.currentTimeMillis());
                this.isPaid=false;
-               this.isAccepted=false;
        }
        
        public void imprimete(){
                System.out.println(bookingNumber);
                System.out.println(isPaid);
                System.out.println(bookingDate);
-               System.out.println(telephone);
-               System.out.println(offer);              
-               System.out.println(this.isAccepted);    
+               System.out.println(client.toString());
+               System.out.println(offer);      
        }
 
        public int getBookNumber() {
@@ -61,14 +61,6 @@ public class Booking implements Serializable {
                return this.bookingDate;
        }
        
-       public void setTelephone(String telephone) {
-               this.telephone = telephone;
-       }
-
-       public String getTelephone() {
-               return this.telephone;
-       }
-       
        public void paid() {
                this.isPaid = true;
        }
@@ -81,8 +73,14 @@ public class Booking implements Serializable {
                return isPaid;
        }
        
-       public boolean isAccepted(){
-               return this.isAccepted;
+
+
+       public Client getClient() {
+               return client;
+       }
+
+       public void setClient(Client client) {
+               this.client = client;
        }
        
 }
\ No newline at end of file