Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code

[RRRRHHHH_Code] / ruralHouses / src / gui / ModifyOfferGUI.java

diff --git a/ruralHouses/src/gui/ModifyOfferGUI.java b/ruralHouses/src/gui/ModifyOfferGUI.java
index 6f69df6..3e7a6c6 100644 (file)
--- a/ruralHouses/src/gui/ModifyOfferGUI.java
+++ b/ruralHouses/src/gui/ModifyOfferGUI.java
@@ -11,6 +11,8 @@ import java.awt.event.ItemEvent;
 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;
@@ -23,11 +25,13 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
 
-import businessLogic.OfferManager;
-
 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;
 
@@ -53,21 +57,42 @@ 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());
@@ -121,10 +146,16 @@ public class ModifyOfferGUI extends JFrame {
 
                        @Override
                        public void itemStateChanged(ItemEvent arg0) {
-                               Vector<Offer> vo = ((RuralHouse) jComboBox1.getSelectedItem()).offers;
+
+                               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()).offers
-                                               .isEmpty()) {
+                               if (!vo.isEmpty()) {
                                        jCalendar1.setEnabled(true);
                                        jCalendar2.setEnabled(true);
                                        jButton1.setEnabled(true);
@@ -265,7 +296,15 @@ public class ModifyOfferGUI extends JFrame {
 
                        // Obtain the business logic from a StartWindow class (local or
                        // remote)
-                       OfferManager offerM = new OfferManager();
+                       OfferInterface offerM = null;
+                       try {
+                               offerM = (OfferInterface) Naming
+                                               .lookup(___IntNames.OfferManager);
+                       } catch (Exception e1) {
+                               System.out.println("Error accessing remote authentication: "
+                                               + e1.toString());
+                       }
+                       
                        offerM.deleteOffer(ruralHouse, (Offer) comboBox_o.getSelectedItem());
                        offerM.createOffer(ruralHouse, firstDay, lastDay, price);