Merge branch 'model' into 'master'

correct data model

See merge request reswp-2020/galaxytrucker!29

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Crew/Crew.java

 package com.galaxytrucker.galaxytruckerreloaded.Model.Crew;
 
+import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.Room;
 import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.System;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
@@ -52,10 +53,15 @@ public class Crew implements Serializable {
     private int[] stats;
 
     /**
-     * The system this crew member is in
+     * The room this crew member is in
      */
     @DatabaseField(foreign = true, columnName = "system")
-    @NonNull
-    private System currentSystem;
+    private Room currentRoom;
+
+    /**
+     * The user who owns this crew member
+     */
+    @DatabaseField(columnName = "associatedUser")
+    private String associatedUser;
 
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java

@@ -96,11 +96,6 @@ public class Ship implements Serializable {
     @DatabaseField(columnName = "FTLCharge")
     private int FTLCharge;
 
-    /** This ship's weapons */
-    @NonNull
-    @DatabaseField(columnName = "weapons", foreign = true)
-    private List<Weapon> weapons;
-
     /** This ship's systems */
     @NonNull
     @DatabaseField(columnName = "systems",foreign = true)

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/WeaponSystem.java

 package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
 
+import com.badlogic.gdx.scenes.scene2d.ui.List;
+import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 import lombok.*;
@@ -15,4 +17,8 @@ public class WeaponSystem extends System {
     @DatabaseField(columnName = "manned")
     private boolean manned = false;
 
+    /** List of weapons this ship has */
+    @DatabaseField(foreign = true,columnName = "shipWeapons")
+    private List<Weapon> shipWeapons;
+
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java

 package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
 
 import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
+import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.System;
 import com.j256.ormlite.field.DatabaseField;
 import lombok.*;
 
@@ -93,9 +94,8 @@ public abstract class Weapon implements Serializable {
     @DatabaseField(columnName = "weaponBurst")
     private int burst;
 
-    /** Ship this weapon belongs to */
-    @NonNull
-    @DatabaseField(foreign = true, columnName = "associatedShip")
-    private Ship associatedShip;
+    /** Weapon system this weapon belongs to */
+    @DatabaseField(columnName = "weaponSystem",foreign = true)
+    private System weaponSystem;
 
 }

doc/UML/Datenmodell.drawio

-<mxfile host="app.diagrams.net" modified="2020-05-27T15:20:21.330Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36" etag="LVy6xN6CRc7D_DMOXAaF" version="13.1.2" type="device"><diagram id="eSud1R6gVXv-HQVYPhv1" name="Page-1">7V3LcuI4FP0aNlMVl9/Yy/DIpGuSSarpnu5eClDA1cZiZCch8/UjWX5g2YBjYksBWCRIyPJFPudIuroSPWO42vyJwXp5j+bQ7+nqfNMzRj1d1x1HI/9ozhvLMQzTYDkL7M1ZnpZnTLz/YJKpJrnP3hyGhYIRQn7krYuZMxQEcBYV8gDG6LVY7An5xbuuwQKWMiYz4Jdzf3jzaMlyHUvN82+ht1imd9bU5JMVSAsnGeESzNHrVpYx7hlDjFDE3q02Q+jT1kvbhV13s+PTzDAMg6jOBehx8fLXvzPz52h9//P7NRxu/tKuHFbLC/Cfky/c022f1DdYU5Ojt6Qd7H+fqZ2DFcALL+gZ1+RTc70hf9Wtv6QAfT5wE10B31sk5WbEQIjzOsi7Bf0/xPA1vRsxe53mp3lLzOcctmnbDpZ/5cOniH3o0A95K3r6IGkkWsQjbbnHpPYMCMAKskKTCHvBQowVSwh8CluhTbECm1sZ7AgjEIW5DdagZ42qLdELNugvEEcekZBrxoFRhNakWMKIEbv3AJFST34sCE8eIaoxeEJBlAigpifpG7DyfKqdt9B/gbRWSoxo5dNC2b3pDeFmpy5omdoQnYZoBSP8RookFximxS5JJPrKSbX3NRc8zU7ylkWxS4Q2EdlFVnmuQ+RNIkXvkCVXoCw9kNZ8RZj0E5JoEwhDNPNABOffQ2KwcJFY+yCA0T1Ys5K3IFzShG6DFcV5fHeCbJBRZvgYX5GVKNh5QkwyVY5JmuqWqaQbFVTqt8UkTRNIpey5S8EjObrYNQp/skKMI6KM+CXcCPgS84qWGgfPq6KAMOiM4yI1dKNtW+deOKM6A5Nx4pTMQSAIujeG1T0t0eaEZNROxxp7ZVTrdzoiIQ0gTkeL1CimCtQplv4AvnxMD5DSWIpuYPhwP7j+RkYl5P0/D19G7N3k9uExftctoQcPkwkz4P7L31/y1N/jwfe7awEG3Y+/jR++ktb4Mf7KTHn85/EERUbX6ozVqkVGbU1kDIEi8w2DeZwvBUtfIVijILxBeBL74mjxOy/MBwPx/X/EpUQPEM6hTzY4urgVToLM1bnNFrs1sphVZNndT24iGMzD/V0l94zIBdfUh0xSUx/NfpMyJCttfpslb+IHM1KLbQ43XvSTZitWkvqVFKLvR5vtxFuSYPeH85JHmntKxEb0jGewhpJEBMIwOjg/LD/3Kt8Phj6IvJeidVXPNanuEcW+uxRDGg8F9i2SUtuea+5CQ+cuZN+qdGEMo+w7HIEsW6AMjwNSFZRFhlcgCC5znvb19UrjJz1Wv+5wpL05T18gDyZLD8rjg73woKPFCAlZIHKNlA1wJ29hBFcXLpwXF7LhtExkELkyt294fz0NIwxmZWexNK4wuUgsPOABBhAv3sSHGoxlsGMOVnEckjAjzkFOOTWtDHOoVFN++vlhappWLLsLwzTNXu7EuFIVNX5wuz0ZNPEIsUeaiUYssLyANNmWS4Qmf6W3oom8qjjVhlekX9cr4nbmFXE5WNpmQy+Jbh2qqWW3iV4ZaiAfmus75LYgqzlGAbSKqh4CbpziWfCRaLblQ/NVtjiSodBoiGfeIVKqqG04V674ngicHaegwariupZoODvywdkoobmpD9sswZmvqW04i1xb/Nwzt68ISTNvSwemQqcrCdOE2jDFEMxEG4E2bwsYCDYijygUacKvAyac1NzxHcEilrq70zlu8nhy698yzBDdmoMQ1p12s27OT+wcp+lCunaoprYHIZbAQcjAB8FvmfpyoT7YM/D4ETbX2drU7QqKXhlcIo1sb3k8dLdX9HjojaaIgiOhUsmRSdGv9JIQuw0l/arUOfA1tS3pVUEiuwEZoABykCNPeZKURThaogUKgD/Oc7dA2Sv4LGzVbQJIEcMFpxpbx44MeOdxn1+qqD0y4GFUqqltGJWjLLQSjjAMvf/ANE5ywsX1QXxHNUVRRDp+IqpgCv0BmP1eYPQczIfIRziu3HiKX1xvleMlOWAguXsvmxIc6KH2cGZPv/VOlTmuQyov6auKYjZpfMw60M/d+p02furTvnjl3m19Fvt/GcvHPrm4Oe7gC/TPPZhhEAsG8ufoVbRvTo4oFy8MfThEYSTaTYjhzAs9FAjfezzHaD1cgmAGhZsSxoHOjx7EM7opXQavuiQtM8PwdUTEJBCuJtNnfJA8n9pV4qSxIu/2lOj8svzHjY1EHl0xQKupLGML8QdXnIGzsF/aeqDXZEB7vkKjMgSlIwbQM7guLDgzFrgyskBk5ModCCEe+CCM5Nkbf2FCB0zQNBmpULnm31UYFJh7ICKzt0uvcGZcsPjZgQxUEBlKQKmALhQ4ZwrY4jdjGiLPqfiKZr8vZzueNwckCKcxKs+okC+cpleIXDgcSZMEzaShlOyyNICm9aAZo+7WIjZG7iRopm+4iqq72YsL7Woc+uC4quJaeb0Oh3HTVtIYoo5iIYzKEydkx3QzSJuauxfUVTtJPxLodaPDugS6qSrq1osDum3qitUQ6raruO5OCnW9YdSoPExCGpxncYuO2d/CbLz92RQKWlNC0Bp7Qds3GkLWLR2Cwm+oaBmkKSckBelWvK7pFAWZdmX1JJmIt2kXZFlV++9GeNvBlul6oFSw36/VfX7k8EFK3ddLfUDbNJB7c39OA5uJ9VbYOhPrWjQwCjRoqPSt80CXkAfWfh5oTXnQ388DrXMe6J+CB1qv0BX06w7OCQVck6OAKnawU/ck2y7Rbu9Hu9oU7c5+tKudo13k0utk6a1l8S/K9htMy7Xw+FovCAXbwOJaRVvx9Cw84lqKKGMWxzpcUkUSDQywmchjDXwBNOZZkqBa9phEk+bm250Uz8YL6E/TIJyQ5/ILEwJ/hpJz9GhZzsEQ5NZWl8yqeJvdw/VGm1tTt7iiFj3jRj+dix5/xmI+4G/9BA3z2F+eOHJsbvN7YjWj6XEZDr8ptlxV2+PvcpDLHyUAnsquWEY2SXbFmuXYikb7kT/HltgDTd9ty3dwoEDm7XDdot9bc47R3K0DCVI3uuhTFWvL8S73yZFybBmaYm+5NLjVdc20SMdn5q4UvZlU9y1zn+dEU7sW7nM6zsCU6TgDs7yorClKo17zk2i3RMcZpAOmFrVbhDbuOhro6GOAOD9yurCfyZalGoph5QW4W9RVR802FfqzlVk1/LFYatHv7HaqlVZ5afF0tdLa0c0K0UqrvJh12lp5oPU/qPFJEiPqwclZgsF6eY/m1FM8/h8=</diagram></mxfile>
\ No newline at end of file
+<mxfile host="app.diagrams.net" modified="2020-05-28T15:03:01.607Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36" etag="uBykAUA5SAm0KjsFfd0S" version="13.1.4" type="device"><diagram id="eSud1R6gVXv-HQVYPhv1" name="Page-1">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</diagram></mxfile>
\ No newline at end of file