From 520867d5e278316fe874703c30b89de67ff5d82d Mon Sep 17 00:00:00 2001 From: pinene Date: Sun, 19 Apr 2015 16:09:12 +0200 Subject: [PATCH] tmp --- .../src/businessLogic/BookingManager.java | 2 +- .../src/businessLogic/HouseManager.java | 1 - .../src/businessLogic/LoginManager.java | 1 - .../businessLogic/LoginManagerInterface.java | 1 - .../src/businessLogic/OfferManager.java | 33 +--------------- ruralHouses/src/dataAccess/DB4oManager.java | 27 ++++++++----- .../src/dataAccess/DB4oManagerServer.java | 4 ++ ruralHouses/src/gui/AddOffersGUI.java | 5 +-- ruralHouses/src/gui/DeleteOfferGUI.java | 10 ++--- ruralHouses/src/gui/HouseFeaturesGUI.java | 38 ++++++++++++------- ruralHouses/src/gui/LoginGUI.java | 8 +--- ruralHouses/src/gui/ModifyHouseGUI.java | 6 +-- ruralHouses/src/gui/ModifyOfferGUI.java | 1 - .../src/gui/QueryAvailabilityGUI2.java | 4 +- .../src/gui/RequestDeleteHouseGUI.java | 11 +++--- ruralHouses/src/gui/RequestNewHouseGUI.java | 9 ++--- ruralHouses/src/gui/StartWindow.java | 29 ++------------ .../src/gui/listOfAdditionRequestsGUI.java | 4 ++ ruralHouses/src/gui/listOfHousesGUI.java | 4 ++ .../src/gui/listOfRemovalRequestsGUI.java | 4 ++ 20 files changed, 87 insertions(+), 115 deletions(-) diff --git a/ruralHouses/src/businessLogic/BookingManager.java b/ruralHouses/src/businessLogic/BookingManager.java index 24dd41c..b9fa7bd 100644 --- a/ruralHouses/src/businessLogic/BookingManager.java +++ b/ruralHouses/src/businessLogic/BookingManager.java @@ -48,7 +48,7 @@ public final class BookingManager { public static BookingManager getInstance() { ObjectContainer db=DB4oManager.getContainer(); BookingManager b = new BookingManager(); - ObjectSet result = db.queryByExample(b); + ObjectSet result = db.queryByExample(b); if (!result.hasNext()){ theBookingManager = new BookingManager(); db.store(theBookingManager); diff --git a/ruralHouses/src/businessLogic/HouseManager.java b/ruralHouses/src/businessLogic/HouseManager.java index 4601b88..7de62a4 100644 --- a/ruralHouses/src/businessLogic/HouseManager.java +++ b/ruralHouses/src/businessLogic/HouseManager.java @@ -4,7 +4,6 @@ import java.rmi.RemoteException; import java.util.Vector; import dataAccess.DB4oManager; -import domain.HouseFeatures; import domain.Owner; import domain.RuralHouse; diff --git a/ruralHouses/src/businessLogic/LoginManager.java b/ruralHouses/src/businessLogic/LoginManager.java index b0aadd8..8064310 100644 --- a/ruralHouses/src/businessLogic/LoginManager.java +++ b/ruralHouses/src/businessLogic/LoginManager.java @@ -5,7 +5,6 @@ import java.util.Vector; import dataAccess.DB4oManager; import domain.Account; -import domain.Owner; public class LoginManager implements LoginManagerInterface { diff --git a/ruralHouses/src/businessLogic/LoginManagerInterface.java b/ruralHouses/src/businessLogic/LoginManagerInterface.java index 682b500..f2a1f8d 100644 --- a/ruralHouses/src/businessLogic/LoginManagerInterface.java +++ b/ruralHouses/src/businessLogic/LoginManagerInterface.java @@ -1,7 +1,6 @@ package businessLogic; import domain.Account; -import domain.Owner; public interface LoginManagerInterface { diff --git a/ruralHouses/src/businessLogic/OfferManager.java b/ruralHouses/src/businessLogic/OfferManager.java index 4ac0255..955d64e 100644 --- a/ruralHouses/src/businessLogic/OfferManager.java +++ b/ruralHouses/src/businessLogic/OfferManager.java @@ -3,9 +3,6 @@ package businessLogic; import java.rmi.RemoteException; import java.sql.Date; -import com.db4o.ObjectContainer; -import com.db4o.ObjectSet; - import dataAccess.DB4oManager; import domain.Offer; import domain.RuralHouse; @@ -16,7 +13,6 @@ public final class OfferManager { private int offerNumber = 0; dataAccess.DB4oManager dbMngr; - private static OfferManager theOfferManager; public OfferManager() { try { @@ -26,31 +22,6 @@ public final class OfferManager { } } - public static int getNumber() { - ObjectContainer db=DB4oManager.getContainer(); - OfferManager o=getInstance(); - o.offerNumber++; - db.store(o); - db.commit(); - return o.offerNumber; - } - - /** - * This method returns the instance of the OfferManager class - * - * @return the offer manager - */ - public static OfferManager getInstance() { - ObjectContainer db=DB4oManager.getContainer(); - OfferManager b = new OfferManager(); - ObjectSet result = db.queryByExample(b); - if (!result.hasNext()){ - theOfferManager = new OfferManager(); - db.store(theOfferManager); - db.commit(); - } else theOfferManager=(OfferManager)result.next(); - return theOfferManager; - } /** * This method creates an offer with a house number, first day, last day and price @@ -66,8 +37,8 @@ public final class OfferManager { boolean b = dbMngr.existsOverlappingOffer(ruralHouse,firstDay,lastDay); // The ruralHouse object in the client may not be updated if (!b) { - ruralHouse.createOffer(offerNumber, firstDay, lastDay, price); - return dbMngr.createOffer(ruralHouse,firstDay,lastDay,price); + dbMngr.createOffer(ruralHouse,firstDay,lastDay,price); + return ruralHouse.createOffer(offerNumber, firstDay, lastDay, price); } return null; } diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java index eb80b86..0e6e881 100644 --- a/ruralHouses/src/dataAccess/DB4oManager.java +++ b/ruralHouses/src/dataAccess/DB4oManager.java @@ -4,15 +4,12 @@ import java.io.File; //import java.util.Enumeration; //import java.util.Vector; import java.rmi.RemoteException; - - import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; import java.util.Vector; - import com.db4o.Db4oEmbedded; import com.db4o.ObjectContainer; import com.db4o.ObjectSet; @@ -72,8 +69,8 @@ public class DB4oManager { } else // c.getDataBaseOpenMode().equals("open") { - ObjectSet res = db.queryByExample(DB4oManagerAux.class); - ListIterator listIter = res.listIterator(); + ObjectSet res = db.queryByExample(DB4oManagerAux.class); + ListIterator listIter = res.listIterator(); if (listIter.hasNext()) theDB4oManagerAux = (DB4oManagerAux) res.next(); } @@ -155,8 +152,7 @@ public class DB4oManager { try { Owner proto = new Owner(null, null); - ObjectSet result = db.queryByExample(proto); - Vector owners = new Vector(); + ObjectSet result = db.queryByExample(proto); while (result.hasNext()) { Owner o = (Owner) result.next(); System.out.println("Deleted owner: " + o.toString()); @@ -223,16 +219,23 @@ public class DB4oManager { } + @SuppressWarnings("static-access") public LinkedList[] getAdminData(){ if (c.isDatabaseLocal() == false) openSDB(); else openDB(); + @SuppressWarnings("unchecked") LinkedList[] ret = new LinkedList[2]; try { List admL = db.query(new Predicate(){ + /** + * + */ + private static final long serialVersionUID = 1L; + public boolean match(Administrator admin){ return true; } @@ -249,6 +252,7 @@ public class DB4oManager { } + @SuppressWarnings("static-access") public void storeAdmin() { if (c.isDatabaseLocal() == false) openSDB(); @@ -257,6 +261,11 @@ public class DB4oManager { try { List admL = db.query(new Predicate(){ + /** + * + */ + private static final long serialVersionUID = 1L; + public boolean match(Administrator admin){ return true; } @@ -304,7 +313,7 @@ public class DB4oManager { RuralHouse proto = new RuralHouse(ruralHouse.getHouseName(), null, ruralHouse.getDescription(), ruralHouse.getDistrict(), null); - ObjectSet result = db.queryByExample(proto); + ObjectSet result = db.queryByExample(proto); RuralHouse rh = (RuralHouse) result.next(); Offer offer; @@ -364,7 +373,7 @@ public class DB4oManager { try { RuralHouse proto = new RuralHouse(null, null, null, null, null); - ObjectSet result = db.queryByExample(proto); + ObjectSet result = db.queryByExample(proto); Vector ruralHouses = new Vector(); while (result.hasNext()) ruralHouses.add((RuralHouse) result.next()); diff --git a/ruralHouses/src/dataAccess/DB4oManagerServer.java b/ruralHouses/src/dataAccess/DB4oManagerServer.java index b329e95..106cfff 100644 --- a/ruralHouses/src/dataAccess/DB4oManagerServer.java +++ b/ruralHouses/src/dataAccess/DB4oManagerServer.java @@ -21,6 +21,10 @@ import domain.Owner; public class DB4oManagerServer extends JDialog { + /** + * + */ + private static final long serialVersionUID = 1L; private final JPanel contentPanel = new JPanel(); JTextArea textArea; ObjectServer server; diff --git a/ruralHouses/src/gui/AddOffersGUI.java b/ruralHouses/src/gui/AddOffersGUI.java index 12d501b..8d34025 100644 --- a/ruralHouses/src/gui/AddOffersGUI.java +++ b/ruralHouses/src/gui/AddOffersGUI.java @@ -24,7 +24,6 @@ import businessLogic.OfferManager; import com.toedter.calendar.JCalendar; -import domain.Offer; import domain.RuralHouse; import exceptions.BadDates; import exceptions.OverlappingOfferExists; @@ -35,7 +34,7 @@ public class AddOffersGUI extends JFrame { private static final long serialVersionUID = 1L; - private JComboBox jComboBox1; + private JComboBox jComboBox1; private JLabel jLabel1 = new JLabel(); private JLabel jLabel2 = new JLabel(); private JTextField jTextField1 = new JTextField(); @@ -74,7 +73,7 @@ private static final long serialVersionUID = 1L; this.setTitle("Set availability"); - jComboBox1 = new JComboBox(v); + jComboBox1 = new JComboBox(v); jComboBox1.setBounds(new Rectangle(115, 30, 115, 20)); jLabel1.setText("List of houses:"); jLabel1.setBounds(new Rectangle(25, 30, 95, 20)); diff --git a/ruralHouses/src/gui/DeleteOfferGUI.java b/ruralHouses/src/gui/DeleteOfferGUI.java index bed2cb7..cd2665a 100644 --- a/ruralHouses/src/gui/DeleteOfferGUI.java +++ b/ruralHouses/src/gui/DeleteOfferGUI.java @@ -6,8 +6,6 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.Vector; -import javax.swing.GroupLayout; -import javax.swing.GroupLayout.Alignment; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JFrame; @@ -20,8 +18,6 @@ import businessLogic.OfferManager; import domain.Offer; import domain.Owner; import domain.RuralHouse; -import javax.swing.LayoutStyle.ComponentPlacement; -import javax.swing.JTextField; public class DeleteOfferGUI extends JFrame { @@ -59,10 +55,10 @@ public class DeleteOfferGUI extends JFrame { } JRadioButton rdbtnIAmSure = new JRadioButton("I am sure"); - rdbtnIAmSure.setBounds(101, 134, 71, 23); + rdbtnIAmSure.setBounds(101, 134, 108, 23); btnDelete = new JButton("DELETE"); - btnDelete.setBounds(92, 226, 69, 23); + btnDelete.setBounds(92, 226, 117, 23); btnDelete.setEnabled(false); comboBox.addItemListener(new ItemListener() { @@ -108,7 +104,7 @@ public class DeleteOfferGUI extends JFrame { contentPane.add(comboBox_1); feedback = new JLabel(""); - feedback.setBounds(140, 178, 155, 23); + feedback.setBounds(140, 178, 202, 23); contentPane.add(feedback); btnDelete.addActionListener(new ActionListener() { diff --git a/ruralHouses/src/gui/HouseFeaturesGUI.java b/ruralHouses/src/gui/HouseFeaturesGUI.java index 0261832..f5258cb 100644 --- a/ruralHouses/src/gui/HouseFeaturesGUI.java +++ b/ruralHouses/src/gui/HouseFeaturesGUI.java @@ -9,7 +9,6 @@ import java.awt.event.MouseEvent; import java.util.Date; import java.util.Enumeration; import java.util.Vector; - import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -53,6 +52,7 @@ public class HouseFeaturesGUI extends JFrame { private RuralHouse rh; private JTextField telIn; private int row; + private JLabel labelPhone; /** * Create the frame. @@ -195,6 +195,10 @@ public class HouseFeaturesGUI extends JFrame { telIn.setBounds(99, 505, 129, 20); contentPane.add(telIn); telIn.setColumns(10); + + labelPhone = new JLabel(""); + labelPhone.setBounds(238, 252, 178, 14); + contentPane.add(labelPhone); table.addMouseListener( new MouseAdapter(){ @Override public void mouseClicked(MouseEvent arg0) { @@ -213,6 +217,11 @@ public class HouseFeaturesGUI extends JFrame { } table.setDefaultRenderer(Object.class, new DefaultTableCellRenderer() { + /** + * + */ + private static final long serialVersionUID = 1L; + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, @@ -240,18 +249,21 @@ public class HouseFeaturesGUI extends JFrame { private void jButton_ActionPerformed(ActionEvent arg0) { BookingManager bookingM = new BookingManager(); //RegExp to see if telephone number is correct??TODO - Booking book = null; - try { - if (table.getRowCount()!=0) - book = bookingM.createBooking(rh, rh.offers.get(row).getFirstDay(), rh.offers.get(row).getLastDay(), telIn.getText()); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - if (book != null) { - BookRuralHouseConfirmationWindow confirmWindow = new BookRuralHouseConfirmationWindow( - book); - confirmWindow.setVisible(true); + if (telIn.getText().matches("[976]\\d{2}[.\\- ]?\\d{3}[.\\- ]?\\d{3}")) { + Booking book = null; + try { + if (table.getRowCount()!=0) + book = bookingM.createBooking(rh, rh.offers.get(row).getFirstDay(), rh.offers.get(row).getLastDay(), telIn.getText()); + } catch (Exception e) { + e.printStackTrace(); + } + if (book != null) { + BookRuralHouseConfirmationWindow confirmWindow = new BookRuralHouseConfirmationWindow( + book); + confirmWindow.setVisible(true); + } + } else { + labelPhone.setText("Phone format is wrong"); } } } diff --git a/ruralHouses/src/gui/LoginGUI.java b/ruralHouses/src/gui/LoginGUI.java index db04aff..1e59e89 100644 --- a/ruralHouses/src/gui/LoginGUI.java +++ b/ruralHouses/src/gui/LoginGUI.java @@ -16,10 +16,6 @@ import javax.swing.SwingConstants; import businessLogic.LoginManager; import businessLogic.LoginManagerInterface; import domain.Account; -import domain.Owner; - -import javax.swing.JRadioButton; -import javax.swing.ButtonGroup; public class LoginGUI extends JFrame { @@ -29,7 +25,6 @@ public class LoginGUI extends JFrame { private JPasswordField passwordField; private LoginManagerInterface loginManager = new LoginManager(); private JLabel loginFeedback; - private final ButtonGroup buttonGroup = new ButtonGroup(); public LoginGUI() { super(); initialize(); @@ -86,7 +81,8 @@ public class LoginGUI extends JFrame { private void jButton_ActionPerformed(ActionEvent e){ Account acc = loginManager.checkCredentials(usernameField.getText(),new String(passwordField.getPassword())); - if (acc.getAdmin()) { + if (acc == null) loginFeedback.setText("Incorrect username or password"); + else if( acc.getAdmin()) { this.setVisible(false); Frame a = new AdminMenuGUI(); a.setVisible(true); diff --git a/ruralHouses/src/gui/ModifyHouseGUI.java b/ruralHouses/src/gui/ModifyHouseGUI.java index 106a78b..6d980d1 100644 --- a/ruralHouses/src/gui/ModifyHouseGUI.java +++ b/ruralHouses/src/gui/ModifyHouseGUI.java @@ -5,7 +5,6 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; - import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; import javax.swing.JComboBox; @@ -48,13 +47,14 @@ public class ModifyHouseGUI extends JFrame { private JButton btnConfirm; private JComboBox houseBox; private RuralHouse rh; + private JComboBox comboBox; /** * Create the frame. */ - public ModifyHouseGUI(Owner o) { + public ModifyHouseGUI(final Owner o) { this.distric=Districs.longNames(); - JComboBox comboBox = new JComboBox(new DefaultComboBoxModel( + comboBox = new JComboBox(new DefaultComboBoxModel( this.distric)); this.getContentPane().setLayout(null); owner = o; diff --git a/ruralHouses/src/gui/ModifyOfferGUI.java b/ruralHouses/src/gui/ModifyOfferGUI.java index eb6308f..6f69df6 100644 --- a/ruralHouses/src/gui/ModifyOfferGUI.java +++ b/ruralHouses/src/gui/ModifyOfferGUI.java @@ -30,7 +30,6 @@ import com.toedter.calendar.JCalendar; import domain.Offer; import domain.RuralHouse; import exceptions.BadDates; -import exceptions.OverlappingOfferExists; public class ModifyOfferGUI extends JFrame { diff --git a/ruralHouses/src/gui/QueryAvailabilityGUI2.java b/ruralHouses/src/gui/QueryAvailabilityGUI2.java index 40cfe1c..18555fc 100644 --- a/ruralHouses/src/gui/QueryAvailabilityGUI2.java +++ b/ruralHouses/src/gui/QueryAvailabilityGUI2.java @@ -42,7 +42,7 @@ import domain.RuralHouse; public class QueryAvailabilityGUI2 extends JFrame { private static final long serialVersionUID = 1L; - private JComboBox jComboBox1; + private JComboBox jComboBox1; private JLabel jLabel2 = new JLabel(); private JTextField jTextField1 = new JTextField(); private JLabel jLabel3 = new JLabel(); @@ -99,7 +99,7 @@ public class QueryAvailabilityGUI2 extends JFrame { this.setSize(new Dimension(550, 500)); this.setTitle("Query Availability"); - jComboBox1 = new JComboBox(new DefaultComboBoxModel( + jComboBox1 = new JComboBox(new DefaultComboBoxModel( Districs.longNames())); jComboBox1.setEnabled(false); jComboBox1.setBounds(new Rectangle(115, 30, 115, 20)); diff --git a/ruralHouses/src/gui/RequestDeleteHouseGUI.java b/ruralHouses/src/gui/RequestDeleteHouseGUI.java index 7dd1ee6..3285a89 100644 --- a/ruralHouses/src/gui/RequestDeleteHouseGUI.java +++ b/ruralHouses/src/gui/RequestDeleteHouseGUI.java @@ -5,11 +5,10 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import javax.swing.GroupLayout; -import javax.swing.GroupLayout.Alignment; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JFrame; +import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.border.EmptyBorder; @@ -17,11 +16,13 @@ import javax.swing.border.EmptyBorder; import businessLogic.AdminManager; import domain.Owner; import domain.RuralHouse; -import javax.swing.JLabel; -import javax.swing.LayoutStyle.ComponentPlacement; public class RequestDeleteHouseGUI extends JFrame { + /** + * + */ + private static final long serialVersionUID = 1L; private JPanel contentPane; private Owner owner; private JComboBox comboBox; @@ -45,7 +46,7 @@ public class RequestDeleteHouseGUI extends JFrame { JRadioButton rdbtnIAmSure = new JRadioButton("I am sure"); - rdbtnIAmSure.setBounds(90, 154, 71, 23); + rdbtnIAmSure.setBounds(90, 154, 90, 23); btnDelete = new JButton("REQUEST"); btnDelete.setBounds(90, 213, 90, 23); diff --git a/ruralHouses/src/gui/RequestNewHouseGUI.java b/ruralHouses/src/gui/RequestNewHouseGUI.java index 76f182e..ba4eca9 100644 --- a/ruralHouses/src/gui/RequestNewHouseGUI.java +++ b/ruralHouses/src/gui/RequestNewHouseGUI.java @@ -4,10 +4,11 @@ import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.DefaultComboBoxModel; import javax.swing.GroupLayout; import javax.swing.GroupLayout.Alignment; -import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; +import javax.swing.JComboBox; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; @@ -22,8 +23,6 @@ import domain.HouseFeatures; import domain.Owner; import domain.RuralHouse; -import javax.swing.JComboBox; - public class RequestNewHouseGUI extends JFrame { /** @@ -50,14 +49,14 @@ public class RequestNewHouseGUI extends JFrame { private JTextField baths_f; private JButton btnRegister; private AdminManager am; - private JComboBox comboBox; + private JComboBox comboBox; /** * Create the frame. */ public RequestNewHouseGUI(Owner o) { - JComboBox comboBox = new JComboBox(new DefaultComboBoxModel( + comboBox = new JComboBox(new DefaultComboBoxModel( Districs.longNames())); am = new AdminManager(); this.setTitle("New House"); diff --git a/ruralHouses/src/gui/StartWindow.java b/ruralHouses/src/gui/StartWindow.java index 842b818..600233b 100644 --- a/ruralHouses/src/gui/StartWindow.java +++ b/ruralHouses/src/gui/StartWindow.java @@ -17,9 +17,9 @@ import javax.swing.SwingConstants; import javax.swing.UIManager; import configuration.ConfigXML; -import domain.Administrator; +@SuppressWarnings("deprecation") public class StartWindow extends JFrame { private static final long serialVersionUID = 1L; @@ -48,30 +48,8 @@ public class StartWindow extends JFrame { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); c=configuration.ConfigXML.getInstance(); - if (c.isBusinessLogicLocal()){ - //facadeInterface=new FacadeImplementation(); - } - else { - - final String businessLogicNode = c.getBusinessLogicNode(); - // Remote service name - String serviceName = "/"+c.getServiceRMI(); - // RMI server port number - int portNumber = Integer.parseInt(c.getPortRMI()); - // RMI server host IP IP - /*facadeInterface = (ApplicationFacadeInterface) Naming.lookup("rmi://" - + businessLogicNode + ":" + portNumber + serviceName);*/ - } - - }/* catch (java.rmi.ConnectException e) { - a.lblNewLabel.setText("No business logic: Run BusinessLogicServer first!!"); - a.lblNewLabel.setForeground(Color.RED); - System.out.println("Error in StartWindow: "+e.toString()); - } catch (java.rmi.NotBoundException e) { - a.lblNewLabel.setText("No business logic: Maybe problems running BusinessLogicServer"); - a.lblNewLabel.setForeground(Color.RED); - System.out.println("Error in StartWindow: "+e.toString()); - } */catch (com.db4o.ext.DatabaseFileLockedException e) { + + }catch (com.db4o.ext.DatabaseFileLockedException e) { a.lblNewLabel.setText("Database locked: Do not run BusinessLogicServer or BusinessLogicServer!!"); a.lblNewLabel.setForeground(Color.RED); System.out.println("Error in StartWindow: "+e.toString()); @@ -80,7 +58,6 @@ public class StartWindow extends JFrame { a.lblNewLabel.setForeground(Color.RED); System.out.println("Error in StartWindow: "+e.toString()); } - //a.pack(); diff --git a/ruralHouses/src/gui/listOfAdditionRequestsGUI.java b/ruralHouses/src/gui/listOfAdditionRequestsGUI.java index 2829bc1..8a24d45 100644 --- a/ruralHouses/src/gui/listOfAdditionRequestsGUI.java +++ b/ruralHouses/src/gui/listOfAdditionRequestsGUI.java @@ -24,6 +24,10 @@ import domain.RuralHouse; public class listOfAdditionRequestsGUI extends JFrame { + /** + * + */ + private static final long serialVersionUID = 1L; private JPanel contentPane; private JTable table; private DefaultTableModel tableModel; diff --git a/ruralHouses/src/gui/listOfHousesGUI.java b/ruralHouses/src/gui/listOfHousesGUI.java index 171dbbd..c144ccc 100644 --- a/ruralHouses/src/gui/listOfHousesGUI.java +++ b/ruralHouses/src/gui/listOfHousesGUI.java @@ -19,6 +19,10 @@ import domain.RuralHouse; public class listOfHousesGUI extends JFrame { + /** + * + */ + private static final long serialVersionUID = 1L; private JPanel contentPane; private JTable table; private DefaultTableModel tableModel; diff --git a/ruralHouses/src/gui/listOfRemovalRequestsGUI.java b/ruralHouses/src/gui/listOfRemovalRequestsGUI.java index 07ee348..53cb7e6 100644 --- a/ruralHouses/src/gui/listOfRemovalRequestsGUI.java +++ b/ruralHouses/src/gui/listOfRemovalRequestsGUI.java @@ -24,6 +24,10 @@ import domain.RuralHouse; public class listOfRemovalRequestsGUI extends JFrame { + /** + * + */ + private static final long serialVersionUID = 1L; private JPanel contentPane; private JTable table; private DefaultTableModel tableModel; -- 2.20.1