[client] bwKrischan

1 files changed, 18 insertions, 16 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index 859ae870..8b11d4d2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -1,5 +1,6 @@
 package org.openslx.dozmod.gui;
 
+import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.KeyEventDispatcher;
 import java.awt.KeyboardFocusManager;
@@ -17,6 +18,7 @@ import javax.swing.JFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
+import javax.swing.JPanel;
 
 import org.apache.log4j.Logger;
 import org.openslx.dozmod.App;
@@ -25,8 +27,6 @@ import org.openslx.dozmod.gui.Gui.GuiCallable;
 import org.openslx.dozmod.gui.helper.CompositePage;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.window.DisclaimerWindow;
-import org.openslx.dozmod.gui.window.ImageListWindow;
-import org.openslx.dozmod.gui.window.LectureListWindow;
 import org.openslx.dozmod.gui.window.LoginWindow;
 import org.openslx.dozmod.gui.window.MainMenuWindow;
 import org.openslx.dozmod.gui.window.VirtualizerNoticeWindow;
@@ -39,7 +39,8 @@ public abstract class MainWindow {
 
 	private final static Logger LOGGER = Logger.getLogger(MainWindow.class);
 
-	private static final JFrame mainShell = new JFrame("bwLehrstuhl");
+	private static final JFrame mainWindow = new JFrame("bwLehrstuhl");
+	private static final JPanel mainContainer = new JPanel();
 
 	private static CompositePage currentPage;
 
@@ -71,11 +72,11 @@ public abstract class MainWindow {
 		// sets the starting preferred size.
 		currentPage.requestShow();
 		currentPage.setVisible(true);
-		mainShell.validate();
+		mainWindow.validate();
 	}
 
 	public static void centerShell(Window shell) {
-		Gui.centerShellOverShell(mainShell, shell);
+		Gui.centerShellOverShell(mainWindow, shell);
 	}
 
 	/**
@@ -87,10 +88,10 @@ public abstract class MainWindow {
 
 	public static void open() {
 		// init SWT stuff
-		mainShell.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+		mainWindow.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
 		// Catch the close button (X)
-		mainShell.addWindowListener(new WindowAdapter() {
+		mainWindow.addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent e) {
 				MainWindow.askApplicationQuit();
@@ -144,20 +145,21 @@ public abstract class MainWindow {
 		createMenu();
 
 		// Set layout for the mainshell, items added to the shell should get a gridData
-		mainShell.setLayout(new BoxLayout(mainShell, BoxLayout.PAGE_AXIS));
-		mainShell.setMinimumSize(new Dimension(850, 650));
+		mainContainer.setLayout(new BoxLayout(mainContainer, BoxLayout.PAGE_AXIS));
+		mainWindow.setMinimumSize(new Dimension(850, 650));
 
 		// register all pages of the main window
 		registerPage(new MainMenuWindow());
-		registerPage(new ImageListWindow());
-		registerPage(new LectureListWindow());
+		//registerPage(new ImageListWindow());
+		//registerPage(new LectureListWindow());
 		// Show main menu by default
 		showPage(MainMenuWindow.class);
 
 		// center the window on the primary monitor
-		mainShell.setVisible(true);
-		Gui.centerShell(mainShell);
-		Gui.limitShellSize(mainShell);
+		mainWindow.getContentPane().add(mainContainer, BorderLayout.CENTER);
+		mainWindow.setVisible(true);
+		Gui.centerShell(mainWindow);
+		Gui.limitShellSize(mainWindow);
 
 		// here we can check for Session information
 		if (Session.getSatelliteToken() != null) {
@@ -194,14 +196,14 @@ public abstract class MainWindow {
 		if (pages.containsKey(clazz))
 			throw new IllegalArgumentException("Page " + clazz.getSimpleName() + " already registered!");
 		pages.put(clazz, window);
-		mainShell.getContentPane().add(window);
+		mainContainer.add(window);
 		window.setVisible(false);
 	}
 
 	private static void createMenu() {
 		// the File menu button
 		JMenuBar menuBar = new JMenuBar();
-		mainShell.setJMenuBar(menuBar);
+		mainWindow.setJMenuBar(menuBar);
 		
 		JMenu cascadeFileMenu = new JMenu("&File");
 		menuBar.add(cascadeFileMenu);