1.1 --- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/Game.java	Tue Dec 08 18:47:49 2009 +0100
     1.2 +++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/Game.java	Thu Jan 07 22:34:17 2010 +0100
     1.3 @@ -82,10 +82,19 @@
     1.4  
     1.5      @XmlAttribute
     1.6      final String getCurrentPlayer() {
     1.7 -        if (board.getCurrentPlayer() == board.getPlayers().get(0)) {
     1.8 -            return id.getWhite();
     1.9 -        } else {
    1.10 -            return id.getBlack();
    1.11 +        Player w = board.getWinner();
    1.12 +        if(w==null){
    1.13 +            if (board.getCurrentPlayer() == board.getPlayers().get(0)) {
    1.14 +                return id.getWhite();
    1.15 +            } else {
    1.16 +                return id.getBlack();
    1.17 +            }
    1.18 +        }else{
    1.19 +            if (w == board.getPlayers().get(0)) {
    1.20 +                return id.getWhite();
    1.21 +            } else {
    1.22 +                return id.getBlack();
    1.23 +            }
    1.24          }
    1.25      }
    1.26  
    1.27 @@ -191,11 +200,13 @@
    1.28          @Override
    1.29          public Board unmarshal(String v) throws Exception {
    1.30              return v == null ? null : Board.valueOf(v);
    1.31 +//            return v == null ? null : new Board(v);
    1.32          }
    1.33  
    1.34          @Override
    1.35          public String marshal(Board v) throws Exception {
    1.36              return v == null ? null : v.toString();
    1.37 +//            return v == null ? null : Board.board2HashCode(v);
    1.38          }
    1.39  
    1.40      }