1.1 --- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/GameId.java	Mon Aug 31 22:44:47 2009 +0200
     1.2 +++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/GameId.java	Fri Sep 11 20:32:15 2009 +0200
     1.3 @@ -48,7 +48,7 @@
     1.4      @XmlAttribute
     1.5      private Date started;
     1.6      @XmlAttribute
     1.7 -    private GameResult result;
     1.8 +    private GameStatus status;
     1.9      @XmlID @XmlAttribute
    1.10      private String id;
    1.11  
    1.12 @@ -58,16 +58,16 @@
    1.13      public GameId(String first, String second) {
    1.14          this(
    1.15              UUID.randomUUID().toString(),
    1.16 -            first, second, new Date(), GameResult.IN_PROGRESS
    1.17 +            first, second, new Date(), GameStatus.whiteMove
    1.18          );
    1.19      }
    1.20  
    1.21 -    public GameId(String id, String first, String second, Date started, GameResult result) {
    1.22 +    public GameId(String id, String first, String second, Date started, GameStatus result) {
    1.23          this.white = first;
    1.24          this.black = second;
    1.25          this.id = id;
    1.26          this.started = started;
    1.27 -        this.result = result;
    1.28 +        this.status = result;
    1.29      }
    1.30  
    1.31      public String getId() {
    1.32 @@ -86,7 +86,7 @@
    1.33          return started;
    1.34      }
    1.35  
    1.36 -    public GameResult getResult() {
    1.37 -        return result;
    1.38 +    public GameStatus getStatus() {
    1.39 +        return status;
    1.40      }
    1.41  }