Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1

8 files changed, 63 insertions, 63 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
index b940e18c..37e93434 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
@@ -11,7 +11,7 @@ import org.apache.log4j.FileAppender;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.spi.LoggingEvent;
-import org.openslx.dozmod.gui.window.MainWindow;
+import org.openslx.dozmod.gui.MainWindow;
 import org.openslx.dozmod.util.ProxyConfigurator;
 import org.openslx.thrifthelper.ThriftManager;
 
@@ -114,7 +114,7 @@ public class App {
 		}
 
 		// start the main window
-		MainWindow.initialise();
+		MainWindow.mainloop();
 
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index 3f16211a..72b19293 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -1,4 +1,4 @@
-package org.openslx.dozmod.gui.window;
+package org.openslx.dozmod.gui;
 
 import java.lang.reflect.Constructor;
 
@@ -19,6 +19,10 @@ import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Monitor;
 import org.eclipse.swt.widgets.Shell;
 import org.openslx.dozmod.gui.helper.MessageType;
+import org.openslx.dozmod.gui.window.DisclaimerWindow;
+import org.openslx.dozmod.gui.window.LoginWindow;
+import org.openslx.dozmod.gui.window.MainMenuWindow;
+import org.openslx.dozmod.gui.window.VirtualizerNoticeWindow;
 import org.openslx.dozmod.thrift.Session;
 import org.openslx.thrifthelper.ThriftManager;
 import org.openslx.thrifthelper.ThriftManager.ErrorCallback;
