From: pinene Date: Tue, 19 May 2015 18:01:40 +0000 (+0200) Subject: data now is gotten using queries X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/commitdiff_plain/ad3773a09001cb5e9bac980f0500d8d6c787a3ac data now is gotten using queries --- diff --git a/ruralHouses client/.classpath b/ruralHouses client/.classpath index 40ed315..3caf01b 100644 --- a/ruralHouses client/.classpath +++ b/ruralHouses client/.classpath @@ -1,10 +1,8 @@ - - - - - + + + + + diff --git a/ruralHouses client/src/common/AccountInterface.java b/ruralHouses client/src/common/AccountInterface.java index 9d489d4..67e02d4 100644 --- a/ruralHouses client/src/common/AccountInterface.java +++ b/ruralHouses client/src/common/AccountInterface.java @@ -4,7 +4,6 @@ import java.rmi.Remote; import java.rmi.RemoteException; import domain.Account; -import domain.Owner; public interface AccountInterface extends Remote{ diff --git a/ruralHouses client/src/common/HouseInterface.java b/ruralHouses client/src/common/HouseInterface.java index 9731172..e256ff7 100644 --- a/ruralHouses client/src/common/HouseInterface.java +++ b/ruralHouses client/src/common/HouseInterface.java @@ -16,7 +16,7 @@ public interface HouseInterface extends Remote { public void removeHouse(RuralHouse rh, Owner owner)throws RemoteException; - public Vector getHouses(String name,String town,int nBed , int nKit, int nBath, int nPark, int nLiv) throws RemoteException; + public Vector getHouses(Owner ow, String name,String town,int nBed , int nKit, int nBath, int nPark, int nLiv) throws RemoteException; /** * This method retrieves the existing rural houses diff --git a/ruralHouses client/src/common/OfferInterface.java b/ruralHouses client/src/common/OfferInterface.java index 6e3b9b3..b1a7a78 100644 --- a/ruralHouses client/src/common/OfferInterface.java +++ b/ruralHouses client/src/common/OfferInterface.java @@ -3,6 +3,7 @@ package common; import java.rmi.Remote; import java.rmi.RemoteException; import java.sql.Date; +import java.util.Vector; import domain.Offer; import domain.RuralHouse; @@ -25,5 +26,7 @@ public interface OfferInterface extends Remote { public void deleteOffer(RuralHouse rh, Offer o) throws RemoteException, Exception; + + public Vector getRuralHouseOffers(RuralHouse rh)throws RemoteException; } diff --git a/ruralHouses client/src/gui/HouseFeaturesGUI.java b/ruralHouses client/src/gui/HouseFeaturesGUI.java index 254f9c9..327ee05 100644 --- a/ruralHouses client/src/gui/HouseFeaturesGUI.java +++ b/ruralHouses client/src/gui/HouseFeaturesGUI.java @@ -237,8 +237,7 @@ public class HouseFeaturesGUI extends JFrame { Enumeration rhs = rh.getAllOffers().elements(); while (rhs.hasMoreElements()) { Offer of = rhs.nextElement(); - if (of.getBookings() == null - || of.isBooked()) { + if (of.getBookings() != null) { Vector row = new Vector(); row.add(of.getOfferNumber()); row.add(of.getFirstDay()); @@ -288,7 +287,6 @@ public class HouseFeaturesGUI extends JFrame { + e1.toString()); } - //RegExp to see if telephone number is correct??TODO if (telIn.getText().matches("[976]\\d{2}[.\\- ]?\\d{3}[.\\- ]?\\d{3}") && mailField .getText() diff --git a/ruralHouses client/src/gui/ModifyHouseGUI.java b/ruralHouses client/src/gui/ModifyHouseGUI.java index 3377c69..691b0ca 100644 --- a/ruralHouses client/src/gui/ModifyHouseGUI.java +++ b/ruralHouses client/src/gui/ModifyHouseGUI.java @@ -6,6 +6,7 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.rmi.Naming; import java.rmi.RemoteException; +import java.util.Vector; import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; @@ -18,7 +19,6 @@ import javax.swing.SwingConstants; import javax.swing.border.EmptyBorder; import common.HouseInterface; - import configuration.___IntNames; import domain.Districs; import domain.HouseFeatures; @@ -159,8 +159,22 @@ public class ModifyHouseGUI extends JFrame { } }); - - houseBox = new JComboBox(o.getRuralHouses()); + HouseInterface hm= null; + try { + hm = (HouseInterface) Naming + .lookup(___IntNames.HouseManager); + } catch (Exception e1) { + System.out.println("Error accessing remote authentication: " + + e1.toString()); + } + Vector list = null; + try { + list = hm.getHouses(o, null, null, 0, 0, 0, 0, 0); + } catch (RemoteException e1) { + e1.printStackTrace(); + } + + houseBox = new JComboBox(list); if (!o.getRuralHouses().isEmpty()) { rh = (RuralHouse) houseBox.getSelectedItem(); comboBox.setSelectedItem(rh.getDistrict()); diff --git a/ruralHouses client/src/gui/ModifyOfferGUI.java b/ruralHouses client/src/gui/ModifyOfferGUI.java index a0751ca..82efb8d 100644 --- a/ruralHouses client/src/gui/ModifyOfferGUI.java +++ b/ruralHouses client/src/gui/ModifyOfferGUI.java @@ -12,6 +12,7 @@ import java.awt.event.ItemListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.rmi.Naming; +import java.rmi.RemoteException; import java.sql.Date; import java.text.DateFormat; import java.util.Calendar; @@ -25,10 +26,12 @@ import javax.swing.JLabel; import javax.swing.JTextField; import com.toedter.calendar.JCalendar; -import common.OfferInterface; +import common.HouseInterface; +import common.OfferInterface; import configuration.___IntNames; import domain.Offer; +import domain.Owner; import domain.RuralHouse; import exceptions.BadDates; @@ -54,23 +57,41 @@ public class ModifyOfferGUI extends JFrame { private JLabel jLabel5 = new JLabel(); private final JLabel jLabel1_o = new JLabel(); private JComboBox comboBox_o; + private Vector Hlist = null; + private OfferInterface om = null; + private HouseInterface hm = null; + - public ModifyOfferGUI(Vector v) { + public ModifyOfferGUI(Owner o) { try { - jbInit(v); + jbInit(o); } catch (Exception e) { e.printStackTrace(); } } - private void jbInit(Vector v) throws Exception { + private void jbInit(Owner o) throws Exception { this.getContentPane().setLayout(null); this.setSize(new Dimension(513, 433)); this.setTitle("Set availability"); - OfferInterface om = null; + + try { + om = (OfferInterface) Naming + .lookup(___IntNames.OfferManager); + hm = (HouseInterface) Naming + .lookup(___IntNames.HouseManager); + } catch (Exception e1) { + System.out.println("Error accessing remote authentication: " + + e1.toString()); + } + try { + Hlist = hm.getHouses(o, null, null, 0, 0, 0, 0, 0); + } catch (RemoteException e1) { + e1.printStackTrace(); + } - jComboBox1 = new JComboBox(v); + jComboBox1 = new JComboBox(Hlist); comboBox_o = new JComboBox( ((RuralHouse) jComboBox1.getSelectedItem()).getAllOffers()); @@ -124,10 +145,15 @@ public class ModifyOfferGUI extends JFrame { @Override public void itemStateChanged(ItemEvent arg0) { - Vector vo = ((RuralHouse) jComboBox1.getSelectedItem()).offers; + Vector vo= null; + try { + vo = om.getRuralHouseOffers((RuralHouse) jComboBox1.getSelectedItem()); + } catch (RemoteException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } comboBox_o.removeAllItems(); - if (!((RuralHouse) jComboBox1.getSelectedItem()).offers - .isEmpty()) { + if (!vo.isEmpty()) { jCalendar1.setEnabled(true); jCalendar2.setEnabled(true); jButton1.setEnabled(true); diff --git a/ruralHouses client/src/gui/OffersRelatedOwnerGUI.java b/ruralHouses client/src/gui/OffersRelatedOwnerGUI.java index dc28320..fe2d073 100644 --- a/ruralHouses client/src/gui/OffersRelatedOwnerGUI.java +++ b/ruralHouses client/src/gui/OffersRelatedOwnerGUI.java @@ -44,7 +44,7 @@ public class OffersRelatedOwnerGUI extends JFrame { btnModifyOffers.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - Frame a = new ModifyOfferGUI(owner.getRuralHouses()); + Frame a = new ModifyOfferGUI(owner); a.setVisible(true); } diff --git a/ruralHouses client/src/gui/OwnerRegistrationGUI.java b/ruralHouses client/src/gui/OwnerRegistrationGUI.java index b547b82..e0e5ff6 100644 --- a/ruralHouses client/src/gui/OwnerRegistrationGUI.java +++ b/ruralHouses client/src/gui/OwnerRegistrationGUI.java @@ -16,7 +16,6 @@ import javax.swing.border.EmptyBorder; import common.AdminInterface; import configuration.___IntNames; -import domain.Account; import domain.Owner; public class OwnerRegistrationGUI extends JFrame { diff --git a/ruralHouses client/src/gui/QueryAvailabilityGUI2.java b/ruralHouses client/src/gui/QueryAvailabilityGUI2.java index 9cd01c8..6f4358e 100644 --- a/ruralHouses client/src/gui/QueryAvailabilityGUI2.java +++ b/ruralHouses client/src/gui/QueryAvailabilityGUI2.java @@ -298,7 +298,7 @@ public class QueryAvailabilityGUI2 extends JFrame { if (this.district.isSelected()) { Vector houses = null; try { - houses = houseMan.getHouses(null, jComboBox1 + houses = houseMan.getHouses(null, null, jComboBox1 .getSelectedItem().toString(), Integer.parseInt(nBedrooms .getText()), Integer.parseInt(nKitchens.getText()), Integer .parseInt(nBaths.getText()), Integer.parseInt(nParkings @@ -311,7 +311,7 @@ public class QueryAvailabilityGUI2 extends JFrame { list.setVisible(true); } else if (this.ruralHouseName.isSelected()) { try { - RuralHouse rh = houseMan.getHouses(jTextField3.getText(), null, + RuralHouse rh = houseMan.getHouses(null, jTextField3.getText(), null, 0, 0, 0, 0, 0).get(0); // The next instruction creates a java.sql.Date object from the // date selected in the JCalendar object diff --git a/ruralHouses/src/businessLogic/AccountManager.java b/ruralHouses/src/businessLogic/AccountManager.java index 3747973..ae57126 100644 --- a/ruralHouses/src/businessLogic/AccountManager.java +++ b/ruralHouses/src/businessLogic/AccountManager.java @@ -6,6 +6,7 @@ import java.rmi.server.UnicastRemoteObject; import javax.mail.MessagingException; import common.AccountInterface; + import dataAccess.DB4oManager; import domain.Account; import domain.Administrator; diff --git a/ruralHouses/src/businessLogic/AdminManager.java b/ruralHouses/src/businessLogic/AdminManager.java index a344f2c..e7b38c9 100644 --- a/ruralHouses/src/businessLogic/AdminManager.java +++ b/ruralHouses/src/businessLogic/AdminManager.java @@ -5,6 +5,7 @@ import java.rmi.server.UnicastRemoteObject; import java.util.Vector; import common.AdminInterface; + import domain.Account; import domain.Administrator; import domain.Owner; diff --git a/ruralHouses/src/businessLogic/HouseManager.java b/ruralHouses/src/businessLogic/HouseManager.java index aca30dc..fb3e664 100644 --- a/ruralHouses/src/businessLogic/HouseManager.java +++ b/ruralHouses/src/businessLogic/HouseManager.java @@ -54,10 +54,10 @@ public class HouseManager extends UnicastRemoteObject implements HouseInterface - public Vector getHouses(String name,String town, int nBed, int nKit, + public Vector getHouses(Owner ow, String name,String town, int nBed, int nKit, int nBath, int nPark, int nLiv) { - return this.dbMngr.getRuralHouses( name ,town, nBed, nKit, nBath, nPark, nLiv); + return this.dbMngr.getRuralHouses( ow, name ,town, nBed, nKit, nBath, nPark, nLiv); } @Override diff --git a/ruralHouses/src/businessLogic/OfferManager.java b/ruralHouses/src/businessLogic/OfferManager.java index d3b2a87..cfe7276 100644 --- a/ruralHouses/src/businessLogic/OfferManager.java +++ b/ruralHouses/src/businessLogic/OfferManager.java @@ -6,6 +6,7 @@ import java.sql.Date; import java.util.Vector; import common.OfferInterface; + import dataAccess.DB4oManager; import domain.Offer; import domain.RuralHouse; @@ -62,10 +63,10 @@ public final class OfferManager extends UnicastRemoteObject implements OfferInte @Override - public Vector getRuralHouseOffers(RuralHouse rh) + public Vector getRuralHouseOffers(RuralHouse rh) throws RemoteException { // TODO Auto-generated method stub - return null; + return dbMngr.getRHsOffer(rh.getHouseName()); } } diff --git a/ruralHouses/src/common/AccountInterface.java b/ruralHouses/src/common/AccountInterface.java index 8e48aeb..67e02d4 100644 --- a/ruralHouses/src/common/AccountInterface.java +++ b/ruralHouses/src/common/AccountInterface.java @@ -2,6 +2,7 @@ package common; import java.rmi.Remote; import java.rmi.RemoteException; + import domain.Account; public interface AccountInterface extends Remote{ diff --git a/ruralHouses/src/common/HouseInterface.java b/ruralHouses/src/common/HouseInterface.java index 9731172..e256ff7 100644 --- a/ruralHouses/src/common/HouseInterface.java +++ b/ruralHouses/src/common/HouseInterface.java @@ -16,7 +16,7 @@ public interface HouseInterface extends Remote { public void removeHouse(RuralHouse rh, Owner owner)throws RemoteException; - public Vector getHouses(String name,String town,int nBed , int nKit, int nBath, int nPark, int nLiv) throws RemoteException; + public Vector getHouses(Owner ow, String name,String town,int nBed , int nKit, int nBath, int nPark, int nLiv) throws RemoteException; /** * This method retrieves the existing rural houses diff --git a/ruralHouses/src/common/OfferInterface.java b/ruralHouses/src/common/OfferInterface.java index ccf03b5..b1a7a78 100644 --- a/ruralHouses/src/common/OfferInterface.java +++ b/ruralHouses/src/common/OfferInterface.java @@ -27,6 +27,6 @@ public interface OfferInterface extends Remote { public void deleteOffer(RuralHouse rh, Offer o) throws RemoteException, Exception; - public Vector getRuralHouseOffers(RuralHouse rh)throws RemoteException; + public Vector getRuralHouseOffers(RuralHouse rh)throws RemoteException; } diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java index 096a17b..0fb0c74 100644 --- a/ruralHouses/src/dataAccess/DB4oManager.java +++ b/ruralHouses/src/dataAccess/DB4oManager.java @@ -220,7 +220,21 @@ public class DB4oManager { } } + public Vector getRHsOffer(String name){ + if (c.isDatabaseLocal() == false) + openSDB(); + else + openDB(); + try { + RuralHouse rh = (RuralHouse)db.queryByExample(new RuralHouse(name, null, null, null, null)).get(0); + Offer proto = new Offer(0, rh, null, null, 0); + ObjectSet result = db.queryByExample(proto); + return new Vector(result); + } finally { + db.close(); + } + } public Administrator getAdminData(){ if (c.isDatabaseLocal() == false) @@ -361,6 +375,7 @@ public class DB4oManager { } } + public Vector getAllRuralHouses() throws RemoteException, Exception { @@ -372,10 +387,7 @@ public class DB4oManager { try { RuralHouse proto = new RuralHouse(null, null, null, null, null); ObjectSet result = db.queryByExample(proto); - Vector ruralHouses = new Vector(); - while (result.hasNext()) - ruralHouses.add((RuralHouse) result.next()); - return ruralHouses; + return new Vector(result); } finally { db.close(); } @@ -500,10 +512,10 @@ public class DB4oManager { } - public Vector getRuralHouses(String name, String town, + public Vector getRuralHouses(Owner ow, String name, String town, int nBed, int nKit, int nBath, int nPark, int nLiv) { HouseFeatures fea = new HouseFeatures(nBed, nKit, nBath, nLiv, nPark); - RuralHouse rh = new RuralHouse(name, null, null, town, fea); + RuralHouse rh = new RuralHouse(name, ow, null, town, fea); if (c.isDatabaseLocal() == false) openSDB(); else