diff --git a/src/java/lodge/TestReservations.java b/src/java/lodge/TestReservations.java index af28298..7fd49c2 100644 --- a/src/java/lodge/TestReservations.java +++ b/src/java/lodge/TestReservations.java @@ -16,8 +16,7 @@ import lodge.reservationsystem.ReservationStatusEnum; public final class TestReservations { public static void main(String[] args) throws Exception { - AccomodationManager mgr = new AccomodationManager(); - mgr.setDataStoreRoot(getRepositoryConfig.getPath()); + AccomodationManager mgr = new AccomodationManager(getRepositoryConfig.getPath()); // 1. Get the list of loaded accounts from Manager mgr.loadAll(); diff --git a/src/java/lodge/reservationsystem/AccomodationManager.java b/src/java/lodge/reservationsystem/AccomodationManager.java index 2e2f94e..b1bed6f 100644 --- a/src/java/lodge/reservationsystem/AccomodationManager.java +++ b/src/java/lodge/reservationsystem/AccomodationManager.java @@ -7,6 +7,15 @@ public final class AccomodationManager { private final AccountList account_list = new AccountList(); + @SuppressWarnings("unused") + AccomodationManager(){ + }; + + public AccomodationManager(String home){ + + setDataStoreRoot(home); + }; + public final void setDataStoreRoot(String home) { DataRepository.setDataStoreRoot(home); } diff --git a/src/java/lodge/reservationsystem/AccountReservationList.java b/src/java/lodge/reservationsystem/AccountReservationList.java index 05d750c..e6ef514 100644 --- a/src/java/lodge/reservationsystem/AccountReservationList.java +++ b/src/java/lodge/reservationsystem/AccountReservationList.java @@ -9,13 +9,14 @@ public class AccountReservationList extends ArrayList { } public boolean add(final Reservation reservation) { - boolean result = true; for(Reservation rsrv: this){ - result = rsrv.getReservation_number() == reservation.getReservation_number(); - if(result) return result; + boolean result = reservation.getReservation_number().compareTo(rsrv.getReservation_number()) == 0; + if(result){ + return result; + } } reservation.reservation_number = AccountReservationList.reservationSerial(reservation); - return result = super.add(reservation); + return super.add(reservation); } @Override