@@ -27,9 +31,9 @@ public abstract class MainWindow {
 
 	private final static Logger LOGGER = Logger.getLogger(MainWindow.class);
 
-	private static Shell mainShell;
+	private static final Shell mainShell;
 	private static Composite contentComposite;
-	private static Display display;
+	private static final Display display;
 
 	private static final String THRIFT_CONNECTION_ERROR = "Lost connection to the masterserver. Do you want to retry?";
 
@@ -47,11 +51,7 @@ public abstract class MainWindow {
 		MainWindow.contentComposite = contentComposite;
 
 		// sets the starting preferred size.
-		GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
-		gridData.widthHint = 800;
-		gridData.heightHint = 600;
-		contentComposite.setLayoutData(gridData);
-		mainShell.setMinimumSize(850, 650);
+		contentComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
 		mainShell.layout();
 	}
 
@@ -60,7 +60,7 @@ public abstract class MainWindow {
 	 * MUST be a subclass of Composite.
 	 */
 	public static void openPopup(Class<? extends Composite> clazz, boolean modal) {
-		Shell dialogShell = new Shell(mainShell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
+		Shell dialogShell = new Shell(mainShell, SWT.DIALOG_TRIM | (modal ? SWT.APPLICATION_MODAL : 0));
 		// populate dialogShell
 		dialogShell.setLayout(new GridLayout(1, false));
 		LOGGER.debug(clazz.getDeclaredClasses());
@@ -76,13 +76,6 @@ public abstract class MainWindow {
 		dialogShell.layout();
 		dialogShell.pack();
 		dialogShell.open();
-		if (modal) {
-			while (!dialogShell.isDisposed()) {
-				if (!display.readAndDispatch()) {
-					display.sleep();
-				}
-			}
-		}
 	}
 
 	/**
@@ -91,15 +84,9 @@ public abstract class MainWindow {
 	public static Display getDisplay() {
 		return display;
 	}
-
-	/**
-	 * Initialises the GUI by creating the main window, adding the menu and
-	 * creating the login mask as the first content window.
-	 * Further sets up the global thrift error callback to catch any
-	 * connection errors during the communication with the servers.
-	 */
-	public static void initialise() {
-		// init SWT stuffs
+	
+	static {
+		// init SWT stuff
 		display = new Display();
 		mainShell = new Shell(display, SWT.SHELL_TRIM | SWT.CENTER);
 
@@ -122,6 +109,49 @@ public abstract class MainWindow {
 			}
 		});
 
+		createMenu();
+
+		mainShell.setText("bwSuite");
+
+		// Set layout for the mainshell, items added to the shell should get a gridData
+		mainShell.setLayout(new GridLayout(1, true));
+		mainShell.setMinimumSize(850, 650);
+
+		// always show the main menu
+		setContent(new MainMenuWindow(mainShell));
+
+		// center the window on the primary monitor
+		Monitor primary = display.getPrimaryMonitor();
+		Rectangle bounds = primary.getBounds();
+		Rectangle rect = mainShell.getBounds();
+
+		int x = bounds.x + (bounds.width - rect.width) / 2;
+		int y = bounds.y + (bounds.height - rect.height) / 2;
+
+		mainShell.setLocation(x, y);
+		mainShell.open();
+
+		// here we can check for Session information
+		if (Session.getSatelliteToken() == null) {
+			// User did not login, show the login mask
+			openPopup(LoginWindow.class, true);
+		}
+	}
+
+	/**
+	 * Initialises the GUI by creating the main window, adding the menu and
+	 * creating the login mask as the first content window.
+	 * Further sets up the global thrift error callback to catch any
+	 * connection errors during the communication with the servers.
+	 */
+	public static void mainloop() {
+		while (!mainShell.isDisposed()) {
+			if (!display.readAndDispatch())
+				display.sleep();
+		}
+	}
+
+	private static void createMenu() {
 		// the File menu button
 		Menu menuBar = new Menu(mainShell, SWT.BAR);
 		MenuItem cascadeFileMenu = new MenuItem(menuBar, SWT.CASCADE);
@@ -163,39 +193,7 @@ public abstract class MainWindow {
 				MainWindow.openPopup(VirtualizerNoticeWindow.class, false);
 			}
 		});
-
-		mainShell.setText("bwSuite");
 		mainShell.setMenuBar(menuBar);
-
-		// Set layout for the mainshell, items added to the shell should get a gridData
-		mainShell.setLayout(new GridLayout(1, true));
-
-		// always show the main menu
-		setContent(new MainMenuWindow(mainShell));
-
-		// center the window on the primary monitor
-		Monitor primary = display.getPrimaryMonitor();
-		Rectangle bounds = primary.getBounds();
-		Rectangle rect = mainShell.getBounds();
-
-		int x = bounds.x + (bounds.width - rect.width) / 2;
-		int y = bounds.y + (bounds.height - rect.height) / 2;
-
-		mainShell.setLocation(x, y);
-
-		mainShell.pack();
-		mainShell.open();
-
-		// here we can check for Session information
-		if (Session.getSatelliteToken() == null) {
-			// User did not login, show the login mask
-			openPopup(LoginWindow.class, true);
-		}
-
-		while (!mainShell.isDisposed()) {
-			if (!display.readAndDispatch())
-				display.sleep();
-		}
 	}
 
 	/**
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index 7c57b2c9..d0742616 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -21,6 +21,7 @@ import org.openslx.dozmod.authentication.EcpAuthenticator;
 import org.openslx.dozmod.authentication.ShibbolethEcp;
 import org.openslx.dozmod.authentication.ShibbolethEcp.ReturnCode;
 import org.openslx.dozmod.authentication.TestAccountAuthenticator;
+import org.openslx.dozmod.gui.MainWindow;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.window.layout.LoginWindowLayout;
 import org.openslx.dozmod.thrift.OrganizationCache;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java
index a6337fb8..e1911f24 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java
@@ -3,6 +3,7 @@ package org.openslx.dozmod.gui.window;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Shell;
+import org.openslx.dozmod.gui.MainWindow;
 import org.openslx.dozmod.gui.window.layout.MainMenuWindowLayout;
 
 public class MainMenuWindow extends MainMenuWindowLayout {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
index c9e7c1da..a66d47ff 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
@@ -15,8 +15,8 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
+import org.openslx.dozmod.gui.MainWindow;
 import org.openslx.dozmod.gui.helper.TableHelper;
-import org.openslx.dozmod.gui.window.MainWindow;
 
 public abstract class ImageListWindowLayout extends Composite {
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
index 63ee21c2..d52ca940 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
@@ -12,7 +12,7 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.openslx.dozmod.gui.window.MainWindow;
+import org.openslx.dozmod.gui.MainWindow;
 
 public abstract class LoginWindowLayout extends Composite {
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
index e367d468..0c4c14c8 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
@@ -9,7 +9,7 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-import org.openslx.dozmod.gui.window.MainWindow;
+import org.openslx.dozmod.gui.MainWindow;
 
 public abstract class VirtualizerNoticeWindowLayout extends Composite {
 	private final String title = "Hinweis VMWare Player";
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ResourceLoader.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ResourceLoader.java
index 64a416c8..337cdc9d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ResourceLoader.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ResourceLoader.java
@@ -9,7 +9,7 @@ import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
-import org.openslx.dozmod.gui.window.MainWindow;
+import org.openslx.dozmod.gui.MainWindow;
 
 /**
  * Helper class for loading resources. This should be error safe loaders with a