neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

quit warnings funktionieren

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@492 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-06-19 22:27:21 +02:00
parent 45656861ab
commit fc6d3d46db
7 changed files with 286 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/jrummikub/control/ApplicationControl.java
View file

@ -5,10 +5,12 @@ import jrummikub.control.network.NetworkControl;
import jrummikub.model.GameSettings;
import jrummikub.model.GameState;
import jrummikub.model.IRoundState;
import jrummikub.util.Connection;
import jrummikub.util.IListener;
import jrummikub.util.IListener1;
import jrummikub.util.IListener3;
import jrummikub.util.LoginData;
import jrummikub.view.IQuitWarningPanel.QuitMode;
import jrummikub.view.IView;
import jrummikub.view.IView.BottomPanelType;
@ -22,6 +24,7 @@ public class ApplicationControl {
private NetworkControl networkControl;
private SaveControl saveControl;
private GameControl gameControl;
private Connection tempConnection;
private IView view;
@ -38,14 +41,59 @@ public class ApplicationControl {
view.getMenuNewGameEvent().add(new IListener() {
@Override
public void handle() {
abortControls();
startApplication();
view.getQuitWarningPanel().setMode(QuitMode.QUIT_GAME);
view.showQuitWarningPanel(true);
tempConnection = view.getQuitWarningPanel().getQuitEvent().add(new IListener() {
@Override
public void handle() {
abortControls();
startApplication();
view.showQuitWarningPanel(false);
tempConnection.remove();
}
});
}
});
view.getMenuQuitEvent().add(new IListener() {
@Override
public void handle() {
System.exit(0);
if (gameControl == null) {
System.exit(0);
} else {
view.getQuitWarningPanel().setMode(QuitMode.QUIT_PROCESS);
view.showQuitWarningPanel(true);
view.getQuitWarningPanel().getQuitEvent().add(new IListener() {
@Override
public void handle() {
System.exit(0);
}
});
}
}
});
view.getQuitEvent().add(new IListener() {
@Override
public void handle() {
if (gameControl == null) {
System.exit(0);
} else {
view.getQuitWarningPanel().setMode(QuitMode.QUIT_PROCESS);
view.showQuitWarningPanel(true);
view.getQuitWarningPanel().getQuitEvent().add(new IListener() {
@Override
public void handle() {
System.exit(0);
}
});
}
}
});
view.getQuitWarningPanel().getCancelEvent().add(new IListener() {
@Override
public void handle() {
view.showQuitWarningPanel(false);
}
});
@ -53,7 +101,6 @@ public class ApplicationControl {
saveControl.getLoadEvent().add(
new IListener3<GameSettings, GameState, IRoundState>() {
@Override
public void handle(GameSettings settings,
GameState gameState, IRoundState roundState) {

26
src/jrummikub/control/SaveControl.java
View file

@ -9,10 +9,13 @@ import java.io.ObjectOutputStream;
import jrummikub.model.GameSettings;
import jrummikub.model.GameState;
import jrummikub.model.IRoundState;
import jrummikub.util.Connection;
import jrummikub.util.Event;
import jrummikub.util.Event3;
import jrummikub.util.IEvent3;
import jrummikub.util.IListener;
import jrummikub.util.IListener1;
import jrummikub.view.IQuitWarningPanel.QuitMode;
import jrummikub.view.IView;
/**
@ -24,6 +27,7 @@ public class SaveControl {
private IRoundState roundState;
private Event3<GameSettings, GameState, IRoundState> loadEvent = new Event3<GameSettings, GameState, IRoundState>();
private Event loadErrorEvent = new Event();
private Connection tempConnection;
/**
* Creates a new SaveControl
@ -31,7 +35,7 @@ public class SaveControl {
* @param view
* the view to use
*/
public SaveControl(IView view) {
public SaveControl(final IView view) {
view.getSaveEvent().add(new IListener1<File>() {
@Override
public void handle(File file) {
@ -39,9 +43,25 @@ public class SaveControl {
}
});
view.getLoadEvent().add(new IListener1<File>() {
view.getLoadEvent().add(new IListener() {
@Override
public void handle(File file) {
public void handle() {
view.getQuitWarningPanel().setMode(QuitMode.QUIT_GAME);
view.showQuitWarningPanel(true);
tempConnection=view.getQuitWarningPanel().getQuitEvent().add(new IListener() {
@Override
public void handle() {
view.showQuitWarningPanel(false);
view.load();
tempConnection.remove();
}
});
}
});
view.getLoadFileEvent().add(new IListener1<File>() {
@Override
public void handle(final File file) {
load(file);
}
});