RRRRHHHH_Code
Changeset ccac9974c8183f7f0d30e8cabd84ee0386e8cd97
Committed by pinene on Wed 20 May, 2015 16:42:17 +0000
Commit Message:
Merge branch ‘master’ of ssh://xp-dev.com/RRRRHHHH_Code
Conflicts:
ruralHouses client/src/domain/Owner.java
ruralHouses client/src/domain/RuralHouse.java
ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/domain/Booking.java
Changes
Added ruralHouses client/src/gui/DeleteOwnerGUI.java
Added ruralHouses/src/gui/DeleteOwnerGUI.java
Modified ruralHouses client/src/common/AccountInterface.java Diff
Modified ruralHouses client/src/common/AdminInterface.java Diff
Modified ruralHouses client/src/common/BookingInterface.java Diff
Modified ruralHouses client/src/domain/Administrator.java Diff
Modified ruralHouses client/src/domain/Client.java Diff
Modified ruralHouses client/src/domain/Owner.java Diff
Modified ruralHouses client/src/domain/RuralHouse.java Diff
Modified ruralHouses client/src/gui/AdminMenuGUI.java Diff
Modified ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java Diff
Modified ruralHouses client/src/gui/DeleteOfferGUI.java Diff
Modified ruralHouses client/src/gui/HouseFeaturesGUI.java Diff
Modified ruralHouses client/src/gui/ModifyHouseGUI.java Diff
Modified ruralHouses client/src/gui/ModifyOfferGUI.java Diff
Modified ruralHouses client/src/gui/OwnerRegistrationGUI.java Diff
Modified ruralHouses client/src/gui/listOfAdditionRequestsGUI.java Diff
Modified ruralHouses client/src/gui/listOfBookingRequestsGUI.java Diff
Modified ruralHouses client/src/gui/listOfOffers.java Diff
Modified ruralHouses client/src/gui/listOfOwnerAddittionRequests.java Diff
Modified ruralHouses client/src/gui/listOfRemovalRequestsGUI.java Diff
Modified ruralHouses/config.xml Diff
Modified ruralHouses/src/businessLogic/AccountManager.java Diff
Modified ruralHouses/src/businessLogic/AdminManager.java Diff
Modified ruralHouses/src/businessLogic/BookingManager.java Diff
Modified ruralHouses/src/businessLogic/LoginManager.java Diff
Modified ruralHouses/src/businessLogic/OfferManager.java Diff
Modified ruralHouses/src/common/AccountInterface.java Diff
Modified ruralHouses/src/common/AdminInterface.java Diff
Modified ruralHouses/src/common/BookingInterface.java Diff
Modified ruralHouses/src/dataAccess/DB4oManager.java Diff
Modified ruralHouses/src/domain/Account.java Diff
Modified ruralHouses/src/domain/Administrator.java Diff
Modified ruralHouses/src/domain/Booking.java Diff
Modified ruralHouses/src/domain/Client.java Diff
Modified ruralHouses/src/domain/Owner.java Diff
Modified ruralHouses/src/domain/RuralHouse.java Diff
Modified ruralHouses/src/gui/AdminMenuGUI.java Diff
Modified ruralHouses/src/gui/BookRuralHouseConfirmationWindow.java Diff
Modified ruralHouses/src/gui/DeleteOfferGUI.java Diff
Modified ruralHouses/src/gui/HouseFeaturesGUI.java Diff
Modified ruralHouses/src/gui/ModifyHouseGUI.java Diff
Modified ruralHouses/src/gui/ModifyOfferGUI.java Diff
Modified ruralHouses/src/gui/OwnerRegistrationGUI.java Diff
Modified ruralHouses/src/gui/listOfAdditionRequestsGUI.java Diff
Modified ruralHouses/src/gui/listOfBookingRequestsGUI.java Diff
Modified ruralHouses/src/gui/listOfOffers.java Diff
Modified ruralHouses/src/gui/listOfOwnerAddittionRequests.java Diff
Modified ruralHouses/src/gui/listOfRemovalRequestsGUI.java Diff