Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard

Changeset 4f8bcc7fa6ac7640915ac3aa5e115b6d37c08a86

Committed by epinzolas001 on Mon 18 May, 2015 09:49:54 +0000

Commit Message:

Merge conflicts solutioned

Changes

Added ruralHouses client/.DS_Store

Added ruralHouses client/.classpath

Added ruralHouses client/.gitignore

Added ruralHouses client/.project

Added ruralHouses client/config.xml

Added ruralHouses client/java.policy

Added ruralHouses client/src/common/AccountInterface.java

Added ruralHouses client/src/common/AdminInterface.java

Added ruralHouses client/src/common/BookingInterface.java

Added ruralHouses client/src/common/HouseInterface.java

Added ruralHouses client/src/common/LoginInterface.java

Added ruralHouses client/src/common/OfferInterface.java

Added ruralHouses client/src/common/OwnerInterface.java

Added ruralHouses client/src/configuration/.DS_Store

Added ruralHouses client/src/configuration/ConfigXML.java

Added ruralHouses client/src/configuration/___IntNames.java

Added ruralHouses client/src/domain/Account.java

Added ruralHouses client/src/domain/Administrator.java

Added ruralHouses client/src/domain/Booking.java

Added ruralHouses client/src/domain/Client.java

Added ruralHouses client/src/domain/Districs.java

Added ruralHouses client/src/domain/HouseFeatures.java

Added ruralHouses client/src/domain/Offer.java

Added ruralHouses client/src/domain/Owner.java

Added ruralHouses client/src/domain/RuralHouse.java

Added ruralHouses client/src/exceptions/.DS_Store

Added ruralHouses client/src/exceptions/BadDates.java

Added ruralHouses client/src/exceptions/DB4oManagerCreationException.java

Added ruralHouses client/src/exceptions/OfferCanNotBeBooked.java

Added ruralHouses client/src/exceptions/OverlappingOfferExists.java

Added ruralHouses client/src/gui/.DS_Store

Added ruralHouses client/src/gui/AddOffersGUI.java

Added ruralHouses client/src/gui/AdminMenuGUI.java

Added ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java

Added ruralHouses client/src/gui/DeleteOfferGUI.java

Added ruralHouses client/src/gui/HouseFeaturesGUI.java

Added ruralHouses client/src/gui/HousesRelatedOwnerGUI.java

Added ruralHouses client/src/gui/LoginGUI.java

Added ruralHouses client/src/gui/ModifyHouseGUI.java

Added ruralHouses client/src/gui/ModifyOfferGUI.java

Added ruralHouses client/src/gui/OffersRelatedOwnerGUI.java

Added ruralHouses client/src/gui/OwnerMenuGUI.java

Added ruralHouses client/src/gui/OwnerRegistrationGUI.java

Added ruralHouses client/src/gui/QueryAvailabilityGUI2.java

Added ruralHouses client/src/gui/RequestDeleteHouseGUI.java

Added ruralHouses client/src/gui/RequestNewHouseGUI.java

Added ruralHouses client/src/gui/StartWindow.java

Added ruralHouses client/src/gui/listOfAdditionRequestsGUI.java

Added ruralHouses client/src/gui/listOfBookingRequestsGUI.java

Added ruralHouses client/src/gui/listOfHousesGUI.java

Added ruralHouses client/src/gui/listOfOffers.java

Added ruralHouses client/src/gui/listOfOwnerAddittionRequests.java

Added ruralHouses client/src/gui/listOfRemovalRequestsGUI.java

Added ruralHouses/src/common/AccountInterface.java

Added ruralHouses/src/common/AdminInterface.java

Added ruralHouses/src/common/BookingInterface.java

Added ruralHouses/src/common/HouseInterface.java

Added ruralHouses/src/common/LoginInterface.java

Added ruralHouses/src/common/OfferInterface.java

Added ruralHouses/src/common/OwnerInterface.java

Added ruralHouses/src/launcher/RMILauncher.java

Removed ruralHouses/src/businessLogic/HouseManagerInterface.java

Removed ruralHouses/src/businessLogic/LoginManagerInterface.java

Removed ruralHouses/src/businessLogic/OwnerManagerInterface.java

Removed ruralHouses/src/gui/.DS_Store

Removed ruralHouses/src/gui/AddOffersGUI.java

Removed ruralHouses/src/gui/AdminMenuGUI.java

Removed ruralHouses/src/gui/BookRuralHouseConfirmationWindow.java

Removed ruralHouses/src/gui/DeleteOfferGUI.java

Removed ruralHouses/src/gui/HouseFeaturesGUI.java

Removed ruralHouses/src/gui/HousesRelatedOwnerGUI.java

Removed ruralHouses/src/gui/LoginGUI.java

Removed ruralHouses/src/gui/ModifyHouseGUI.java

Removed ruralHouses/src/gui/ModifyOfferGUI.java

Removed ruralHouses/src/gui/OffersRelatedOwnerGUI.java

Removed ruralHouses/src/gui/OwnerMenuGUI.java

Removed ruralHouses/src/gui/OwnerRegistrationGUI.java

Removed ruralHouses/src/gui/QueryAvailabilityGUI2.java

Removed ruralHouses/src/gui/RequestDeleteHouseGUI.java

Removed ruralHouses/src/gui/RequestNewHouseGUI.java

Removed ruralHouses/src/gui/StartWindow.java

Removed ruralHouses/src/gui/listOfAdditionRequestsGUI.java

Removed ruralHouses/src/gui/listOfBookingRequestsGUI.java

Removed ruralHouses/src/gui/listOfHousesGUI.java

Removed ruralHouses/src/gui/listOfOffers.java

Removed ruralHouses/src/gui/listOfRemovalRequestsGUI.java

Removed ruralHouses/src/gui/ownerAddittionRequests.java

Modified ruralHouses/.classpath Diff

Modified ruralHouses/.gitignore 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/HouseManager.java Diff

Modified ruralHouses/src/businessLogic/LoginManager.java Diff

Modified ruralHouses/src/businessLogic/OfferManager.java Diff

Modified ruralHouses/src/businessLogic/OwnerManager.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/Districs.java Diff

Modified ruralHouses/src/domain/HouseFeatures.java Diff

Modified ruralHouses/src/domain/Owner.java Diff