Skip to content
Snippets Groups Projects
Commit 0da2cc42 authored by Leonard's avatar Leonard
Browse files

controller

parent 25bfee21
No related branches found
No related tags found
No related merge requests found
...@@ -63,7 +63,7 @@ public class ClientControllerCommunicator { ...@@ -63,7 +63,7 @@ public class ClientControllerCommunicator {
if (singleton == null){ if (singleton == null){
singleton = new ClientControllerCommunicator(client); singleton = new ClientControllerCommunicator(client);
} }
// TODO CREATE ALL CONTROLLERS HERE // TODO CREATE ALL CONTROLLERS HERE, all controllers should be singletons
return singleton; return singleton;
} }
} }
...@@ -83,7 +83,7 @@ public class Ship implements Serializable { ...@@ -83,7 +83,7 @@ public class Ship implements Serializable {
* The planet the ship is currently at * The planet the ship is currently at
*/ */
@NonNull @NonNull
@ManyToOne @ManyToOne(cascade = CascadeType.ALL)
private Planet planet; private Planet planet;
/** Shields */ /** Shields */
...@@ -98,12 +98,12 @@ public class Ship implements Serializable { ...@@ -98,12 +98,12 @@ public class Ship implements Serializable {
/** This ship's systems */ /** This ship's systems */
@NonNull @NonNull
@OneToMany @OneToMany(cascade = CascadeType.ALL)
private List<Room> systems; private List<Room> systems;
/** Inventory */ /** Inventory */
@NonNull @NonNull
@OneToMany @OneToMany(cascade = CascadeType.ALL)
private List<Weapon> inventory; private List<Weapon> inventory;
/** Whether or not the ship is in combat */ /** Whether or not the ship is in combat */
......
...@@ -4,6 +4,7 @@ package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout; ...@@ -4,6 +4,7 @@ package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
import com.galaxytrucker.galaxytruckerreloaded.Model.Crew.Crew; import com.galaxytrucker.galaxytruckerreloaded.Model.Crew.Crew;
import lombok.*; import lombok.*;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
...@@ -57,6 +58,6 @@ public abstract class Room implements Serializable { ...@@ -57,6 +58,6 @@ public abstract class Room implements Serializable {
/** Crew in this system */ /** Crew in this system */
@NonNull @NonNull
@OneToMany @OneToMany(cascade = CascadeType.ALL)
private List<Crew> crew; private List<Crew> crew;
} }
...@@ -3,10 +3,7 @@ package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout; ...@@ -3,10 +3,7 @@ package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon; import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
import lombok.*; import lombok.*;
import javax.persistence.ElementCollection; import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import java.util.List; import java.util.List;
@RequiredArgsConstructor(access = AccessLevel.PUBLIC) @RequiredArgsConstructor(access = AccessLevel.PUBLIC)
...@@ -20,7 +17,7 @@ public class WeaponSystem extends System { ...@@ -20,7 +17,7 @@ public class WeaponSystem extends System {
private boolean manned = false; private boolean manned = false;
/** List of weapons this ship has */ /** List of weapons this ship has */
@OneToMany @OneToMany(cascade = CascadeType.ALL)
private List<Weapon> shipWeapons; private List<Weapon> shipWeapons;
} }
...@@ -26,11 +26,11 @@ public class User implements Serializable { ...@@ -26,11 +26,11 @@ public class User implements Serializable {
/** /**
* The user's ship * The user's ship
*/ */
@OneToOne @OneToOne(cascade = CascadeType.ALL)
private Ship userShip; private Ship userShip;
/** The user's overWorld map */ /** The user's overWorld map */
@OneToOne @OneToOne(cascade = CascadeType.ALL)
private Overworld overworld; private Overworld overworld;
/** Whether or not the user is logged in */ /** Whether or not the user is logged in */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment