summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/view
diff options
context:
space:
mode:
Diffstat (limited to 'src/jrummikub/view')
-rw-r--r--src/jrummikub/view/IView.java7
-rw-r--r--src/jrummikub/view/impl/View.java12
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