Reorganised file structure and added placeholder for ChaosGameObserver.

src/main/java/edu/ntnu/stud/chaosgame/Main.java

@@ -34,10 +34,11 @@ public class Main {
       System.out.println(e.getMessage()); // TODO: Alter error game
     }
 
+    /* Test whether factory successfully instantiates descriptions.
     ChaosGameDescriptionFactory factory = new ChaosGameDescriptionFactory();
     for (ChaosGameDescription desc : factory.getDescriptions()) {
       System.out.println(desc);
-    }
+    }*/
 
     boolean exit = false;
 

src/main/java/edu/ntnu/stud/chaosgame/controller/ChaosGameObserver.java

+package edu.ntnu.stud.chaosgame.controller;
+
+import edu.ntnu.stud.chaosgame.model.game.ChaosCanvas;
+import edu.ntnu.stud.chaosgame.model.game.ChaosGameDescription;
+
+/**
+ * Observer class for monitoring changes to the active
+ * ChaosGameDescription {@link ChaosGameDescription} or the canvas {@link ChaosCanvas}
+ */
+public class ChaosGameObserver {
+// TODO: Create class
+}

src/main/java/edu/ntnu/stud/chaosgame/model/Complex.java → src/main/java/edu/ntnu/stud/chaosgame/model/data/Complex.java

-package edu.ntnu.stud.chaosgame.model;
+package edu.ntnu.stud.chaosgame.model.data;
 
 /**
  * Class representing a complex number.
  */
