Skip to content
Snippets Groups Projects
Commit 79a5664c authored by Sigurd Spook's avatar Sigurd Spook
Browse files

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

parent d44fbb02
No related branches found
No related tags found
1 merge request!15Fixed pom.xml with correct dependencies and added correct package structure to the project
Pipeline #260122 passed
Showing
with 35 additions and 50 deletions
...@@ -26,11 +26,6 @@ ...@@ -26,11 +26,6 @@
<artifactId>javafx-controls</artifactId> <artifactId>javafx-controls</artifactId>
<version>21.0.1</version> <version>21.0.1</version>
</dependency> </dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>21.0.1</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -40,23 +35,6 @@ ...@@ -40,23 +35,6 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version> <version>3.12.1</version>
</plugin> </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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
...@@ -78,7 +56,7 @@ ...@@ -78,7 +56,7 @@
<artifactId>javafx-maven-plugin</artifactId> <artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version> <version>0.0.8</version>
<configuration> <configuration>
<mainClass>demo.parallel.Main</mainClass> <mainClass>edu.ntnu.idatt2003.group6.App</mainClass>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
......
public class Main { package edu.ntnu.idatt2003.group6;
public class App {
public static void main(String[] args) { public static void main(String[] args) {
System.out.println("Main"); System.out.println("Main");
......
package models.matrix; package edu.ntnu.idatt2003.group6.models.matrix;
import models.vector.Vector2D; import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
import utils.Utils; import edu.ntnu.idatt2003.group6.utils.Utils;
/** /**
* This class represents a 2x2 matrix.It contains the components of the matrix and methods to * This class represents a 2x2 matrix.It contains the components of the matrix and methods to
......
package models.transformation; package edu.ntnu.idatt2003.group6.models.transformation;
import models.matrix.Matrix2x2; import edu.ntnu.idatt2003.group6.models.matrix.Matrix2x2;
import models.vector.Vector2D; 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 * This class represents an affine transformation in 2D space. It contains a 2x2 matrix and a 2D
......
package models.transformation; package edu.ntnu.idatt2003.group6.models.transformation;
import models.vector.Complex; import edu.ntnu.idatt2003.group6.models.vector.Vector2D;
import models.vector.Vector2D; import edu.ntnu.idatt2003.group6.models.vector.Complex;
import utils.Utils; import edu.ntnu.idatt2003.group6.utils.Utils;
/** /**
* This class represents a Julia transformation in 2D space. It contains a complex number * This class represents a Julia transformation in 2D space. It contains a complex number
......
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. * This interface represents a 2D transformation.
......
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 * This class represents a complex number in 2D space. It contains the real and imaginary parts of
......
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, * This class represents a 2D vector. It contains the components of the vector and methods to add,
......
package utils; package edu.ntnu.idatt2003.group6.utils;
import java.util.Scanner; import java.util.Scanner;
......
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.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail; 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.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
......
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.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.fail;
import models.matrix.Matrix2x2; import edu.ntnu.idatt2003.group6.models.matrix.Matrix2x2;
import models.vector.Vector2D; 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.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
......
package models.transformation; package edu.ntnu.idatt2003.group6.models.transformation;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import models.vector.Complex; import edu.ntnu.idatt2003.group6.models.transformation.JuliaTransform;
import models.vector.Vector2D; 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.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
......
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.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail; 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.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
......
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.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail; 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.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment