Commit 5058cafc authored by alexandre.ducarne's avatar alexandre.ducarne
Browse files

Resolve conflicts

parent 18365393
package baleine.common.dataModel;
import java.util.UUID;
public class Board {
UUID game;
int[][] state;
}
package baleine.common.dataModel;
import java.util.List;
public class Chat {
List<Message> chat;
GameMeta game;
}
package baleine.common.dataModel;
import java.security.Timestamp;
import java.util.List;
import java.util.UUID;
public class GameHeavy extends GameMeta {
List<Move> moveList;
Timestamp gameStart;
Chat chat;
UUID winner;
List<UserZero> spectators;
}
package baleine.common.dataModel;
public class GameLight extends GameMeta {
}
package baleine.common.dataModel;
import java.util.UUID;
abstract class GameMeta {
protected UUID id;
protected UserLight gameCreator;
protected UserLight player2;
protected GameStatus status;
protected boolean isOkSpectators;
protected boolean isOkChat;
protected boolean isWhiteCreator;
protected int limitMove;
}
package baleine.common.dataModel;
public enum GameStatus {
PENDING,
IN_PROGRESS;
}
package baleine.common.dataModel;
import java.security.Timestamp;
public class Message{
Timestamp hourMessage;
String message;
UserZero author;
}
package baleine.common.dataModel;
import java.security.Timestamp;
public class Move {
UserZero player;
Timestamp hourMove;
int X;
int Y;
}
package baleine.common.dataModel;
public class UserHeavy extends UserMeta {
String password;
String serverAddress;
String serverPort;
List<GameHeavy> savedGames;
}
package baleine.common.dataModel;
import java.util.Date;
public class UserLight extends UserMeta {
String lastName;
String firstName;
Date dateOfBirth;
int avatarId;
int playedGames;
int wonGames;
}
package baleine.common.dataModel;
import java.util.UUID;
abstract class UserMeta {
protected UUID id;
protected String pseudo;
}
package baleine.common.dataModel;
public class UserZero extends UserMeta {
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment