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

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

diff --git a/ruralHouses/src/gui/DeleteOfferGUI.java b/ruralHouses/src/gui/DeleteOfferGUI.java
index d3a79e4..d9f5ab8 100644 (file)
--- a/ruralHouses/src/gui/DeleteOfferGUI.java
+++ b/ruralHouses/src/gui/DeleteOfferGUI.java
@@ -5,6 +5,7 @@ import java.awt.event.ActionListener;
 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.JButton;
@@ -15,6 +16,7 @@ import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.border.EmptyBorder;
 
+import common.HouseInterface;
 import common.OfferInterface;
 
 import configuration.___IntNames;
@@ -29,28 +31,40 @@ public class DeleteOfferGUI extends JFrame {
         */
        private static final long serialVersionUID = 1L;
        private JPanel contentPane;
-       private Owner owner;
        private JLabel feedback;
        private JComboBox<RuralHouse> comboBox;
        private JComboBox<Offer> comboBox_1;
        private JButton btnDelete;
+       private Vector<RuralHouse> Hlist = null;
+       private HouseInterface hm = null;
 
        /**
         * Create the frame.
         */
        public DeleteOfferGUI(Owner o) {
-               this.owner = o;
+               try {
+                       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();
+               }       
                setBounds(100, 100, 450, 300);
                contentPane = new JPanel();
                contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
                setContentPane(contentPane);
 
-               comboBox = new JComboBox<RuralHouse>(this.owner.getRuralHouses());
+               comboBox = new JComboBox<RuralHouse>(this.Hlist);
                comboBox.setBounds(101, 38, 314, 20);
 
                comboBox_1 = new JComboBox<Offer>();
                comboBox_1.setBounds(101, 76, 314, 20);
-               Vector<Offer> vo = ((RuralHouse) comboBox.getSelectedItem()).offers;
+               Vector<Offer> vo = ((RuralHouse) comboBox.getSelectedItem()).getAllOffers();
                comboBox_1.removeAllItems();
                for (Offer of : vo) {
                        comboBox_1.addItem(of);
@@ -68,7 +82,7 @@ public class DeleteOfferGUI extends JFrame {
 
                        @Override
                        public void itemStateChanged(ItemEvent arg0) {
-                               Vector<Offer> vo = ((RuralHouse) comboBox.getSelectedItem()).offers;
+                               Vector<Offer> vo = ((RuralHouse) comboBox.getSelectedItem()).getAllOffers();
                                comboBox_1.removeAllItems();
                                for (Offer of : vo) {
                                        comboBox_1.addItem(of);