[client] Fix message boxes with yes/no option

2 files changed, 11 insertions, 4 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java
index 34a10ea1..675ddf64 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java
@@ -129,7 +129,8 @@ public class Gui {
 	}
 
 	/**
-	 * Get the {@link GraphicsDevice} which most of the given rectangle overlaps.
+	 * Get the {@link GraphicsDevice} which most of the given rectangle
+	 * overlaps.
 	 * 
 	 * @param rect The rectangle to check
 	 * @param defaultToPrimary if no monitor matches the check, return the
@@ -257,8 +258,9 @@ public class Gui {
 			JOptionPane.showMessageDialog(null, message, messageType.title, messageType.optionPaneId);
 			return true;
 		}
-		int ret = JOptionPane.showConfirmDialog(null, message, messageType.title, messageType.optionPaneId,
-				messageType.buttons);
+		int ret = JOptionPane.showConfirmDialog(null, message, messageType.title, messageType.buttons
+				,
+				messageType.optionPaneId);
 		return ret == JOptionPane.OK_OPTION || ret == JOptionPane.YES_OPTION;
 	}
 
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 8b11d4d2..820f5b21 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -209,6 +209,8 @@ public abstract class MainWindow {
 		menuBar.add(cascadeFileMenu);
 
 		JMenuItem exitItem = new JMenuItem("&Exit");
+		cascadeFileMenu.add(exitItem);
+		
 		exitItem.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
@@ -221,6 +223,10 @@ public abstract class MainWindow {
 		menuBar.add(cascadeAboutMenu);
 
 		JMenuItem disclaimerItem = new JMenuItem("&Disclaimer");
+		JMenuItem virtualizerNoticeItem = new JMenuItem("&Virtualizer");
+		cascadeAboutMenu.add(disclaimerItem);
+		cascadeAboutMenu.add(virtualizerNoticeItem);
+		
 		disclaimerItem.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
@@ -228,7 +234,6 @@ public abstract class MainWindow {
 			}
 		});
 
-		JMenuItem virtualizerNoticeItem = new JMenuItem("&Virtualizer");
 		virtualizerNoticeItem.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {