projects
/
RRRRHHHH_Code
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e168688
)
minor changes
author
camjan
<jcampos004@ikasle.ehu.es>
Tue, 10 Mar 2015 12:16:52 +0000
(13:16 +0100)
committer
camjan
<jcampos004@ikasle.ehu.es>
Tue, 10 Mar 2015 12:16:52 +0000
(13:16 +0100)
ruralHouses/src/dataAccess/DB4oManager.java
patch
|
blob
|
history
diff --git
a/ruralHouses/src/dataAccess/DB4oManager.java
b/ruralHouses/src/dataAccess/DB4oManager.java
index
15b2ad4
..
20f1b11
100644
(file)
--- a/
ruralHouses/src/dataAccess/DB4oManager.java
+++ b/
ruralHouses/src/dataAccess/DB4oManager.java
@@
-134,15
+134,13
@@
public class DB4oManager {
public Offer createOffer(RuralHouse ruralHouse, Date firstDay,
Date lastDay, float price) throws RemoteException, Exception {
Offer o = null;
public Offer createOffer(RuralHouse ruralHouse, Date firstDay,
Date lastDay, float price) throws RemoteException, Exception {
Offer o = null;
-
+
if (c.isDatabaseLocal() == false)
openSDB();
else
openDB();
if (c.isDatabaseLocal() == false)
openSDB();
else
openDB();
-
- try {
-
+ try {
RuralHouse proto = new RuralHouse(ruralHouse.getHouseNumber(),
null, null, null, null);
RuralHouse proto = new RuralHouse(ruralHouse.getHouseNumber(),
null, null, null, null);
@@
-159,8
+157,9
@@
public class DB4oManager {
System.out
.println("Error: com.db4o.ext.ObjectNotStorableException in createOffer");
} finally {
System.out
.println("Error: com.db4o.ext.ObjectNotStorableException in createOffer");
} finally {
-
return o
;
+
db.close()
;
}
}
+ return o;
}
public void deleteDB() {
}
public void deleteDB() {
@@
-169,7
+168,7
@@
public class DB4oManager {
openSDB();
else
openDB();
openSDB();
else
openDB();
-
+
try {
Owner proto = new Owner(null, null);
ObjectSet result = db.queryByExample(proto);
try {
Owner proto = new Owner(null, null);
ObjectSet result = db.queryByExample(proto);
@@
-195,14
+194,14
@@
public class DB4oManager {
public Booking createBooking(RuralHouse ruralHouse, Date firstDate,
Date lastDate, String bookTelephoneNumber)
throws OfferCanNotBeBooked {
public Booking createBooking(RuralHouse ruralHouse, Date firstDate,
Date lastDate, String bookTelephoneNumber)
throws OfferCanNotBeBooked {
-
+
if (c.isDatabaseLocal() == false)
openSDB();
else
openDB();
if (c.isDatabaseLocal() == false)
openSDB();
else
openDB();
-
+
Booking bok = null;
Booking bok = null;
-
+
try {
if (c.isDatabaseLocal() == false)
try {
if (c.isDatabaseLocal() == false)
@@
-232,8
+231,10
@@
public class DB4oManager {
.println("Error: com.db4o.ext.ObjectNotStorableException in createBooking");
} catch (Exception exc) {
exc.printStackTrace();
.println("Error: com.db4o.ext.ObjectNotStorableException in createBooking");
} catch (Exception exc) {
exc.printStackTrace();
+ } finally {
+ db.close();
}
}
-
+
return bok;
}
return bok;
}
@@
-262,7
+263,7
@@
public class DB4oManager {
public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
Exception {
public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
Exception {
-
+
if (c.isDatabaseLocal() == false)
openSDB();
else
if (c.isDatabaseLocal() == false)
openSDB();
else
@@
-282,14
+283,13
@@
public class DB4oManager {
public boolean existsOverlappingOffer(RuralHouse rh, Date firstDay,
Date lastDay) throws RemoteException, OverlappingOfferExists {
public boolean existsOverlappingOffer(RuralHouse rh, Date firstDay,
Date lastDay) throws RemoteException, OverlappingOfferExists {
-
+
if (c.isDatabaseLocal() == false)
openSDB();
else
openDB();
if (c.isDatabaseLocal() == false)
openSDB();
else
openDB();
-
+
try {
try {
-
RuralHouse rhn = (RuralHouse) db
.queryByExample(
RuralHouse rhn = (RuralHouse) db
.queryByExample(
@@
-326,12
+326,12
@@
public class DB4oManager {
*/
public Vector<Account> getAccount(String usr, String pwd)
throws RemoteException, Exception {
*/
public Vector<Account> getAccount(String usr, String pwd)
throws RemoteException, Exception {
-
+
if (c.isDatabaseLocal() == false)
openSDB();
else
openDB();
if (c.isDatabaseLocal() == false)
openSDB();
else
openDB();
-
+
try {
Account proto = new Account(usr, pwd, new Owner(null, null));
ObjectSet<Account> result = db.queryByExample(proto);
try {
Account proto = new Account(usr, pwd, new Owner(null, null));
ObjectSet<Account> result = db.queryByExample(proto);
@@
-353,7
+353,7
@@
public class DB4oManager {
openSDB();
else
openDB();
openSDB();
else
openDB();
-
+
boolean stored = false;
RuralHouse house = new RuralHouse(rh.getHouseNumber(), null, null,
null, null);
boolean stored = false;
RuralHouse house = new RuralHouse(rh.getHouseNumber(), null, null,
null, null);
@@
-376,7
+376,7
@@
public class DB4oManager {
openSDB();
else
openDB();
openSDB();
else
openDB();
-
+
RuralHouse house = new RuralHouse(houseNumber, null, null, null, null);
try {
ObjectSet<RuralHouse> result = db.queryByExample(house);
RuralHouse house = new RuralHouse(houseNumber, null, null, null, null);
try {
ObjectSet<RuralHouse> result = db.queryByExample(house);
@@
-392,24
+392,24
@@
public class DB4oManager {
}
}
}
}
-
- public Vector<RuralHouse> getRuralHousesByTown(String town){
- RuralHouse rh = new RuralHouse(0,
null,null,town,
null);
-
+
+ public Vector<RuralHouse> getRuralHousesByTown(String town)
{
+ RuralHouse rh = new RuralHouse(0,
null, null, town,
null);
+
if (c.isDatabaseLocal() == false)
openSDB();
else
openDB();
if (c.isDatabaseLocal() == false)
openSDB();
else
openDB();
-
- try{
+
+ try
{
ObjectSet<RuralHouse> result = db.queryByExample(rh);
Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
ObjectSet<RuralHouse> result = db.queryByExample(rh);
Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
- while(result.hasNext())
+ while
(result.hasNext())
ruralHouses.add(result.next());
return ruralHouses;
ruralHouses.add(result.next());
return ruralHouses;
- }
finally
{
+ }
finally
{
db.close();
}
db.close();
}
-
+
}
}
}
}