diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-21 05:20:56 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-21 05:20:56 +0200 |
| commit | b69608a0d947ec1de15138a670939417c977775f (patch) | |
| tree | dc4cd64aef02bbe1a51d5e09736ef945c1d79436 /src/jrummikub/view | |
| parent | 67105d228ed4976e73ed62b95db40ad8f485d7b4 (diff) | |
| download | JRummikub-b69608a0d947ec1de15138a670939417c977775f.tar JRummikub-b69608a0d947ec1de15138a670939417c977775f.zip | |
Fixed quit warning in network mode
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@543 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/view')
| -rw-r--r-- | src/jrummikub/view/IView.java | 7 | ||||
| -rw-r--r-- | src/jrummikub/view/impl/View.java | 12 |
2 files changed, 3 insertions, 16 deletions
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 @@ -156,13 +156,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(); @@ -148,11 +147,6 @@ public class View extends JFrame implements IView { } @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 |