xp-dev.com Git - RRRRHHHH

author	epinzolas001 <epinzolas001@u004529.gl.ehu.es>
	Mon, 18 May 2015 09:49:54 +0000 (11:49 +0200)
committer	epinzolas001 <epinzolas001@u004529.gl.ehu.es>
	Mon, 18 May 2015 09:49:54 +0000 (11:49 +0200)
commit	4f8bcc7fa6ac7640915ac3aa5e115b6d37c08a86
tree	92eccbae58b7af34a339b130f65868d6a7247afb	tree \| snapshot
parent	6a5d4dad58d39bd2f78b516a2e2062472716eeef	commit \| diff

Merge conflicts solutioned

78 files changed:

ruralHouses client/.DS_Store	[new file with mode: 0644]	blob
ruralHouses client/.classpath	[new file with mode: 0644]	blob
ruralHouses client/.gitignore	[new file with mode: 0644]	blob
ruralHouses client/.project	[new file with mode: 0644]	blob
ruralHouses client/config.xml	[new file with mode: 0644]	blob
ruralHouses client/java.policy	[new file with mode: 0644]	blob
ruralHouses client/src/common/AccountInterface.java	[new file with mode: 0644]	blob
ruralHouses client/src/common/AdminInterface.java	[new file with mode: 0644]	blob
ruralHouses client/src/common/BookingInterface.java	[new file with mode: 0644]	blob
ruralHouses client/src/common/HouseInterface.java	[moved from ruralHouses/src/businessLogic/HouseManagerInterface.java with 61% similarity]	diff \| blob \| history
ruralHouses client/src/common/LoginInterface.java	[new file with mode: 0644]	blob
ruralHouses client/src/common/OfferInterface.java	[new file with mode: 0644]	blob
ruralHouses client/src/common/OwnerInterface.java	[moved from ruralHouses/src/businessLogic/OwnerManagerInterface.java with 63% similarity]	diff \| blob \| history
ruralHouses client/src/configuration/.DS_Store	[new file with mode: 0644]	blob
ruralHouses client/src/configuration/ConfigXML.java	[new file with mode: 0644]	blob
ruralHouses client/src/configuration/___IntNames.java	[new file with mode: 0644]	blob
ruralHouses client/src/domain/Account.java	[new file with mode: 0644]	blob
ruralHouses client/src/domain/Administrator.java	[new file with mode: 0644]	blob
ruralHouses client/src/domain/Booking.java	[new file with mode: 0644]	blob
ruralHouses client/src/domain/Client.java	[new file with mode: 0644]	blob
ruralHouses client/src/domain/Districs.java	[new file with mode: 0644]	blob
ruralHouses client/src/domain/HouseFeatures.java	[new file with mode: 0644]	blob
ruralHouses client/src/domain/Offer.java	[new file with mode: 0644]	blob
ruralHouses client/src/domain/Owner.java	[new file with mode: 0644]	blob
ruralHouses client/src/domain/RuralHouse.java	[new file with mode: 0644]	blob
ruralHouses client/src/exceptions/.DS_Store	[moved from ruralHouses/src/gui/.DS_Store with 100% similarity]	blob \| history
ruralHouses client/src/exceptions/BadDates.java	[new file with mode: 0644]	blob
ruralHouses client/src/exceptions/DB4oManagerCreationException.java	[new file with mode: 0644]	blob
ruralHouses client/src/exceptions/OfferCanNotBeBooked.java	[new file with mode: 0644]	blob
ruralHouses client/src/exceptions/OverlappingOfferExists.java	[new file with mode: 0644]	blob
ruralHouses client/src/gui/.DS_Store	[new file with mode: 0644]	blob
ruralHouses client/src/gui/AddOffersGUI.java	[moved from ruralHouses/src/gui/AddOffersGUI.java with 96% similarity]	diff \| blob \| history
ruralHouses client/src/gui/AdminMenuGUI.java	[moved from ruralHouses/src/gui/AdminMenuGUI.java with 96% similarity]	diff \| blob \| history
ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java	[moved from ruralHouses/src/gui/BookRuralHouseConfirmationWindow.java with 100% similarity]	blob \| history
ruralHouses client/src/gui/DeleteOfferGUI.java	[moved from ruralHouses/src/gui/DeleteOfferGUI.java with 91% similarity]	diff \| blob \| history
ruralHouses client/src/gui/HouseFeaturesGUI.java	[moved from ruralHouses/src/gui/HouseFeaturesGUI.java with 93% similarity]	diff \| blob \| history
ruralHouses client/src/gui/HousesRelatedOwnerGUI.java	[moved from ruralHouses/src/gui/HousesRelatedOwnerGUI.java with 100% similarity]	blob \| history
ruralHouses client/src/gui/LoginGUI.java	[moved from ruralHouses/src/gui/LoginGUI.java with 67% similarity]	diff \| blob \| history
ruralHouses client/src/gui/ModifyHouseGUI.java	[moved from ruralHouses/src/gui/ModifyHouseGUI.java with 89% similarity]	diff \| blob \| history
ruralHouses client/src/gui/ModifyOfferGUI.java	[moved from ruralHouses/src/gui/ModifyOfferGUI.java with 96% similarity]	diff \| blob \| history
ruralHouses client/src/gui/OffersRelatedOwnerGUI.java	[moved from ruralHouses/src/gui/OffersRelatedOwnerGUI.java with 100% similarity]	blob \| history
ruralHouses client/src/gui/OwnerMenuGUI.java	[moved from ruralHouses/src/gui/OwnerMenuGUI.java with 100% similarity]	blob \| history
ruralHouses client/src/gui/OwnerRegistrationGUI.java	[moved from ruralHouses/src/gui/OwnerRegistrationGUI.java with 85% similarity]	diff \| blob \| history
ruralHouses client/src/gui/QueryAvailabilityGUI2.java	[moved from ruralHouses/src/gui/QueryAvailabilityGUI2.java with 93% similarity]	diff \| blob \| history
ruralHouses client/src/gui/RequestDeleteHouseGUI.java	[moved from ruralHouses/src/gui/RequestDeleteHouseGUI.java with 76% similarity]	diff \| blob \| history
ruralHouses client/src/gui/RequestNewHouseGUI.java	[moved from ruralHouses/src/gui/RequestNewHouseGUI.java with 94% similarity]	diff \| blob \| history
ruralHouses client/src/gui/StartWindow.java	[moved from ruralHouses/src/gui/StartWindow.java with 74% similarity]	diff \| blob \| history
ruralHouses client/src/gui/listOfAdditionRequestsGUI.java	[moved from ruralHouses/src/gui/listOfAdditionRequestsGUI.java with 77% similarity]	diff \| blob \| history
ruralHouses client/src/gui/listOfBookingRequestsGUI.java	[moved from ruralHouses/src/gui/listOfBookingRequestsGUI.java with 91% similarity]	diff \| blob \| history
ruralHouses client/src/gui/listOfHousesGUI.java	[moved from ruralHouses/src/gui/listOfHousesGUI.java with 100% similarity]	blob \| history
ruralHouses client/src/gui/listOfOffers.java	[moved from ruralHouses/src/gui/listOfOffers.java with 100% similarity]	blob \| history
ruralHouses client/src/gui/listOfOwnerAddittionRequests.java	[moved from ruralHouses/src/gui/ownerAddittionRequests.java with 70% similarity]	diff \| blob \| history
ruralHouses client/src/gui/listOfRemovalRequestsGUI.java	[moved from ruralHouses/src/gui/listOfRemovalRequestsGUI.java with 76% similarity]	diff \| blob \| history
ruralHouses/.classpath		diff \| blob \| history
ruralHouses/.gitignore		diff \| blob \| history
ruralHouses/src/businessLogic/AccountManager.java		diff \| blob \| history
ruralHouses/src/businessLogic/AdminManager.java		diff \| blob \| history
ruralHouses/src/businessLogic/BookingManager.java		diff \| blob \| history
ruralHouses/src/businessLogic/HouseManager.java		diff \| blob \| history
ruralHouses/src/businessLogic/LoginManager.java		diff \| blob \| history
ruralHouses/src/businessLogic/LoginManagerInterface.java	[deleted file]	blob \| history
ruralHouses/src/businessLogic/OfferManager.java		diff \| blob \| history
ruralHouses/src/businessLogic/OwnerManager.java		diff \| blob \| history
ruralHouses/src/common/AccountInterface.java	[new file with mode: 0644]	blob
ruralHouses/src/common/AdminInterface.java	[new file with mode: 0644]	blob
ruralHouses/src/common/BookingInterface.java	[new file with mode: 0644]	blob
ruralHouses/src/common/HouseInterface.java	[new file with mode: 0644]	blob
ruralHouses/src/common/LoginInterface.java	[new file with mode: 0644]	blob
ruralHouses/src/common/OfferInterface.java	[new file with mode: 0644]	blob
ruralHouses/src/common/OwnerInterface.java	[new file with mode: 0644]	blob
ruralHouses/src/dataAccess/DB4oManager.java		diff \| blob \| history
ruralHouses/src/domain/Account.java		diff \| blob \| history
ruralHouses/src/domain/Administrator.java		diff \| blob \| history
ruralHouses/src/domain/Booking.java		diff \| blob \| history
ruralHouses/src/domain/Districs.java		diff \| blob \| history
ruralHouses/src/domain/HouseFeatures.java		diff \| blob \| history
ruralHouses/src/domain/Owner.java		diff \| blob \| history
ruralHouses/src/launcher/RMILauncher.java	[new file with mode: 0644]	blob

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom