From eb22da0f26878d0a4a26d1fcd08f421b5816ec30 Mon Sep 17 00:00:00 2001
From: Hong An Ho <hongah@stud.ntnu.no>
Date: Wed, 22 May 2024 06:58:14 +0200
Subject: [PATCH] Corrected faults after merge conflict.
---
.../edu/ntnu/idatt2003/util/TransformInput.java | 17 ++++++++++-------
.../edu/ntnu/idatt2003/util/ValidateInput.java | 3 +--
.../AddAffineTransformView.java | 3 +++
.../AddJuliaTransformView.java | 1 -
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/edu/ntnu/idatt2003/util/TransformInput.java b/src/main/java/edu/ntnu/idatt2003/util/TransformInput.java
index 5f6dbd7..dcc7c77 100644
--- a/src/main/java/edu/ntnu/idatt2003/util/TransformInput.java
+++ b/src/main/java/edu/ntnu/idatt2003/util/TransformInput.java
@@ -26,6 +26,10 @@ public class TransformInput {
// Private constructor to prevent instantiation
}
+ public static int getFormattedInt(TextField integer) {
+ return Integer.parseInt(integer.getText().trim());
+ }
+
/**
* Parses and validates two text fields as a 2D vector.
*
@@ -37,8 +41,8 @@ public class TransformInput {
*/
public static Vector2D getFormattedVector2D(TextField x0, TextField x1)
throws EmptyFieldException, InvalidNumberException {
- ValidateInput.validateDoubleInput(x0, "x0");
- ValidateInput.validateDoubleInput(x1, "x1");
+ ValidateInput.validateDoubleInput(x0, "x-value in vector");
+ ValidateInput.validateDoubleInput(x1, "y-value in vector");
double x0Coords = Double.parseDouble(x0.getText().trim());
double x1Coords = Double.parseDouble(x1.getText().trim());
return new Vector2D(x0Coords, x1Coords);
@@ -59,10 +63,10 @@ public class TransformInput {
TextField a00, TextField a01, TextField a10, TextField a11)
throws EmptyFieldException, InvalidNumberException {
- ValidateInput.validateDoubleInput(a00, "a00");
- ValidateInput.validateDoubleInput(a01, "a01");
- ValidateInput.validateDoubleInput(a10, "a10");
- ValidateInput.validateDoubleInput(a11, "a11");
+ ValidateInput.validateDoubleInput(a00, "first row first column");
+ ValidateInput.validateDoubleInput(a01, "first row second column");
+ ValidateInput.validateDoubleInput(a10, "second row first column");
+ ValidateInput.validateDoubleInput(a11, "second row second column");
double a00Coords = Double.parseDouble(a00.getText().trim());
double a01Coords = Double.parseDouble(a01.getText().trim());
@@ -189,5 +193,4 @@ public class TransformInput {
};
}
-
}
diff --git a/src/main/java/edu/ntnu/idatt2003/util/ValidateInput.java b/src/main/java/edu/ntnu/idatt2003/util/ValidateInput.java
index 525b596..97d5895 100644
--- a/src/main/java/edu/ntnu/idatt2003/util/ValidateInput.java
+++ b/src/main/java/edu/ntnu/idatt2003/util/ValidateInput.java
@@ -174,14 +174,13 @@ public class ValidateInput {
* by transformation type.
* @param stepsInput TextField for specifying the number of steps in the transformation.
* @param transformType A string indicating the type of transformation.
- * @return True if all validations pass, indicating that inputs are ready for processing.
* @throws EmptyFieldException If any mandatory field is empty.
* @throws InvalidNumberException If numeric inputs are invalid
* or malformed.
* @throws InvalidTransformationException If the specified transformation
* type is unsupported or not recognized.
*/
- public static boolean validateInputs(
+ public static void validateInputs(
TextField minX0, TextField minX1,
TextField maxX0, TextField maxX1,
List<TextField> transformationsValues,
diff --git a/src/main/java/edu/ntnu/idatt2003/view/transformviews/affinetransformviews/AddAffineTransformView.java b/src/main/java/edu/ntnu/idatt2003/view/transformviews/affinetransformviews/AddAffineTransformView.java
index 05e04a6..24145c1 100644
--- a/src/main/java/edu/ntnu/idatt2003/view/transformviews/affinetransformviews/AddAffineTransformView.java
+++ b/src/main/java/edu/ntnu/idatt2003/view/transformviews/affinetransformviews/AddAffineTransformView.java
@@ -3,6 +3,9 @@ package edu.ntnu.idatt2003.view.transformviews.affinetransformviews;
import edu.ntnu.idatt2003.controller.ChaosGameController;
import edu.ntnu.idatt2003.controller.MainViewController;
import edu.ntnu.idatt2003.model.chaos.ChaosGame;
+import edu.ntnu.idatt2003.model.exceptions.EmptyFieldException;
+import edu.ntnu.idatt2003.model.exceptions.InvalidNumberException;
+import edu.ntnu.idatt2003.model.exceptions.InvalidTransformationException;
import edu.ntnu.idatt2003.view.components.AlertView;
import java.util.List;
import javafx.scene.control.Button;
diff --git a/src/main/java/edu/ntnu/idatt2003/view/transformviews/juliatransformviews/AddJuliaTransformView.java b/src/main/java/edu/ntnu/idatt2003/view/transformviews/juliatransformviews/AddJuliaTransformView.java
index ff438b7..4ccf6db 100644
--- a/src/main/java/edu/ntnu/idatt2003/view/transformviews/juliatransformviews/AddJuliaTransformView.java
+++ b/src/main/java/edu/ntnu/idatt2003/view/transformviews/juliatransformviews/AddJuliaTransformView.java
@@ -32,7 +32,6 @@ public class AddJuliaTransformView extends JuliaTransformView {
/**
* Method for creating a new fractal with Julia Transformation.
*/
-
private void createFractalAction() {
try {
// Validate values in text fields
--
GitLab