Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code
authorcamjan <jcampos004@ikasle.ehu.es>
Tue, 19 May 2015 23:23:13 +0000 (01:23 +0200)
committercamjan <jcampos004@ikasle.ehu.es>
Tue, 19 May 2015 23:23:13 +0000 (01:23 +0200)
Conflicts:
ruralHouses client/src/gui/HouseFeaturesGUI.java
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/domain/RuralHouse.java

24 files changed:
ruralHouses client/.classpath
ruralHouses client/src/common/AccountInterface.java
ruralHouses client/src/common/HouseInterface.java
ruralHouses client/src/common/OfferInterface.java
ruralHouses client/src/gui/AdminMenuGUI.java
ruralHouses client/src/gui/DeleteOwnerGUI.java
ruralHouses client/src/gui/HouseFeaturesGUI.java
ruralHouses client/src/gui/ModifyHouseGUI.java
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses client/src/gui/OffersRelatedOwnerGUI.java
ruralHouses client/src/gui/QueryAvailabilityGUI2.java
ruralHouses client/src/gui/listOfBookingRequestsGUI.java
ruralHouses/.classpath
ruralHouses/src/businessLogic/AccountManager.java
ruralHouses/src/businessLogic/BookingManager.java
ruralHouses/src/businessLogic/HouseManager.java
ruralHouses/src/businessLogic/OfferManager.java
ruralHouses/src/common/AccountInterface.java
ruralHouses/src/common/HouseInterface.java
ruralHouses/src/common/OfferInterface.java
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/domain/Account.java
ruralHouses/src/domain/Owner.java
ruralHouses/src/domain/RuralHouse.java

index 40ed315..3caf01b 100644 (file)
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src" />
-       <classpathentry kind="con"
-               path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-       <classpathentry kind="lib" path="lib/additionalLibs/jcalendar.jar" />
-       <classpathentry kind="lib"
-               path="lib/db4o/lib/db4o-8.0.249.16098-all-java5.jar" />
-       <classpathentry kind="output" path="bin" />
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="lib" path="lib/additionalLibs/jcalendar.jar"/>
+       <classpathentry kind="lib" path="lib/db4o/lib/db4o-8.0.249.16098-all-java5.jar"/>
+       <classpathentry kind="output" path="bin"/>
 </classpath>
index 5de6948..aee131c 100644 (file)
@@ -3,8 +3,6 @@ package common;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
-import domain.Account;
-
 public interface AccountInterface extends Remote{
        
 
index 9731172..e256ff7 100644 (file)
@@ -16,7 +16,7 @@ public interface HouseInterface extends Remote {
 
        public void removeHouse(RuralHouse rh, Owner owner)throws RemoteException;
 
-       public Vector<RuralHouse> getHouses(String name,String town,int nBed , int nKit, int nBath, int nPark, int nLiv) throws RemoteException;
+       public Vector<RuralHouse> 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 
index 6e3b9b3..b1a7a78 100644 (file)
@@ -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<Offer> getRuralHouseOffers(RuralHouse rh)throws RemoteException;
 
 }
index cfd6922..24dcb27 100644 (file)
@@ -4,13 +4,10 @@ import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.swing.GroupLayout;
-import javax.swing.GroupLayout.Alignment;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
-import javax.swing.LayoutStyle.ComponentPlacement;
 
 public class AdminMenuGUI extends JFrame {
 
index 75305dc..fb2fcdb 100644 (file)
@@ -1,13 +1,9 @@
 package gui;
 
-import java.awt.Color;
-import java.awt.Component;
 import java.awt.Font;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.rmi.Naming;
 import java.rmi.RemoteException;
 import java.util.Enumeration;
@@ -22,10 +18,9 @@ import javax.swing.JTable;
 import javax.swing.border.EmptyBorder;
 import javax.swing.table.DefaultTableModel;
 
-
-
 import common.AccountInterface;
 import common.OwnerInterface;
+
 import configuration.___IntNames;
 import domain.Owner;
 
index 1e49dca..de173a5 100644 (file)
@@ -290,7 +290,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()
index 3377c69..d5db84c 100644 (file)
@@ -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;
@@ -159,8 +160,22 @@ public class ModifyHouseGUI extends JFrame {
 
                        }
                });
