backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS and fixed stevens and oskarsss problems

commons/src/main/java/commons/RecipeIngredient.java

@@ -65,14 +65,11 @@ public class RecipeIngredient {
         };
     }
 
-    public boolean isInformal() {
+
-        Unit unit = getUnit();
-        return unit != null && !unit.isFormal();
-    }
 
     public double amountInBaseUnit() {
         Unit unit = getUnit();
-        if (unit == null || !unit.isFormal() || unit.conversionFactor <= 0) {
+        if (unit == null || unit.isFormal() || unit.conversionFactor <= 0) {
             return 0.0;
         }
         return amount * unit.conversionFactor;

commons/src/main/java/commons/Unit.java

@@ -51,6 +51,10 @@ public final class Unit {
         return formal;
     }
 
+    public boolean isInformal() {
+        return !formal;
+    }  //for oskar
+
     @Override
     public String toString() {
         return name;