From b69608a0d947ec1de15138a670939417c977775f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 21 Jun 2011 05:20:56 +0200
Subject: Fixed quit warning in network mode

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@543 72836036-5685-4462-b002-a69064685172
---
 src/jrummikub/view/IView.java     |  7 -------
 src/jrummikub/view/impl/View.java | 12 +++---------
 2 files changed, 3 insertions(+), 16 deletions(-)

(limited to 'src/jrummikub/view')

diff --git a/src/jrummikub/view/IView.java b/src/jrummikub/view/IView.java
index b6c7163..5ef7060 100644
--- a/src/jrummikub/view/IView.java
+++ b/src/jrummikub/view/IView.java
@@ -155,13 +155,6 @@ public interface IView {
 	 */
 	public IEvent getMenuNewGameEvent();
 
-	/**
-	 * The menu quit event is emitted when the user selects the quit menu entry
-	 * 
-	 * @return the event
-	 */
-	public IEvent getMenuQuitEvent();
-
 	/**
 	 * The load event is emitted when the user wants to load a previously saved
 	 * game state
diff --git a/src/jrummikub/view/impl/View.java b/src/jrummikub/view/impl/View.java
index 06795aa..9a0bf9e 100644
--- a/src/jrummikub/view/impl/View.java
+++ b/src/jrummikub/view/impl/View.java
@@ -79,7 +79,6 @@ public class View extends JFrame implements IView {
 	private JFileChooser chooser;
 
 	private Event menuNewGameEvent = new Event();
-	private Event menuQuitEvent = new Event();
 
 	private Event networkGameEvent = new Event();
 	private Event loadEvent = new Event();
@@ -147,11 +146,6 @@ public class View extends JFrame implements IView {
 		return menuNewGameEvent;
 	}
 
-	@Override
-	public IEvent getMenuQuitEvent() {
-		return menuQuitEvent;
-	}
-
 	@Override
 	public IEvent1<File> getLoadFileEvent() {
 		return loadFileEvent;
@@ -246,7 +240,7 @@ public class View extends JFrame implements IView {
 
 		gameMenu.addSeparator();
 
-		gameMenu.add(createMenuItem("Beenden", menuQuitEvent));
+		gameMenu.add(createMenuItem("Beenden", quitEvent));
 
 		setJMenuBar(menuBar);
 	}
@@ -503,11 +497,11 @@ public class View extends JFrame implements IView {
 
 	@Override
 	public void showLoginPanel(boolean show) {
-		loginPanel.setVisible(show);
-
 		if (show) {
 			loginPanel.resetLoginPanel();
 		}
+
+		loginPanel.setVisible(show);
 	}
 
 	@Override
-- 
cgit v1.2.3