From: camjan Date: Tue, 19 May 2015 23:23:13 +0000 (+0200) Subject: Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/commitdiff_plain/4bc36b7ddf2a9626f60c551cf999ec24052087cc Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code Conflicts: ruralHouses client/src/gui/HouseFeaturesGUI.java ruralHouses client/src/gui/ModifyOfferGUI.java ruralHouses/src/domain/RuralHouse.java --- 4bc36b7ddf2a9626f60c551cf999ec24052087cc diff --cc ruralHouses client/src/common/AccountInterface.java index 5de6948,67e02d4..aee131c --- a/ruralHouses client/src/common/AccountInterface.java +++ b/ruralHouses client/src/common/AccountInterface.java @@@ -3,8 -3,8 +3,6 @@@ package common import java.rmi.Remote; import java.rmi.RemoteException; --import domain.Account; -- public interface AccountInterface extends Remote{ diff --cc ruralHouses client/src/gui/AdminMenuGUI.java index cfd6922,eef2ba4..24dcb27 --- a/ruralHouses client/src/gui/AdminMenuGUI.java +++ b/ruralHouses client/src/gui/AdminMenuGUI.java @@@ -4,8 -4,8 +4,6 @@@ 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; diff --cc ruralHouses client/src/gui/DeleteOwnerGUI.java index 75305dc,0000000..fb2fcdb mode 100644,000000..100644 --- a/ruralHouses client/src/gui/DeleteOwnerGUI.java +++ b/ruralHouses client/src/gui/DeleteOwnerGUI.java @@@ -1,144 -1,0 +1,139 @@@ +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; +import java.util.Vector; + +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +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; + +public class DeleteOwnerGUI extends JFrame { + + /** + * + */ + private static final long serialVersionUID = 1L; + private JPanel contentPane; + private JTable table; + + private DefaultTableModel tableModel; + private OwnerInterface Own = null; + private Vector owners = new Vector(); + + /** + * Create the frame. + */ + public DeleteOwnerGUI() { + setTitle("Current owners:"); + try { + init(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private void init() throws Exception { + setBounds(100, 100, 600, 500); + contentPane = new JPanel(); + contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); + setContentPane(contentPane); + contentPane.setLayout(null); + try { + Own = (OwnerInterface) Naming + .lookup(___IntNames.OwnerManager); + } catch (Exception e1) { + System.out + .println("Error accessing remote authentication: " + + e1.toString()); + } + this.owners = Own.getOwners(); + JLabel lblNewLabel = new JLabel(); + lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 27)); + lblNewLabel.setBounds(23, 41, 536, 33); + contentPane.add(lblNewLabel); + if (this.owners.isEmpty()) + lblNewLabel + .setText("There are not owners in the system"); + else + lblNewLabel.setText("List of owners:"); + JScrollPane scrollPane = new JScrollPane(); + scrollPane.setBounds(new Rectangle(45, 305, 320, 116)); + scrollPane.setBounds(23, 113, 536, 271); + contentPane.add(scrollPane); + JLabel feedback = new JLabel(""); + feedback.setBounds(134, 447, 307, 14); + contentPane.add(feedback); + JButton btnNewButton = new JButton("Delete from the system"); + btnNewButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + if (table.getRowCount()!=0 && table.getSelectedRow() != -1) { + AccountInterface acm = null; + + try { + acm = (AccountInterface) Naming + .lookup(___IntNames.AccountManager); + } catch (Exception e1) { + System.out.println("Error accessing remote authentication: " + + e1.toString()); + } + + try { + if(acm.removeAccount(table.getSelectedRow())) + { + feedback.setText("Deleted from the system"); + } + } catch (RemoteException e1) { + e1.printStackTrace(); + } + + ((DefaultTableModel)table.getModel()).removeRow(table.getSelectedRow()); + } + } + }); + btnNewButton.setBounds(88, 396, 428, 40); + contentPane.add(btnNewButton); + table = new JTable() { + private static final long serialVersionUID = 1L; + + public boolean isCellEditable(int row, int column) { + return false; + }; + }; + + scrollPane.setViewportView(table); + tableModel = new DefaultTableModel(null, new String[] { + "Name", "E-mail", "Bank Account" }); + + table.setModel(tableModel); + + + Enumeration rhs = this.owners.elements(); + while (rhs.hasMoreElements()) { + Owner own = rhs.nextElement(); + Vector row = new Vector(); + row.add(own.getName()); + row.add(own.getMailAccount()); + row.add(own.getBankAccount()); + tableModel.addRow(row); + } + + + } +} diff --cc ruralHouses client/src/gui/ModifyOfferGUI.java index 171bcb9,9259130..14dd98d --- a/ruralHouses client/src/gui/ModifyOfferGUI.java +++ b/ruralHouses client/src/gui/ModifyOfferGUI.java @@@ -25,10 -26,12 +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; @@@ -68,8 -75,26 +75,22 @@@ public class ModifyOfferGUI extends JFr this.setSize(new Dimension(513, 433)); this.setTitle("Set availability"); - - jComboBox1 = new JComboBox(v); -<<<<<<< HEAD + + 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(); - } -======= ->>>>>>> 25898b619dd708c9f15a44200b545cac11404b73 - ++ } + jComboBox1 = new JComboBox(Hlist); comboBox_o = new JComboBox( ((RuralHouse) jComboBox1.getSelectedItem()).getAllOffers()); @@@ -123,10 -148,15 +144,16 @@@ @Override public void itemStateChanged(ItemEvent arg0) { - Vector vo = ((RuralHouse) jComboBox1.getSelectedItem()).getAllOffers(); ++ + 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()).getAllOffers() - .isEmpty()) { + if (!vo.isEmpty()) { jCalendar1.setEnabled(true); jCalendar2.setEnabled(true); jButton1.setEnabled(true); diff --cc ruralHouses client/src/gui/listOfBookingRequestsGUI.java index 85d86e1,982d7f2..f0cb7db --- a/ruralHouses client/src/gui/listOfBookingRequestsGUI.java +++ b/ruralHouses client/src/gui/listOfBookingRequestsGUI.java @@@ -6,9 -4,7 +6,8 @@@ import java.awt.Font import java.awt.Rectangle; 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,8 -18,7 +22,8 @@@ import javax.swing.table.DefaultTableCe import javax.swing.table.DefaultTableModel; import common.BookingInterface; - import common.OfferInterface; + +import configuration.___IntNames; import domain.Booking; import domain.Offer; diff --cc ruralHouses/src/businessLogic/BookingManager.java index a5202c5,601eb3a..f0d0a54 --- a/ruralHouses/src/businessLogic/BookingManager.java +++ b/ruralHouses/src/businessLogic/BookingManager.java @@@ -5,12 -5,10 +5,12 @@@ import java.rmi.server.UnicastRemoteObj import java.util.Date; import java.util.Vector; +import javax.mail.MessagingException; + import com.db4o.ObjectContainer; import com.db4o.ObjectSet; - import common.BookingInterface; + import dataAccess.DB4oManager; import domain.Booking; import domain.Client; diff --cc ruralHouses/src/common/AccountInterface.java index 5de6948,67e02d4..aee131c --- a/ruralHouses/src/common/AccountInterface.java +++ b/ruralHouses/src/common/AccountInterface.java @@@ -3,8 -3,8 +3,6 @@@ package common import java.rmi.Remote; import java.rmi.RemoteException; --import domain.Account; -- public interface AccountInterface extends Remote{ diff --cc ruralHouses/src/domain/RuralHouse.java index d988b39,07259c8..529f691 --- a/ruralHouses/src/domain/RuralHouse.java +++ b/ruralHouses/src/domain/RuralHouse.java @@@ -14,9 -14,8 +14,10 @@@ public class RuralHouse implements Seri private Owner owner; private String district; private HouseFeatures features; - public Vector offers; + private Vector offers; + private boolean isAccepted; + + public RuralHouse() { super(); }