[client] Layout code cleanup.

1 files changed, 11 insertions, 25 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CustomImagePermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CustomImagePermissionWindowLayout.java
index 76ea4108..8c48a8f1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CustomImagePermissionWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CustomImagePermissionWindowLayout.java
@@ -4,24 +4,17 @@ import java.awt.BorderLayout;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Frame;
-import java.awt.GridBagLayout;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JDialog;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.JTextField;
 
 import org.apache.log4j.Logger;
-import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.dozmod.gui.control.table.ImagePermissionTable;
-import org.openslx.dozmod.gui.control.table.ListTable;
-import org.openslx.dozmod.gui.control.table.UserTable;
-import org.openslx.dozmod.gui.helper.GridPos;
 
 
 @SuppressWarnings("serial")
@@ -45,38 +38,31 @@ public class CustomImagePermissionWindowLayout extends JDialog {
 		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL
 				: ModalityType.MODELESS);
 
-		btnClose = new JButton("Abbrechen");
-		btnSave = new JButton("Änderungen speichern");
+		JPanel tablePane = new JPanel();
+		tablePane.setLayout(new BorderLayout());
+		tablePane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
 		permissionTable = new ImagePermissionTable();
-
-		JPanel listPane = new JPanel();
-		listPane.setLayout(new BoxLayout(listPane, BoxLayout.PAGE_AXIS));
-		listPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-		listPane.add(new JScrollPane(permissionTable));
+		tablePane.add(new JScrollPane(permissionTable), BorderLayout.CENTER);
 		JPanel userButtonPane = new JPanel();
 		btnAddUser = new JButton("Benutzer hinzufügern");
-		btnRemoveUser = new JButton("Benutzer entfernen");
 		userButtonPane.add(btnAddUser);
+		btnRemoveUser = new JButton("Benutzer entfernen");
 		userButtonPane.add(btnRemoveUser);
-		listPane.add(userButtonPane);
+		tablePane.add(userButtonPane, BorderLayout.SOUTH);
 
 		// spaced buttons
 		JPanel buttonPane = new JPanel();
 		buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS));
 		buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
-		buttonPane.add(Box.createHorizontalGlue());
-		buttonPane.add(btnClose);
-		buttonPane.add(Box.createRigidArea(new Dimension(10, 0)));
+		btnSave = new JButton("Änderungen speichern");
 		buttonPane.add(btnSave);
-
-		// filter stuff
-		JPanel filterPanel = new JPanel(new GridBagLayout());
-		filterPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10));
+		buttonPane.add(Box.createGlue());
+		btnClose = new JButton("Abbrechen");
+		buttonPane.add(btnClose);
 
 		// pack it all
 		Container contentPane = getContentPane();
-		contentPane.add(filterPanel, BorderLayout.NORTH);
-		contentPane.add(listPane, BorderLayout.CENTER);
+		contentPane.add(tablePane, BorderLayout.CENTER);
 		contentPane.add(buttonPane, BorderLayout.PAGE_END);
 		setPreferredSize(new Dimension(480, 350));
 		pack();