Merge branch '13-1-1-hot-fix-pomfile' into 'main'

Fixed pom.xml with correct dependencies and added correct package structure to the project

Closes #13

See merge request !15

ChaosGame/pom.xml

@@ -26,11 +26,6 @@
             <artifactId>javafx-controls</artifactId>
             <version>21.0.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-fxml</artifactId>
-            <version>21.0.1</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -40,23 +35,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.12.1</version>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.1</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <Main-Class>demo.parallel.MainApp</Main-Class>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -78,7 +56,7 @@
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.8</version>
                 <configuration>
-                    <mainClass>demo.parallel.Main</mainClass>
+                    <mainClass>edu.ntnu.idatt2003.group6.App</mainClass>
                 </configuration>
             </plugin>
         </plugins>

ChaosGame/src/main/java/Main.java → ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/App.java

-public class Main {
+package edu.ntnu.idatt2003.group6;
+
+public class App {
 
   public static void main(String[] args) {
     System.out.println("Main");

ChaosGame/src/main/java/models/matrix/Matrix2x2.java → ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/matrix/Matrix2x2.java

-package models.matrix;
+package edu.ntnu.idatt2003.group6.models.matrix;
 
-import models.vector.Vector2D;
-import utils.Utils;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.utils.Utils;
 
 /**
  * This class represents a 2x2 matrix.It contains the components of the matrix and methods to

ChaosGame/src/main/java/models/transformation/AffineTransform2D.java → ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/AffineTransform2D.java

-package models.transformation;
+package edu.ntnu.idatt2003.group6.models.transformation;
 
-import models.matrix.Matrix2x2;
-import models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.matrix.Matrix2x2;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
 
 /**
  * This class represents an affine transformation in 2D space. It contains a 2x2 matrix and a 2D

ChaosGame/src/main/java/models/transformation/JuliaTransform.java → ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/JuliaTransform.java

-package models.transformation;
+package edu.ntnu.idatt2003.group6.models.transformation;
 
-import models.vector.Complex;
-import models.vector.Vector2D;
-import utils.Utils;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.vector.Complex;
+import edu.ntnu.idatt2003.group6.utils.Utils;
 
 /**
  * This class represents a Julia transformation in 2D space. It contains a complex number

ChaosGame/src/main/java/models/transformation/Transform2D.java → ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/transformation/Transform2D.java

-package models.transformation;
+package edu.ntnu.idatt2003.group6.models.transformation;
 
-import models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
 
 /**
  * This interface represents a 2D transformation.

ChaosGame/src/main/java/models/vector/Complex.java → ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/vector/Complex.java

-package models.vector;
+package edu.ntnu.idatt2003.group6.models.vector;
 
 /**
  * This class represents a complex number in 2D space. It contains the real and imaginary parts of

ChaosGame/src/main/java/models/vector/Vector2D.java → ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/models/vector/Vector2D.java

-package models.vector;
+package edu.ntnu.idatt2003.group6.models.vector;
 
-import utils.Utils;
+import edu.ntnu.idatt2003.group6.utils.Utils;
 
 /**
  * This class represents a 2D vector. It contains the components of the vector and methods to add,

ChaosGame/src/main/java/utils/Utils.java → ChaosGame/src/main/java/edu/ntnu/idatt2003/group6/utils/Utils.java

-package utils;
+package edu.ntnu.idatt2003.group6.utils;
 
 import java.util.Scanner;
 

ChaosGame/src/test/java/models/matrix/Matrix2x2Test.java → ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/matrix/Matrix2x2Test.java

-package models.matrix;
+package edu.ntnu.idatt2003.group6.models.matrix;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.matrix.Matrix2x2;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;

ChaosGame/src/test/java/models/transformation/AffineTransform2DTest.java → ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/transformation/AffineTransform2DTest.java

-package models.transformation;
+package edu.ntnu.idatt2003.group6.models.transformation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import models.matrix.Matrix2x2;
-import models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.matrix.Matrix2x2;
+import edu.ntnu.idatt2003.group6.models.transformation.AffineTransform2D;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;

ChaosGame/src/test/java/models/transformation/JuliaTransformTest.java → ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/transformation/JuliaTransformTest.java

-package models.transformation;
+package edu.ntnu.idatt2003.group6.models.transformation;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import models.vector.Complex;
-import models.vector.Vector2D;
+import edu.ntnu.idatt2003.group6.models.transformation.JuliaTransform;
+import edu.ntnu.idatt2003.group6.models.vector.Complex;
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;

ChaosGame/src/test/java/models/vector/ComplexTest.java → ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/vector/ComplexTest.java

-package models.vector;
+package edu.ntnu.idatt2003.group6.models.vector;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import edu.ntnu.idatt2003.group6.models.vector.Complex;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;

ChaosGame/src/test/java/models/vector/Vector2DTest.java → ChaosGame/src/test/java/edu/ntnu/idatt2003/group6/models/vector/Vector2DTest.java

-package models.vector;
+package edu.ntnu.idatt2003.group6.models.vector;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;