[client] Moar Swing

11 files changed, 96 insertions, 101 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 9036f588..69800b4c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -147,9 +147,9 @@ public abstract class MainWindow {
 		mainShell.setMinimumSize(new Dimension(850, 650));
 
 		// register all pages of the main window
-		registerPage(new MainMenuWindow(mainShell));
-		registerPage(new ImageListWindow(mainShell));
-		registerPage(new LectureListWindow(mainShell));
+		registerPage(new MainMenuWindow());
+		registerPage(new ImageListWindow());
+		registerPage(new LectureListWindow());
 		// Show main menu by default
 		showPage(MainMenuWindow.class);
 
@@ -193,6 +193,7 @@ public abstract class MainWindow {
 		if (pages.containsKey(clazz))
 			throw new IllegalArgumentException("Page " + clazz.getSimpleName() + " already registered!");
 		pages.put(clazz, window);
+		mainShell.getContentPane().add(window);
 		window.setVisible(false);
 	}
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java
index def223bd..82552980 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java
@@ -16,8 +16,8 @@ public class DisclaimerWindow extends DisclaimerWindowLayout {
 
 	private final static Logger LOGGER = Logger.getLogger(DisclaimerWindow.class);
 
-	public DisclaimerWindow(final Shell mainShell) {
-		super(mainShell);
+	public DisclaimerWindow(boolean modal) {
+		super(modal);
 
 		final DisclaimerWindow me = this;
 		// function for agreement checkbox
@@ -43,4 +43,8 @@ public class DisclaimerWindow extends DisclaimerWindowLayout {
 		return Config.getDisclaimerAgreement() < DISCLAIMER_VERSION;
 	}
 
+	public static void open(boolean modal) {
+		new DisclaimerWindow(modal).setVisible(true);
+	}
+
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
index fd39c942..5756b367 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
@@ -42,11 +42,9 @@ public class ImageListWindow extends ImageListWindowLayout {
 
 	TableRowSorter<ImageTableModel> sorter = new TableRowSorter<ImageTableModel>();
 
-	public ImageListWindow(final Shell mainShell) {
-		super(mainShell);
+	public ImageListWindow() {
+		super();
       
-		SwingUtilities.invokeLater(new Runnable() {
-			public void run() {
 				ImageTableModel itm = new ImageTableModel();
 				sorter.setSortsOnUpdates(true);
 				sorter.setModel(itm);
@@ -96,9 +94,8 @@ public class ImageListWindow extends ImageListWindowLayout {
 				        }
 				    }
 				});
-			}
-		});
-		// filter the objects in the table depending on the search field
+
+				// filter the objects in the table depending on the search field
 		searchTextField.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyReleased(KeyEvent ke) {
@@ -177,21 +174,21 @@ public class ImageListWindow extends ImageListWindowLayout {
 	}
 
 	@Override
-	public boolean hide() {
+	public boolean requestHide() {
 		return true;
 	}
 
 	@Override
-	public void show() {
+	public void requestShow() {
 		refreshList(false);
 	}
 
 	private void deleteCallback(ImageSummaryRead image, Throwable t) {
 		if (t == null) {
-			Gui.showMessageBox(getShell(), "Deleted image with UUID '" + image + "'.", MessageType.INFO,
+			Gui.showMessageBox("Deleted image with UUID '" + image + "'.", MessageType.INFO,
 					LOGGER, t);
 		} else {
-			Gui.showMessageBox(getShell(), "Failed to delete image!", MessageType.ERROR, LOGGER, t);
+			Gui.showMessageBox("Failed to delete image!", MessageType.ERROR, LOGGER, t);
 		}
 	}
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
index 29a65639..e45d9055 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
@@ -30,8 +30,8 @@ public class LectureListWindow extends LectureListWindowLayout {
 
 	public final LectureListWindow me = this;
 
-	public LectureListWindow(final Shell mainShell) {
-		super(mainShell);
+	public LectureListWindow() {
+		super();
 
 		// Comparator for column sorting
 		LectureListComparator comparator = new LectureListComparator();
@@ -120,12 +120,12 @@ public class LectureListWindow extends LectureListWindowLayout {
 	}
 
 	@Override
-	public boolean hide() {
+	public boolean requestHide() {
 		return true;
 	}
 
 	@Override
-	public void show() {
+	public void requestShow() {
 		refreshList();
 	}
 
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 0f3914f9..ca9dc670 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
@@ -1,16 +1,12 @@
 package org.openslx.dozmod.gui.window;
 
+import java.awt.Button;
+import java.awt.Image;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URL;
 
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Shell;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
 import org.openslx.dozmod.gui.window.layout.MainMenuWindowLayout;
@@ -21,8 +17,8 @@ import com.google.gson.Gson;
 
 public class MainMenuWindow extends MainMenuWindowLayout {
 
-	public MainMenuWindow(Shell mainShell) {
-		super(mainShell);
+	public MainMenuWindow() {
+		super();
 		// function for vmButton
 		vmButton.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -41,7 +37,7 @@ public class MainMenuWindow extends MainMenuWindowLayout {
 	}
 
 	@Override
-	public boolean hide() {
+	public boolean requestHide() {
 		return true;
 	}
 
@@ -86,7 +82,7 @@ public class MainMenuWindow extends MainMenuWindowLayout {
 	// Stuff end
 
 	@Override
-	public void show() {
+	public void requestShow() {
 		// All stuff is stuff
 		if (once)
 			return;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
index b0e443a7..dc2f3bcb 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
@@ -11,8 +11,8 @@ public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout {
 
 	private final static Logger LOGGER = Logger.getLogger(VirtualizerNoticeWindow.class);
 
-	public VirtualizerNoticeWindow(final Shell mainShell) {
-		super(mainShell);
+	public VirtualizerNoticeWindow(boolean modal) {
+		super(modal);
 
 		final VirtualizerNoticeWindow me = this;
 
@@ -51,4 +51,8 @@ public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout {
 
 	}
 
+	public static void open(boolean modal) {
+		new VirtualizerNoticeWindow(modal).setVisible(true);
+	}
+
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
index 0f17451d..382fb091 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
@@ -1,16 +1,14 @@
 package org.openslx.dozmod.gui.window.layout;
 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-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 java.awt.Composite;
+import java.awt.GridLayout;
 
-public abstract class DisclaimerWindowLayout extends Composite {
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+
+public abstract class DisclaimerWindowLayout extends JDialog {
 
 	protected String notice = "Bitte lesen und bestätigen Sie folgende rechtliche Hinweise";
 	protected String disclaimer = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \n\n"
@@ -27,34 +25,30 @@ public abstract class DisclaimerWindowLayout extends Composite {
 
 	protected String checkboxText = "Ja, ich aktzeptiere die Vereinbarung. Benachrichtigung nicht mehr anzeigen.";
 
-	protected String title = "bwLehrpool Suite";
-	protected String noticeLabel = "Hinweis";
-	protected String continueButtonLabel = "Weiter";
+	private static String title = "bwLehrpool Suite";
+	private static String noticeLabel = "Hinweis";
+	private static String continueButtonLabel = "Weiter";
 
 	// Buttons
-	protected Button agreeBox;
-	protected Button continueButton;
-
-	public DisclaimerWindowLayout(final Shell mainShell) {
-		super(mainShell, SWT.NONE);
-
-		mainShell.setText(title);
+	protected JButton agreeBox;
+	protected JButton continueButton;
 
-		// layout for the disclaimer composite
-		this.setLayout(new GridLayout(1, true));
+	public DisclaimerWindowLayout(boolean modal) {
+		super(null, title, modal ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS);
+		this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
 
 		// information before the disclaimer
 		// the group
-		Group noticeGroup = new Group(this, SWT.NONE);
+		JGroup noticeGroup = new JGroup(this, SWT.NONE);
 		noticeGroup.setLayout(new GridLayout());
 		noticeGroup.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		noticeGroup.setText(noticeLabel);
 		// text inside the group
-		Label noticeLabel = new Label(noticeGroup, SWT.NONE);
+		JLabel noticeLabel = new JLabel(noticeGroup, SWT.NONE);
 		noticeLabel.setText(notice);
 
 		// the disclaimer text box with scrolling functionality
-		Text disclaimerText = new Text(this, SWT.READ_ONLY | SWT.WRAP | SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
+		JText disclaimerText = new JText(this, SWT.READ_ONLY | SWT.WRAP | SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 		GridData disclaimerLayoutData = new GridData(GridData.FILL, GridData.FILL, true, true);
 		disclaimerLayoutData.widthHint = 900;
 		disclaimerLayoutData.heightHint = 600;
@@ -65,11 +59,11 @@ public abstract class DisclaimerWindowLayout extends Composite {
 		Composite checkboxComposite = new Composite(this, SWT.BORDER);
 		checkboxComposite.setLayout(new GridLayout());
 		checkboxComposite.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		agreeBox = new Button(checkboxComposite, SWT.CHECK);
+		agreeBox = new JButton(checkboxComposite, SWT.CHECK);
 		agreeBox.setText(checkboxText);
 
 		// the continue button
-		continueButton = new Button(this, SWT.PUSH);
+		continueButton = new JButton(this, SWT.PUSH);
 		continueButton.setText(continueButtonLabel);
 		continueButton.setEnabled(false);
 		continueButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, true, false));
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 bad50d23..c817a9fb 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
@@ -2,6 +2,7 @@ package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.BorderLayout;
 import java.awt.Frame;
+import java.awt.GridBagLayout;
 
 import javax.swing.JPanel;
 import javax.swing.JRootPane;
@@ -66,8 +67,8 @@ public abstract class ImageListWindowLayout extends CompositePage {
 
 	protected String infoTextString = "Hier können Sie Virtuelle Maschinen hochladen, herunterladen, bearbeiten und löschen.";
 
-	public ImageListWindowLayout(final Composite mainShell) {
-		super(mainShell, SWT.NONE);
+	public ImageListWindowLayout() {
+		super(new GridBagLayout());
 
 		// the layout and layoutData of the ImageListWindow
 		this.setLayout(new GridLayout(2, false));
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
index ea1ecdac..eea13ceb 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
@@ -1,5 +1,7 @@
 package org.openslx.dozmod.gui.window.layout;
 
+import java.awt.GridBagLayout;
+
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -55,8 +57,8 @@ public abstract class LectureListWindowLayout extends CompositePage {
 
 	protected String infoTextString = "Hier können Sie Veranstaltungen anlegen, bearbeiten und löschen.";
 
-	public LectureListWindowLayout(final Composite mainShell) {
-		super(mainShell, SWT.NONE);
+	public LectureListWindowLayout() {
+		super(new GridBagLayout());
 
 		// the layout and layoutData of the LectureListWindow
 		this.setLayout(new GridLayout(2, false));
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
index 92708cad..379f3e12 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
@@ -1,12 +1,13 @@
 package org.openslx.dozmod.gui.window.layout;
 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
+import java.awt.Button;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.Label;
+import java.security.acl.Group;
+
+import javax.swing.JButton;
+
 import org.openslx.dozmod.gui.helper.CompositePage;
 
 /*
@@ -43,11 +44,11 @@ public abstract class MainMenuWindowLayout extends CompositePage {
 	protected String lecturesInfo = "Infotext Veranstaltungen.";
 
 	// buttons
-	protected Button vmButton;
-	protected Button lecturesButton;
+	protected JButton vmButton;
+	protected JButton lecturesButton;
 
-	public MainMenuWindowLayout(final Shell mainShell) {
-		super(mainShell, SWT.NONE);
+	public MainMenuWindowLayout() {
+		super(new FlowLayout());
 
 		this.setLayout(new GridLayout(2, true));
 
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 dab012d3..ab1d9327 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
@@ -1,36 +1,31 @@
 package org.openslx.dozmod.gui.window.layout;
 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-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 java.awt.Button;
+import java.awt.Composite;
+import java.awt.GridLayout;
+import java.awt.Label;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+
 import org.openslx.dozmod.gui.Gui;
 
-public abstract class VirtualizerNoticeWindowLayout extends Composite {
-	private final String title = "Hinweis VMWare Player";
-	private final String infoText = "Für die Arbeit mit der bwLehrpool Suite wird zwingend ein VMWare Player benötigt. "
+public abstract class VirtualizerNoticeWindowLayout extends JDialog {
+	private static final String title = "Hinweis VMWare Player";
+	private static final String infoText = "Für die Arbeit mit der bwLehrpool Suite wird zwingend ein VMWare Player benötigt. "
 			+ "Diesen können Sie sich unter folgendem Link kostenfrei downloaden. "
 			+ "Wenn Sie bereits den VMWare Player oder die VMWare Workstation installiert haben, können Sie diesen Hinweis ignorieren.";
 
 	private final String infoTitle = "bwLehrpool Suite";
 
-	protected Button windowsDLButton;
-	protected Button linuxDLButton;
-	protected Button readCheck;
-	protected Button continueButton;
-
-	public VirtualizerNoticeWindowLayout(final Shell mainShell) {
-		super(mainShell, SWT.NONE);
+	protected JButton windowsDLButton;
+	protected JButton linuxDLButton;
+	protected JButton readCheck;
+	protected JButton continueButton;
 
-		// set the title of the bar.
-		mainShell.setText(title);
+	public VirtualizerNoticeWindowLayout(boolean modal) {
+		super(null, title, modal ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS);
 
 		// layout for this composite
 		this.setLayout(new GridLayout(1, false));
@@ -39,14 +34,14 @@ public abstract class VirtualizerNoticeWindowLayout extends Composite {
 		this.setLayoutData(gd);
 
 		// bold title at start.
-		Label titleLabel = new Label(this, SWT.NONE);
+		JLabel titleLabel = new JLabel(this, SWT.NONE);
 		titleLabel.setText(infoTitle);
-		FontData fontData = titleLabel.getFont().getFontData()[0];
-		final Font font = new Font(Gui.display, new FontData(fontData.getName(), fontData.getHeight(), SWT.BOLD));
+		JFontData fontData = titleLabel.getFont().getFontData()[0];
+		final JFont font = new JFont(Gui.display, new FontData(fontData.getName(), fontData.getHeight(), SWT.BOLD));
 		titleLabel.setFont(font);
 
 		// infotext
-		Label infoLabel = new Label(this, SWT.NONE | SWT.WRAP);
+		JLabel infoLabel = new JLabel(this, SWT.NONE | SWT.WRAP);
 		infoLabel.setText(infoText);
 		infoLabel.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));