-public class Complex extends Vector2D{
+public class Complex extends Vector2D {
 
   /**
    * Create a new complex number.

src/main/java/edu/ntnu/stud/chaosgame/model/Matrix2x2.java → src/main/java/edu/ntnu/stud/chaosgame/model/data/Matrix2x2.java

-package edu.ntnu.stud.chaosgame.model;
+package edu.ntnu.stud.chaosgame.model.data;
 
 import edu.ntnu.stud.chaosgame.model.game.ChaosGameDescription;
 

src/main/java/edu/ntnu/stud/chaosgame/model/Vector2D.java → src/main/java/edu/ntnu/stud/chaosgame/model/data/Vector2D.java

-package edu.ntnu.stud.chaosgame.model;
+package edu.ntnu.stud.chaosgame.model.data;
 
 /**
  * Class representing a 2D vector.

src/main/java/edu/ntnu/stud/chaosgame/model/game/ChaosCanvas.java

 package edu.ntnu.stud.chaosgame.model.game;
 
-import edu.ntnu.stud.chaosgame.model.Matrix2x2;
-import edu.ntnu.stud.chaosgame.model.Vector2D;
+import edu.ntnu.stud.chaosgame.model.data.Matrix2x2;
+import edu.ntnu.stud.chaosgame.model.data.Vector2D;
 import edu.ntnu.stud.chaosgame.model.transformations.AffineTransform2D;
 
 

src/main/java/edu/ntnu/stud/chaosgame/model/game/ChaosGame.java

 package edu.ntnu.stud.chaosgame.model.game;
 
-import edu.ntnu.stud.chaosgame.model.Vector2D;
+import edu.ntnu.stud.chaosgame.model.data.Vector2D;
 import java.util.Random;
 
 /**

src/main/java/edu/ntnu/stud/chaosgame/model/game/ChaosGameDescription.java

 package edu.ntnu.stud.chaosgame.model.game;
 
-import edu.ntnu.stud.chaosgame.model.Vector2D;
+import edu.ntnu.stud.chaosgame.model.data.Vector2D;
 
 import edu.ntnu.stud.chaosgame.model.transformations.Transform2D;
 import java.util.List;
-import javax.xml.crypto.dsig.Transform;
 
 /**
  * Description of the chaos game.

src/main/java/edu/ntnu/stud/chaosgame/model/game/ChaosGameFileHandler.java

 package edu.ntnu.stud.chaosgame.model.game;
 
-import edu.ntnu.stud.chaosgame.model.Complex;
-import edu.ntnu.stud.chaosgame.model.Matrix2x2;
-import edu.ntnu.stud.chaosgame.model.Vector2D;
+import edu.ntnu.stud.chaosgame.model.data.Complex;
+import edu.ntnu.stud.chaosgame.model.data.Matrix2x2;
+import edu.ntnu.stud.chaosgame.model.data.Vector2D;
 import edu.ntnu.stud.chaosgame.model.transformations.AffineTransform2D;
 import edu.ntnu.stud.chaosgame.model.transformations.JuliaTransform;
 import edu.ntnu.stud.chaosgame.model.transformations.Transform2D;

src/main/java/edu/ntnu/stud/chaosgame/model/transformations/AffineTransform2D.java

 package edu.ntnu.stud.chaosgame.model.transformations;
 
-import edu.ntnu.stud.chaosgame.model.Matrix2x2;
-import edu.ntnu.stud.chaosgame.model.Vector2D;
+import edu.ntnu.stud.chaosgame.model.data.Matrix2x2;
+import edu.ntnu.stud.chaosgame.model.data.Vector2D;
 import edu.ntnu.stud.chaosgame.model.game.ChaosGameFileHandler;
 
 /**

src/main/java/edu/ntnu/stud/chaosgame/model/transformations/JuliaTransform.java

 package edu.ntnu.stud.chaosgame.model.transformations;
 
-import edu.ntnu.stud.chaosgame.model.Complex;
-import edu.ntnu.stud.chaosgame.model.Vector2D;
+import edu.ntnu.stud.chaosgame.model.data.Complex;
+import edu.ntnu.stud.chaosgame.model.data.Vector2D;
 import edu.ntnu.stud.chaosgame.model.game.ChaosGameFileHandler;
 
 public class JuliaTransform extends Transform2D {

src/main/java/edu/ntnu/stud/chaosgame/model/transformations/Transform2D.java

 package edu.ntnu.stud.chaosgame.model.transformations;
 
-import edu.ntnu.stud.chaosgame.model.Vector2D;
+import edu.ntnu.stud.chaosgame.model.data.Vector2D;
 
 /**
  * Abstract class representing transformations in a 2D-plane.

src/test/java/edu/ntnu/stud/chaosgame/game/ChaosGameDescriptionTest.java

 package edu.ntnu.stud.chaosgame.game;
 
-import edu.ntnu.stud.chaosgame.model.Complex;
-import edu.ntnu.stud.chaosgame.model.Matrix2x2;
-import edu.ntnu.stud.chaosgame.model.Vector2D;
+import edu.ntnu.stud.chaosgame.model.data.Complex;
+import edu.ntnu.stud.chaosgame.model.data.Matrix2x2;
+import edu.ntnu.stud.chaosgame.model.data.Vector2D;
 import edu.ntnu.stud.chaosgame.model.game.ChaosGameDescription;
 import edu.ntnu.stud.chaosgame.model.transformations.AffineTransform2D;
 import edu.ntnu.stud.chaosgame.model.transformations.JuliaTransform;

src/test/java/edu/ntnu/stud/chaosgame/transformations/AffineTransform2DTest.java

 package edu.ntnu.stud.chaosgame.transformations;
 
-import edu.ntnu.stud.chaosgame.model.Matrix2x2;
-import edu.ntnu.stud.chaosgame.model.Vector2D;
+import edu.ntnu.stud.chaosgame.model.data.Matrix2x2;
+import edu.ntnu.stud.chaosgame.model.data.Vector2D;
 import edu.ntnu.stud.chaosgame.model.transformations.AffineTransform2D;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;

src/test/java/edu/ntnu/stud/chaosgame/transformations/JuliaTransformTest.java

 package edu.ntnu.stud.chaosgame.transformations;
 
-import edu.ntnu.stud.chaosgame.model.Complex;
-import edu.ntnu.stud.chaosgame.model.Matrix2x2;
-import edu.ntnu.stud.chaosgame.model.Vector2D;
+import edu.ntnu.stud.chaosgame.model.data.Complex;
+import edu.ntnu.stud.chaosgame.model.data.Matrix2x2;
+import edu.ntnu.stud.chaosgame.model.data.Vector2D;
 import edu.ntnu.stud.chaosgame.model.transformations.JuliaTransform;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;