From 3ca526e0f1c7da28f8458169973ea0a91bbd2f56 Mon Sep 17 00:00:00 2001
From: Mei Chang van der Werff <m.c.l.werff@student.tudelft.nl>
Date: Thu, 22 Jan 2026 19:07:26 +0100
Subject: [PATCH] switched to switch case

---
 .../main/java/commons/FormalIngredient.java   | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/commons/src/main/java/commons/FormalIngredient.java b/commons/src/main/java/commons/FormalIngredient.java
index b977ab3..58f3c76 100644
--- a/commons/src/main/java/commons/FormalIngredient.java
+++ b/commons/src/main/java/commons/FormalIngredient.java
@@ -72,35 +72,39 @@ public class FormalIngredient extends RecipeIngredient implements Scalable<Forma
         Unit currentUnit = unit.get();
         double baseAmount = amount * currentUnit.conversionFactor;
 
-        if(currentUnit == Unit.GRAMME){
-            if(baseAmount >= Unit.TONNE.conversionFactor){
-                return baseAmount /Unit.TONNE.conversionFactor + Unit.TONNE.suffix;
+        switch (currentUnit){
+            case GRAMME -> {
+                if(baseAmount >= Unit.TONNE.conversionFactor){
+                    return baseAmount /Unit.TONNE.conversionFactor + Unit.TONNE.suffix;
+                }if(baseAmount >=Unit.KILOGRAMME.conversionFactor) {
+                    return baseAmount / Unit.KILOGRAMME.conversionFactor + Unit.KILOGRAMME.suffix;
+                }
             }
-            if(baseAmount >=Unit.KILOGRAMME.conversionFactor) {
-                return baseAmount / Unit.KILOGRAMME.conversionFactor + Unit.KILOGRAMME.suffix;
+
+            case MILLILITRE -> {
+                if (baseAmount >= Unit.LITRE.conversionFactor) {
+                    return baseAmount /Unit.LITRE.conversionFactor + Unit.LITRE.suffix;
+                }
+            }
+
+            case TABLESPOON -> {
+                if(amount>=tbspToPoundConvert){
+                    return amount/tbspToPoundConvert + Unit.POUND.suffix;
+                }
+                if(amount>=tbspToCupConvert){
+                    return amount /tbspToCupConvert + Unit.CUP.suffix;
+                }
+                if(amount>=tbspToOunceConvert){
+                    return amount /tbspToOunceConvert + Unit.OUNCE.suffix;
+                }
+            }
+
+            case OUNCE -> {
+                if (baseAmount >= OunceToPoundConvert) {
+                    return amount / OunceToPoundConvert + Unit.POUND.suffix;
+                }
             }
         }
-
-        if (currentUnit == Unit.MILLILITRE && baseAmount >= Unit.LITRE.conversionFactor) {
-            return baseAmount /Unit.LITRE.conversionFactor + Unit.LITRE.suffix;
-        }
-
-
-        if(currentUnit == Unit.TABLESPOON){
-            if(amount>=tbspToPoundConvert){
-                return amount/tbspToPoundConvert + Unit.POUND.suffix;
-            }
-            if(amount>=tbspToCupConvert){
-                return amount /tbspToCupConvert + Unit.CUP.suffix;
-            }
-            if(amount>=tbspToOunceConvert){
-                return amount /tbspToOunceConvert + Unit.OUNCE.suffix;
-            }
-        }
-        if (currentUnit == Unit.OUNCE && baseAmount >= OunceToPoundConvert) {
-            return amount / OunceToPoundConvert + Unit.POUND.suffix;
-        }
-
         return amount + currentUnit.suffix;
     }