Debbugin continues...

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

diff --git a/ruralHouses/src/gui/RequestDeleteHouseGUI.java b/ruralHouses/src/gui/RequestDeleteHouseGUI.java
index ce4fe96..7dd1ee6 100644 (file)
--- a/ruralHouses/src/gui/RequestDeleteHouseGUI.java
+++ b/ruralHouses/src/gui/RequestDeleteHouseGUI.java
@@ -17,14 +17,17 @@ 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 JPanel contentPane;
        private Owner owner;
-       private JComboBox comboBox;
+       private JComboBox<RuralHouse> comboBox;
        private JButton btnDelete;
        private AdminManager am;
+       JLabel feedback = new JLabel("");
 
        /**
         * Create the frame.
@@ -37,12 +40,15 @@ public class RequestDeleteHouseGUI extends JFrame {
                contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
                setContentPane(contentPane);
        
-               comboBox = new JComboBox(this.owner.getRuralHouses());
+               comboBox = new JComboBox<RuralHouse>(this.owner.getRuralHouses());
+               comboBox.setBounds(75, 55, 332, 20);
                
 
                JRadioButton rdbtnIAmSure = new JRadioButton("I am sure");
+               rdbtnIAmSure.setBounds(90, 154, 71, 23);
                
                btnDelete = new JButton("REQUEST");
+               btnDelete.setBounds(90, 213, 90, 23);
                btnDelete.setEnabled(false);
                
                rdbtnIAmSure.addItemListener(new ItemListener() {
@@ -58,34 +64,12 @@ public class RequestDeleteHouseGUI extends JFrame {
                                }
                        }
                });
-               
-               GroupLayout gl_contentPane = new GroupLayout(contentPane);
-               gl_contentPane.setHorizontalGroup(
-                       gl_contentPane.createParallelGroup(Alignment.LEADING)
-                               .addGroup(gl_contentPane.createSequentialGroup()
-                                       .addGroup(gl_contentPane.createParallelGroup(Alignment.LEADING)
-                                               .addGroup(gl_contentPane.createSequentialGroup()
-                                                       .addGap(70)
-                                                       .addComponent(comboBox, GroupLayout.PREFERRED_SIZE, 332, GroupLayout.PREFERRED_SIZE))
-                                               .addGroup(gl_contentPane.createSequentialGroup()
-                                                       .addGap(85)
-                                                       .addGroup(gl_contentPane.createParallelGroup(Alignment.TRAILING)
-                                                               .addComponent(btnDelete)
-                                                               .addComponent(rdbtnIAmSure))))
-                                       .addContainerGap(954, Short.MAX_VALUE))
-               );
-               gl_contentPane.setVerticalGroup(
-                       gl_contentPane.createParallelGroup(Alignment.LEADING)
-                               .addGroup(gl_contentPane.createSequentialGroup()
-                                       .addGap(50)
-                                       .addComponent(comboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                                       .addGap(68)
-                                       .addComponent(rdbtnIAmSure)
-                                       .addGap(47)
-                                       .addComponent(btnDelete)
-                                       .addContainerGap(493, Short.MAX_VALUE))
-               );
-               contentPane.setLayout(gl_contentPane);
+               contentPane.setLayout(null);
+               contentPane.add(comboBox);
+               contentPane.add(rdbtnIAmSure);
+               contentPane.add(btnDelete);
+               feedback.setBounds(90, 184, 274, 18);
+               contentPane.add(feedback);
                
                btnDelete.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent arg0) {
@@ -100,6 +84,11 @@ public class RequestDeleteHouseGUI extends JFrame {
        private void actionListenerButton(ActionEvent e){
                RuralHouse toDel = (RuralHouse)comboBox.getSelectedItem();
                
-               am.addDeletionRequest(toDel);
+               if(am.addDeletionRequest(toDel)){
+                       feedback.setText("Delete request sended");
+                       
+               }else{
+                       feedback.setText("Request cannot be sended(Already sended)");
+               }
        }
 }