[client] Add image details window

1 files changed, 13 insertions, 5 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 e048a135..bcf2b738 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -80,8 +80,10 @@ public abstract class MainWindow {
 	 * @param modal modal mode - other windows will be blocked until this popup
 	 *            is closed
 	 * @param noclose don't allow closing the popup via the (X) in the title bar
+	 * @return The composite that is opened as a popup, or <code>null</code> on
+	 *         error
 	 */
-	public static void openPopup(Class<? extends Composite> clazz, boolean modal, boolean noclose) {
+	public static <T extends Composite> T openPopup(Class<T> clazz, boolean modal, boolean noclose) {
 		int style = SWT.TITLE | SWT.BORDER | SWT.RESIZE;
 		if (modal)
 			style |= SWT.APPLICATION_MODAL;
@@ -90,14 +92,14 @@ public abstract class MainWindow {
 		Shell dialogShell = Gui.newShell(mainShell, style);
 		// populate dialogShell
 		dialogShell.setLayout(new GridLayout(1, false));
-		Constructor<?> con = null;
+		final T comp;
 		try {
-			con = clazz.getConstructor(Shell.class);
-			con.newInstance(dialogShell);
+			Constructor<T> con = clazz.getConstructor(Shell.class);
+			comp = con.newInstance(dialogShell);
 		} catch (Exception e1) {
 			Gui.showMessageBox(mainShell, "Cannot show popup " + clazz.getName(), MessageType.DEBUG, LOGGER,
 					e1);
-			return;
+			return null;
 		}
 
 		if (noclose) {
@@ -114,7 +116,13 @@ public abstract class MainWindow {
 		dialogShell.layout();
 		dialogShell.pack();
 		Gui.limitShellSize(dialogShell);
+		Gui.centerShellOverShell(mainShell, dialogShell);
 		dialogShell.open();
+		return comp;
+	}
+
+	public static void centerShell(Shell shell) {
+		Gui.centerShellOverShell(mainShell, shell);
 	}
 
 	/**