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 40638c7..0f72a6c 100644 (file)
--- a/ruralHouses/src/domain/Booking.java
+++ b/ruralHouses/src/domain/Booking.java
@@ -3,14 +3,17 @@ 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 Client client;
        private Offer offer;
-       private boolean isAccepted;
        
        
        public Booking() {
@@ -24,7 +27,6 @@ public class Booking implements Serializable {
                //Booking date is assigned to actual date
                this.bookingDate= new java.util.Date(System.currentTimeMillis());
                this.isPaid=false;
-               this.isAccepted=false;
        }
        
        public void imprimete(){
@@ -32,8 +34,7 @@ public class Booking implements Serializable {
                System.out.println(isPaid);
                System.out.println(bookingDate);
                System.out.println(client.toString());
-               System.out.println(offer);              
-               System.out.println(this.isAccepted);    
+               System.out.println(offer);      
        }
 
        public int getBookNumber() {
@@ -72,9 +73,7 @@ public class Booking implements Serializable {
                return isPaid;
        }
        
-       public boolean isAccepted(){
-               return this.isAccepted;
-       }
+
 
        public Client getClient() {
                return client;