Fix warnings

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@484 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-06-19 16:11:23 +02:00
parent 92fe29000b
commit d0d349e5a8
14 changed files with 129 additions and 75 deletions

View file

@ -68,7 +68,7 @@ public class ApplicationControl {
saveControl.getLoadErrorEvent().add(new IListener() {
@Override
public void handle() {
view.showError();
view.showLoadingError();
}
});
}

View file

@ -108,15 +108,19 @@ public class SaveControl {
loadErrorEvent.emit();
}
}
public Event getLoadErrorEvent(){
/**
* The load error event is emitted when the file selected for loading is not
* a rum file
*
* @return the event
*/
public Event getLoadErrorEvent() {
return loadErrorEvent;
}
private void save(File file) {
if (gameState == null || gameSettings == null) {
// TODO Menüpunkt ausgrauen
System.err.println("kein aktives Spiel");
return;
}
try {

View file

@ -32,6 +32,9 @@ import org.jivesoftware.smack.util.Base64;
import org.jivesoftware.smackx.muc.DiscussionHistory;
import org.jivesoftware.smackx.muc.MultiUserChat;
/**
* Connection control managing network connections, essages and events
*/
public class ConnectionControl implements IConnectionControl {
private final static String ELEMENT_NAME = "rummikub";
private final static String NAMESPACE = "http://home.universe-factory.net/rummikub/";
@ -59,6 +62,12 @@ public class ConnectionControl implements IConnectionControl {
private volatile GameData offeredGame;
/**
* Creates new connection control
*
* @param loginData
* player's login data
*/
public ConnectionControl(LoginData loginData) {
this.loginData = loginData;
}
@ -222,7 +231,8 @@ public class ConnectionControl implements IConnectionControl {
protected void addData(DefaultPacketExtension extension) {
extension.setValue("messageType", "change_color");
extension.setValue("uuid", uuid.toString());
extension.setValue("color", Base64.encodeObject(color, Base64.GZIP));
extension.setValue("color",
Base64.encodeObject(color, Base64.GZIP));
}
});
@ -248,8 +258,8 @@ public class ConnectionControl implements IConnectionControl {
protected void addData(DefaultPacketExtension extension) {
extension.setValue("messageType", "game_offer");
extension.setValue("uuid", data.getGameID().toString());
extension.setValue("gameSettings",
Base64.encodeObject(data.getGameSettings(), Base64.GZIP));
extension.setValue("gameSettings", Base64.encodeObject(
data.getGameSettings(), Base64.GZIP));
}
});
}
@ -287,8 +297,8 @@ public class ConnectionControl implements IConnectionControl {
.getExtension(ELEMENT_NAME, NAMESPACE);
if (((Message) packet).getType() == Message.Type.error) {
System.err.println("Received error message from '" + packet.getFrom()
+ "'");
System.err.println("Received error message from '"
+ packet.getFrom() + "'");
return;
}
@ -304,13 +314,14 @@ public class ConnectionControl implements IConnectionControl {
String sender, String messageType) {
if (messageType.equals("game_offer")) {
UUID uuid = UUID.fromString(extension.getValue("uuid"));
GameSettings settings = (GameSettings) Base64.decodeToObject(extension
.getValue("gameSettings"));
GameSettings settings = (GameSettings) Base64
.decodeToObject(extension.getValue("gameSettings"));
GameData gameData = new GameData(uuid, settings, sender);
gameOfferEvent.emit(gameData);
} else if (messageType.equals("game_withdrawal")) {
gameWithdrawalEvent.emit(UUID.fromString(extension.getValue("uuid")));
gameWithdrawalEvent
.emit(UUID.fromString(extension.getValue("uuid")));
} else if (messageType.equals("game_request")) {
if (offeredGame != null) {
sendGameOffer();
@ -393,7 +404,8 @@ public class ConnectionControl implements IConnectionControl {
break; // Join was successful, break the loop
} catch (XMPPException e) {
XMPPError error = e.getXMPPError();
if (error.getType() == Type.CANCEL && error.getCode() == 409) {
if (error.getType() == Type.CANCEL
&& error.getCode() == 409) {
// There was a conflict, try again with another
// nickname
nickname += "_";

View file

@ -37,6 +37,8 @@ public class NetworkControl {
*
* @param loginData
* user's login data
* @param connectionControl
* current connection for events and messages
* @param view
* for events and handlers
*/
@ -48,24 +50,24 @@ public class NetworkControl {
addConnectionSetupListeners(loginData, view);
addConnectionControlListeners(view);
connections.add(view.getGameListPanel().getJoinEvent().add(
new IListener1<GameData>() {
connections.add(view.getGameListPanel().getJoinEvent()
.add(new IListener1<GameData>() {
@Override
public void handle(GameData gameData) {
join(gameData);
}
}));
connections.add(view.getGameListPanel().getOpenNewGameEvent().add(
new IListener() {
connections.add(view.getGameListPanel().getOpenNewGameEvent()
.add(new IListener() {
@Override
public void handle() {
createSettingsControl();
}
}));
connections.add(view.getGameListPanel().getCancelEvent().add(
new IListener() {
connections.add(view.getGameListPanel().getCancelEvent()
.add(new IListener() {
@Override
public void handle() {
abort();
@ -222,8 +224,8 @@ public class NetworkControl {
}
view.showGameListPanel(false);
settingsControl = new NetworkSettingsControl(connectionControl
.getNickname(), view, new GameSettings());
settingsControl = new NetworkSettingsControl(
connectionControl.getNickname(), view, new GameSettings());
settingsControl.getOfferGameEvent().add(new IListener1<GameSettings>() {
@Override
public void handle(GameSettings settings) {