[client] renamed addContent to setContent in MainWindow

removed unneeded removeContent() function - this is now done in setContent

4 files changed, 11 insertions, 17 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
index 505c9a37..b940e18c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
@@ -113,7 +113,7 @@ public class App {
 			LOGGER.error("IOException when trying to initialise the proxy, see trace: ", e);
 		}
 
-		// start the GUI
+		// start the main window
 		MainWindow.initialise();
 
 	}
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 e5d86e31..1a497ffc 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
@@ -313,7 +313,7 @@ public class LoginWindow extends LoginWindowLayout {
 		// TODO HACK HACK
 		ThriftManager.setSatelliteAddress("132.230.8.113");
 
-		MainWindow.addContent(new MainMenuWindow(getShell()));
+		MainWindow.setContent(new MainMenuWindow(getShell()));
 		// now read the config to see if the user already agreed to the disclaimer
 		if (!Config.getDisclaimerAgreement())
 			MainWindow.openPopup(DisclaimerWindow.class, true);
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 4c022f3e..1bf305ec 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
@@ -14,7 +14,7 @@ public class MainMenuWindow extends MainMenuWindowLayout {
 		vmButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				MainWindow.addContent(new ImageListWindow(getShell()));
+				MainWindow.setContent(new ImageListWindow(getShell()));
 			}
 		});
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainWindow.java
index 43156049..75b37475 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainWindow.java
@@ -37,8 +37,11 @@ public abstract class MainWindow {
 	 * 
 	 * @param The composite to add, should be a GUI
 	 */
-	public static void addContent(Composite contentComposite) {
-		removeContent();
+	public static void setContent(Composite contentComposite) {
+
+		if (contentComposite == null) return;
+		if (MainWindow.contentComposite != null)
+			MainWindow.contentComposite.dispose();
 
 		MainWindow.contentComposite = contentComposite;
 
@@ -49,20 +52,11 @@ public abstract class MainWindow {
 		contentComposite.setLayoutData(gridData);
 		mainShell.setMinimumSize(850, 650);
 		mainShell.layout();
-
-	}
-
-	/**
-	 * Remove the current content of the main shell
-	 */
-	private static void removeContent() {
-		if (contentComposite != null) {
-			MainWindow.contentComposite.dispose();
-		}
 	}
 
 	/**
-	 * @param clazz Class to open as a popup over the main window
+	 * @param clazz Class to open as a popup over the main window.
+	 * 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);
@@ -150,7 +144,7 @@ public abstract class MainWindow {
 		mainShell.setLayout(new GridLayout(1, true));
 
 		// Add LoginWindow as the first window to be shown
-		addContent(new LoginWindow(mainShell));
+		setContent(new LoginWindow(mainShell));
 
 		// center the window on the primary monitor
 		Monitor primary = display.getPrimaryMonitor();