merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
4 changed files with 23 additions and 0 deletions
Showing only changes of commit 5d45cf2934 - Show all commits

View File

@@ -416,6 +416,14 @@ public void received(IncorrectRequestMessage msg) {
addNotification(new InfoNotification(Resources.stringLookup("incorrect.request." + msg.getId()))); addNotification(new InfoNotification(Resources.stringLookup("incorrect.request." + msg.getId())));
} }
/**
* @param choosePieceStateMessage
*/
@Override
public void received(ChoosePieceStateMessage choosePieceStateMessage) {
state.received(choosePieceStateMessage);
}
/** /**
* This method calls the method received of the state * This method calls the method received of the state
* *

View File

@@ -95,6 +95,11 @@ public void received(LobbyPlayerLeaveMessage msg) {
LOGGER.log(Level.DEBUG, "Received {0} not allowed.", msg.toString()); LOGGER.log(Level.DEBUG, "Received {0} not allowed.", msg.toString());
} }
@Override
public void received(ChoosePieceStateMessage msg) {
LOGGER.log(Level.DEBUG, "Received {0} not allowed.", msg.toString());
}
@Override @Override
public void received(MoveMessage msg) { public void received(MoveMessage msg) {
LOGGER.log(Level.DEBUG, "Received {0} not allowed.", msg.toString()); LOGGER.log(Level.DEBUG, "Received {0} not allowed.", msg.toString());

View File

@@ -281,6 +281,11 @@ public void received(PossiblePieceMessage msg){
state.received(msg); state.received(msg);
} }
@Override
public void received(ChoosePieceStateMessage msg){
state.received(msg);
}
/** /**
* This method returns the current state * This method returns the current state
* *

View File

@@ -138,6 +138,11 @@ public void received(PossiblePieceMessage msg){
state.received(msg); state.received(msg);
} }
@Override
public void received(ChoosePieceStateMessage msg){
state.received(msg);
}
public ChoosePieceState getChoosePiece() { public ChoosePieceState getChoosePiece() {
return choosePieceState; return choosePieceState;
} }