[client] Fix LocationSelector layout, wrap tree in JScrollPane

1 files changed, 19 insertions, 23 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java
index ec1865f0..de325cb4 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java
@@ -8,13 +8,12 @@ import java.util.HashMap;
 import java.util.List;
 
 import javax.swing.Box;
-import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
 import javax.swing.DefaultListCellRenderer;
-import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
@@ -42,11 +41,8 @@ import org.openslx.util.QuickTimer.Task;
 public class LocationSelector extends JPanel {
 	private final static Logger LOGGER = Logger.getLogger(LocationSelector.class);
 
-	private JLabel lblError = new JLabel();
-	private JRadioButton exclusivelyButton = new JRadioButton(
-			"Veranstaltung ausschließlich in den ausgewählten Räumen anzeigen");
-	private JRadioButton prioritizedButton = new JRadioButton(
-			"Veranstaltung mit höherer Priorität in den ausgewählten Räumen anzeigen");
+	private final JRadioButton exclusivelyButton;
+	private final JRadioButton prioritizedButton;
 
 	/**
 	 * Flag for the initialization state
@@ -58,7 +54,7 @@ public class LocationSelector extends JPanel {
 	 * initializing
 	 */
 	private List<Integer> preselection;
-	private JCheckBoxTree locationTree = new JCheckBoxTree();;
+	private JCheckBoxTree locationTree = new JCheckBoxTree();
 	private HashMap<Integer, DefaultMutableTreeNode> locationNodesMap = new HashMap<Integer, DefaultMutableTreeNode>();
 
 	/**
@@ -66,27 +62,27 @@ public class LocationSelector extends JPanel {
 	 * initializes the data
 	 */
 	public LocationSelector() {
-
-		// build the grid
-		GridManager grid = new GridManager(this, 3);
-		grid.add(locationTree, 3).fill(true, true).expand(true, true);
-		grid.nextRow();
-
+		exclusivelyButton = new JRadioButton(
+				"Veranstaltung ausschließlich in den ausgewählten Räumen anzeigen");
+		prioritizedButton = new JRadioButton(
+				"Veranstaltung mit höherer Priorität in den ausgewählten Räumen anzeigen");
 		prioritizedButton.setSelected(true);
+
 		ButtonGroup group = new ButtonGroup();
 		group.add(exclusivelyButton);
 		group.add(prioritizedButton);
-		JPanel radioPanel = new JPanel();
-		radioPanel.setLayout(new BoxLayout(radioPanel, BoxLayout.PAGE_AXIS));
-		radioPanel.add(exclusivelyButton);
-		radioPanel.add(prioritizedButton);
-		grid.add(radioPanel, 3);
+
+		// build the grid
+		GridManager grid = new GridManager(this, 1);
+		grid.add(new JScrollPane(locationTree)).fill(true, true).expand(true, true);
 		grid.nextRow();
-		grid.add(Box.createVerticalGlue(), 3);
+		grid.add(exclusivelyButton);
 		grid.nextRow();
-		grid.add(lblError, 3);
+		grid.add(prioritizedButton);
 		grid.nextRow();
-		grid.finish(true);
+		grid.add(Box.createVerticalGlue());
+		grid.nextRow();
+		grid.finish(false);
 
 		// initialise the data
 		init();
@@ -239,7 +235,7 @@ public class LocationSelector extends JPanel {
 		Collections.sort(idList);
 		return idList;
 	}
-	
+
 	public void collapseFullySelectedNodes() {
 		locationTree.collapseFullySelectedNodes();
 	}