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

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

diff --git a/ruralHouses/src/gui/AdminMenuGUI.java b/ruralHouses/src/gui/AdminMenuGUI.java
index eef2ba4..24dcb27 100644 (file)
--- a/ruralHouses/src/gui/AdminMenuGUI.java
+++ b/ruralHouses/src/gui/AdminMenuGUI.java
@@ -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;
@@ -29,12 +27,13 @@ public class AdminMenuGUI extends JFrame {
                
                this.setTitle("Administrator Menu");
                this.getContentPane().setLayout(null);
-               setBounds(100, 100, 450, 473);
+               setBounds(100, 100, 450, 500);
                contentPane = new JPanel();
                contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
                setContentPane(contentPane);
                //TODO BOTH BUTTONS ARE TO MODIFY
                JButton btnAdd = new JButton("Add requests");
+               btnAdd.setBounds(120, 67, 164, 81);
                btnAdd.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e) {
                                Frame a = new listOfAdditionRequestsGUI();
@@ -43,6 +42,7 @@ public class AdminMenuGUI extends JFrame {
                });
                
                JButton btnDel = new JButton("Delete Requests");
+               btnDel.setBounds(120, 159, 164, 73);
                btnDel.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e) {
                                Frame a = new listOfRemovalRequestsGUI();
@@ -51,34 +51,26 @@ public class AdminMenuGUI extends JFrame {
                });
                
                JButton btnOwneraddition = new JButton("OwnerAddition");
+               btnOwneraddition.setBounds(120, 243, 164, 73);
                btnOwneraddition.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e) {
                                Frame a = new listOfOwnerAddittionRequests();
                                a.setVisible(true);
                        }
                });
-               GroupLayout gl_contentPane = new GroupLayout(contentPane);
-               gl_contentPane.setHorizontalGroup(
-                       gl_contentPane.createParallelGroup(Alignment.LEADING)
-                               .addGroup(gl_contentPane.createSequentialGroup()
-                                       .addGap(115)
-                                       .addGroup(gl_contentPane.createParallelGroup(Alignment.TRAILING, false)
-                                               .addComponent(btnOwneraddition, Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                               .addComponent(btnDel, Alignment.LEADING, GroupLayout.DEFAULT_SIZE, 164, Short.MAX_VALUE)
-                                               .addComponent(btnAdd, Alignment.LEADING, GroupLayout.DEFAULT_SIZE, 164, Short.MAX_VALUE))
-                                       .addContainerGap(145, Short.MAX_VALUE))
-               );
-               gl_contentPane.setVerticalGroup(
-                       gl_contentPane.createParallelGroup(Alignment.LEADING)
-                               .addGroup(gl_contentPane.createSequentialGroup()
-                                       .addGap(62)
-                                       .addComponent(btnAdd, GroupLayout.PREFERRED_SIZE, 81, GroupLayout.PREFERRED_SIZE)
-                                       .addGap(58)
-                                       .addComponent(btnDel, GroupLayout.PREFERRED_SIZE, 81, GroupLayout.PREFERRED_SIZE)
-                                       .addGap(52)
-                                       .addComponent(btnOwneraddition, GroupLayout.DEFAULT_SIZE, 79, Short.MAX_VALUE)
-                                       .addContainerGap())
-               );
-               contentPane.setLayout(gl_contentPane);
+               contentPane.setLayout(null);
+               contentPane.add(btnOwneraddition);
+               contentPane.add(btnDel);
+               contentPane.add(btnAdd);
+       
+               JButton btnOwnerDeletion = new JButton("Owner Deletion");
+               btnOwnerDeletion.setBounds(120, 331, 164, 73);
+               btnOwnerDeletion.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e) {
+                               Frame a = new DeleteOwnerGUI();
+                               a.setVisible(true);
+                       }
+               });
+               contentPane.add(btnOwnerDeletion);
        }
 }