-
-               houseBox = new JComboBox<RuralHouse>(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<RuralHouse> list = null;
+               try {
+                       list = hm.getHouses(o, null, null, 0, 0, 0, 0, 0);
+               } catch (RemoteException e1) {
+                       e1.printStackTrace();
+               }
+               
+               houseBox = new JComboBox<RuralHouse>(list);
                if (!o.getRuralHouses().isEmpty()) {
                        rh = (RuralHouse) houseBox.getSelectedItem();                   
                        comboBox.setSelectedItem(rh.getDistrict());             
index 171bcb9..14dd98d 100644 (file)
@@ -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.HouseInterface;
 import common.OfferInterface;
 
 import configuration.___IntNames;
 import domain.Offer;
+import domain.Owner;
 import domain.RuralHouse;
 import exceptions.BadDates;
 
@@ -54,22 +57,40 @@ public class ModifyOfferGUI extends JFrame {
        private JLabel jLabel5 = new JLabel();
        private final JLabel jLabel1_o = new JLabel();
        private JComboBox<Offer> comboBox_o;
+       private Vector<RuralHouse> Hlist = null;
+       private OfferInterface  om = null;
+       private HouseInterface hm = null;
 
-       public ModifyOfferGUI(Vector<RuralHouse> v) {
+
+       public ModifyOfferGUI(Owner o) {
                try {
-                       jbInit(v);
+                       jbInit(o);
                } catch (Exception e) {
                        e.printStackTrace();
                }
        }
 
-       private void jbInit(Vector<RuralHouse> v) throws Exception {
+       private void jbInit(Owner o) throws Exception {
                this.getContentPane().setLayout(null);
                this.setSize(new Dimension(513, 433));
                this.setTitle("Set availability");
 
-               
-               jComboBox1 = new JComboBox<RuralHouse>(v);
+
+               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<RuralHouse>(Hlist);
 
                comboBox_o = new JComboBox<Offer>(
                                ((RuralHouse) jComboBox1.getSelectedItem()).getAllOffers());
@@ -123,10 +144,16 @@ public class ModifyOfferGUI extends JFrame {
 
                        @Override
                        public void itemStateChanged(ItemEvent arg0) {
-                               Vector<Offer> vo = ((RuralHouse) jComboBox1.getSelectedItem()).getAllOffers();
+
+                               Vector<Offer> 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()).getAllOffers()
-                                               .isEmpty()) {
+                               if (!vo.isEmpty()) {
                                        jCalendar1.setEnabled(true);
                                        jCalendar2.setEnabled(true);
                                        jButton1.setEnabled(true);
index dc28320..fe2d073 100644 (file)
@@ -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);
                                
                        }
index 9cd01c8..6f4358e 100644 (file)
@@ -298,7 +298,7 @@ public class QueryAvailabilityGUI2 extends JFrame {
                if (this.district.isSelected()) {
                        Vector<RuralHouse> 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
index 85d86e1..f0cb7db 100644 (file)
@@ -8,7 +8,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.rmi.Naming;
 import java.rmi.RemoteException;
-import java.util.Date;
 import java.util.Enumeration;
 import java.util.Vector;
 
@@ -23,7 +22,7 @@ import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
 
 import common.BookingInterface;
-import common.OfferInterface;
+
 import configuration.___IntNames;
 import domain.Booking;
 import domain.Offer;
index 833b790..4a939f6 100644 (file)
@@ -4,6 +4,6 @@
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="lib" path="lib/additionalLibs/jcalendar.jar"/>
        <classpathentry kind="lib" path="lib/db4o/lib/db4o-8.0.249.16098-all-java5.jar"/>
-       <classpathentry kind="lib" path="lib/javax.mail.jar"/>
+       <classpathentry kind="lib" path="lib/mail/javax.mail.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>
index d86cb48..626038f 100644 (file)
@@ -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;
index a5202c5..f0d0a54 100644 (file)
@@ -9,8 +9,8 @@ import javax.mail.MessagingException;
 
 import com.db4o.ObjectContainer;
 import com.db4o.ObjectSet;
-
 import common.BookingInterface;
+
 import dataAccess.DB4oManager;
 import domain.Booking;
 import domain.Client;
index aca30dc..fb3e664 100644 (file)
@@ -54,10 +54,10 @@ public class HouseManager extends UnicastRemoteObject implements HouseInterface
 
 
 
-       public Vector<RuralHouse> getHouses(String name,String town, int nBed, int nKit,
+       public Vector<RuralHouse> 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
index fe9cdb1..12279a3 100644 (file)
@@ -63,10 +63,10 @@ public final class OfferManager extends UnicastRemoteObject implements OfferInte
 
 
        @Override
-       public Vector<RuralHouse> getRuralHouseOffers(RuralHouse rh)
+       public Vector<Offer> getRuralHouseOffers(RuralHouse rh)
                        throws RemoteException {
                // TODO Auto-generated method stub
-               return null;
+               return dbMngr.getRHsOffer(rh.getHouseName());
        }
 
 }
index 5de6948..aee131c 100644 (file)
@@ -3,8 +3,6 @@ package common;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
-import domain.Account;
-
 public interface AccountInterface extends Remote{
        
 
index 9731172..e256ff7 100644 (file)
@@ -16,7 +16,7 @@ public interface HouseInterface extends Remote {
 
        public void removeHouse(RuralHouse rh, Owner owner)throws RemoteException;
 
-       public Vector<RuralHouse> getHouses(String name,String town,int nBed , int nKit, int nBath, int nPark, int nLiv) throws RemoteException;
+       public Vector<RuralHouse> 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 
index ccf03b5..b1a7a78 100644 (file)
@@ -27,6 +27,6 @@ public interface OfferInterface extends Remote {
        public void deleteOffer(RuralHouse rh, Offer o) throws RemoteException,
                        Exception;
        
-       public Vector<RuralHouse> getRuralHouseOffers(RuralHouse rh)throws RemoteException;
+       public Vector<Offer> getRuralHouseOffers(RuralHouse rh)throws RemoteException;
 
 }
index e189e95..0f17aeb 100644 (file)
@@ -222,7 +222,24 @@ public class DB4oManager {
                }
        }
 
-       public Administrator getAdminData() {
+       public Vector<Offer> 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<Offer> result = db.queryByExample(proto);
+                       return new Vector<Offer>(result);
+               } finally {
+                       db.close();
+               }
+       }
+       
+       public Administrator getAdminData(){
+
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
@@ -357,6 +374,7 @@ public class DB4oManager {
                }
        }
 
+       
        public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
                        Exception {
 
@@ -368,10 +386,7 @@ public class DB4oManager {
                try {
                        RuralHouse proto = new RuralHouse(null, null, null, null, null);
                        ObjectSet<RuralHouse> result = db.queryByExample(proto);
-                       Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
-                       while (result.hasNext())
-                               ruralHouses.add((RuralHouse) result.next());
-                       return ruralHouses;
+                       return new Vector<RuralHouse>(result);
                } finally {
                        db.close();
                }
@@ -496,10 +511,10 @@ public class DB4oManager {
 
        }
 
-       public Vector<RuralHouse> getRuralHouses(String name, String town,
+       public Vector<RuralHouse> 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
index ee67f15..08e841c 100644 (file)
@@ -72,6 +72,7 @@ public class Account implements Serializable {
                return admin;
        }
 
+       
        public void setAdmin(boolean admin) {
                this.admin = admin;
        }
index 550aceb..eb436f9 100644 (file)
@@ -16,7 +16,7 @@ public class Owner implements Serializable {
 
 //     public Owner(String name) {
 //             this.name = name;
-//             ruralHouses = new Vector<RuralHouse>();
+//             ruralHouses = new hVector<RuralHouse>();
 //     }
 
        public Owner(String name, String bankAccount,String mail) {
@@ -74,14 +74,6 @@ public class Owner implements Serializable {
                this.mailAccount = mailAccount;
        }
        
-       public Vector<Offer> getAllOffers (){
-               Vector<Offer> offers = new Vector<Offer>();
-               for(RuralHouse rh: this.ruralHouses){
-                       for(Offer of : rh.getAllOffers()){
-                       offers.add(of);
-                       }
-               }
-               return offers;
-       }
+       
 
 }
\ No newline at end of file
index d988b39..529f691 100644 (file)
@@ -17,6 +17,7 @@ public class RuralHouse implements Serializable {
        private Vector<Offer> offers;
        private boolean isAccepted;
 
+
        public RuralHouse() {
                super();
        }