From 5058cafcdb8d64c2a4fe820bea5866112077d791 Mon Sep 17 00:00:00 2001
From: "alexandre.ducarne" <alexandre.ducarne@renault.com>
Date: Wed, 6 Nov 2019 18:16:50 +0100
Subject: [PATCH] Resolve conflicts
---
src/baleine/common/dataModel/Board.java | 7 +++++++
src/baleine/common/dataModel/Chat.java | 8 ++++++++
src/baleine/common/dataModel/GameHeavy.java | 13 +++++++++++++
src/baleine/common/dataModel/GameLight.java | 5 +++++
src/baleine/common/dataModel/GameMeta.java | 13 +++++++++++++
src/baleine/common/dataModel/GameStatus.java | 7 +++++++
src/baleine/common/dataModel/Message.java | 9 +++++++++
src/baleine/common/dataModel/Move.java | 10 ++++++++++
src/baleine/common/dataModel/UserHeavy.java | 8 ++++++++
src/baleine/common/dataModel/UserLight.java | 11 +++++++++++
src/baleine/common/dataModel/UserMeta.java | 8 ++++++++
src/baleine/common/dataModel/UserZero.java | 5 +++++
12 files changed, 104 insertions(+)
create mode 100644 src/baleine/common/dataModel/Board.java
create mode 100644 src/baleine/common/dataModel/Chat.java
create mode 100644 src/baleine/common/dataModel/GameHeavy.java
create mode 100644 src/baleine/common/dataModel/GameLight.java
create mode 100644 src/baleine/common/dataModel/GameMeta.java
create mode 100644 src/baleine/common/dataModel/GameStatus.java
create mode 100644 src/baleine/common/dataModel/Message.java
create mode 100644 src/baleine/common/dataModel/Move.java
create mode 100644 src/baleine/common/dataModel/UserHeavy.java
create mode 100644 src/baleine/common/dataModel/UserLight.java
create mode 100644 src/baleine/common/dataModel/UserMeta.java
create mode 100644 src/baleine/common/dataModel/UserZero.java
diff --git a/src/baleine/common/dataModel/Board.java b/src/baleine/common/dataModel/Board.java
new file mode 100644
index 0000000..4015e57
--- /dev/null
+++ b/src/baleine/common/dataModel/Board.java
@@ -0,0 +1,7 @@
+package baleine.common.dataModel;
+import java.util.UUID;
+
+public class Board {
+ UUID game;
+ int[][] state;
+}
diff --git a/src/baleine/common/dataModel/Chat.java b/src/baleine/common/dataModel/Chat.java
new file mode 100644
index 0000000..abeccd6
--- /dev/null
+++ b/src/baleine/common/dataModel/Chat.java
@@ -0,0 +1,8 @@
+package baleine.common.dataModel;
+
+import java.util.List;
+
+public class Chat {
+ List<Message> chat;
+ GameMeta game;
+}
diff --git a/src/baleine/common/dataModel/GameHeavy.java b/src/baleine/common/dataModel/GameHeavy.java
new file mode 100644
index 0000000..57bbfd1
--- /dev/null
+++ b/src/baleine/common/dataModel/GameHeavy.java
@@ -0,0 +1,13 @@
+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;
+}
diff --git a/src/baleine/common/dataModel/GameLight.java b/src/baleine/common/dataModel/GameLight.java
new file mode 100644
index 0000000..3443825
--- /dev/null
+++ b/src/baleine/common/dataModel/GameLight.java
@@ -0,0 +1,5 @@
+package baleine.common.dataModel;
+
+public class GameLight extends GameMeta {
+
+}
diff --git a/src/baleine/common/dataModel/GameMeta.java b/src/baleine/common/dataModel/GameMeta.java
new file mode 100644
index 0000000..f44d8c6
--- /dev/null
+++ b/src/baleine/common/dataModel/GameMeta.java
@@ -0,0 +1,13 @@
+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;
+}
diff --git a/src/baleine/common/dataModel/GameStatus.java b/src/baleine/common/dataModel/GameStatus.java
new file mode 100644
index 0000000..b6f8175
--- /dev/null
+++ b/src/baleine/common/dataModel/GameStatus.java
@@ -0,0 +1,7 @@
+package baleine.common.dataModel;
+
+public enum GameStatus {
+ PENDING,
+ IN_PROGRESS;
+}
+
diff --git a/src/baleine/common/dataModel/Message.java b/src/baleine/common/dataModel/Message.java
new file mode 100644
index 0000000..dda26c9
--- /dev/null
+++ b/src/baleine/common/dataModel/Message.java
@@ -0,0 +1,9 @@
+package baleine.common.dataModel;
+
+import java.security.Timestamp;
+
+public class Message{
+ Timestamp hourMessage;
+ String message;
+ UserZero author;
+}
diff --git a/src/baleine/common/dataModel/Move.java b/src/baleine/common/dataModel/Move.java
new file mode 100644
index 0000000..1078eba
--- /dev/null
+++ b/src/baleine/common/dataModel/Move.java
@@ -0,0 +1,10 @@
+package baleine.common.dataModel;
+
+import java.security.Timestamp;
+
+public class Move {
+ UserZero player;
+ Timestamp hourMove;
+ int X;
+ int Y;
+}
diff --git a/src/baleine/common/dataModel/UserHeavy.java b/src/baleine/common/dataModel/UserHeavy.java
new file mode 100644
index 0000000..ee65f09
--- /dev/null
+++ b/src/baleine/common/dataModel/UserHeavy.java
@@ -0,0 +1,8 @@
+package baleine.common.dataModel;
+
+public class UserHeavy extends UserMeta {
+ String password;
+ String serverAddress;
+ String serverPort;
+ List<GameHeavy> savedGames;
+}
diff --git a/src/baleine/common/dataModel/UserLight.java b/src/baleine/common/dataModel/UserLight.java
new file mode 100644
index 0000000..ad3f99e
--- /dev/null
+++ b/src/baleine/common/dataModel/UserLight.java
@@ -0,0 +1,11 @@
+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;
+}
diff --git a/src/baleine/common/dataModel/UserMeta.java b/src/baleine/common/dataModel/UserMeta.java
new file mode 100644
index 0000000..b13a76d
--- /dev/null
+++ b/src/baleine/common/dataModel/UserMeta.java
@@ -0,0 +1,8 @@
+package baleine.common.dataModel;
+
+import java.util.UUID;
+
+abstract class UserMeta {
+ protected UUID id;
+ protected String pseudo;
+}
diff --git a/src/baleine/common/dataModel/UserZero.java b/src/baleine/common/dataModel/UserZero.java
new file mode 100644
index 0000000..a697032
--- /dev/null
+++ b/src/baleine/common/dataModel/UserZero.java
@@ -0,0 +1,5 @@
+package baleine.common.dataModel;
+
+public class UserZero extends UserMeta {
+
+}
--
GitLab