aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/models
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/models')
-rw-r--r--src/main/java/models/Ability.java10
-rw-r--r--src/main/java/models/AbilityType.java4
-rw-r--r--src/main/java/models/CONSTS.java6
-rw-r--r--src/main/java/models/Monster.java4
-rw-r--r--src/main/java/models/MonsterViewModel.java3
-rw-r--r--src/main/java/models/User.java13
6 files changed, 32 insertions, 8 deletions
diff --git a/src/main/java/models/Ability.java b/src/main/java/models/Ability.java
index e6a00d1..1a174cf 100644
--- a/src/main/java/models/Ability.java
+++ b/src/main/java/models/Ability.java
@@ -1,8 +1,10 @@
package models;
-public class Ability {
+import java.io.Serializable;
+
+public class Ability implements Serializable {
public long id;
- public int monsterId;
+ public long monsterId;
public String Name;
public String description;
public AbilityType type;
@@ -20,10 +22,10 @@ public class Ability {
public void setId(long id) {
this.id = id;
}
- public int getMonsterId() {
+ public long getMonsterId() {
return monsterId;
}
- public void setMonsterId(int monsterId) {
+ public void setMonsterId(long monsterId) {
this.monsterId = monsterId;
}
public String getName() {
diff --git a/src/main/java/models/AbilityType.java b/src/main/java/models/AbilityType.java
index 5b4e1eb..43dd3dc 100644
--- a/src/main/java/models/AbilityType.java
+++ b/src/main/java/models/AbilityType.java
@@ -1,6 +1,8 @@
package models;
-public enum AbilityType {
+import java.io.Serializable;
+
+public enum AbilityType implements Serializable{
ATTACK,
SPECIAL,
HEAL,
diff --git a/src/main/java/models/CONSTS.java b/src/main/java/models/CONSTS.java
new file mode 100644
index 0000000..3e66a69
--- /dev/null
+++ b/src/main/java/models/CONSTS.java
@@ -0,0 +1,6 @@
+package models;
+
+public class CONSTS {
+ public static final String rmiUrl="rmi://localhost:5555/rmi";
+
+}
diff --git a/src/main/java/models/Monster.java b/src/main/java/models/Monster.java
index dc16205..a4b40e8 100644
--- a/src/main/java/models/Monster.java
+++ b/src/main/java/models/Monster.java
@@ -1,6 +1,8 @@
package models;
-public class Monster {
+import java.io.Serializable;
+
+public class Monster implements Serializable{
public long id;
public String name;
public String description;
diff --git a/src/main/java/models/MonsterViewModel.java b/src/main/java/models/MonsterViewModel.java
index fed9152..b10cd34 100644
--- a/src/main/java/models/MonsterViewModel.java
+++ b/src/main/java/models/MonsterViewModel.java
@@ -1,8 +1,9 @@
package models;
+import java.io.Serializable;
import java.util.ArrayList;
-public class MonsterViewModel {
+public class MonsterViewModel implements Serializable{
public long id;
public String name;
public String description;
diff --git a/src/main/java/models/User.java b/src/main/java/models/User.java
index 08e4ab0..3c341a2 100644
--- a/src/main/java/models/User.java
+++ b/src/main/java/models/User.java
@@ -1,11 +1,22 @@
package models;
-public class User {
+import java.io.Serializable;
+
+public class User implements Serializable{
public long id;
public String username;
public String password;
public boolean admin;
+ public long monsterId;
+ public long getmonsterId() {
+ return monsterId;
+ }
+
+ public void setmonsterId(long monsterId) {
+ this.monsterId = monsterId;
+ }
+
public long getId() {
return id;
}