diff --git a/commons/src/main/java/commons/Ingredient.java b/commons/src/main/java/commons/Ingredient.java index dd93aab..5704b74 100644 --- a/commons/src/main/java/commons/Ingredient.java +++ b/commons/src/main/java/commons/Ingredient.java @@ -103,6 +103,14 @@ public class Ingredient { public int hashCode() { return Objects.hash(id, name, proteinPer100g, fatPer100g, carbsPer100g); } + + @Override + public String toString() { + return "Ingredient " + id + " - " + name + + "= P:" + proteinPer100g + + "/F:" + fatPer100g + + "/C:" + carbsPer100g + " per 100g"; + } } diff --git a/commons/src/main/java/commons/Recipe.java b/commons/src/main/java/commons/Recipe.java index 1ae1f83..5c9b19e 100644 --- a/commons/src/main/java/commons/Recipe.java +++ b/commons/src/main/java/commons/Recipe.java @@ -157,12 +157,10 @@ public class Recipe { @Override public String toString() { - return "Recipe{" + - "id=" + id + - ", name='" + name + '\'' + - ", ingredientsCount=" + ingredients.size() + - ", preparationStepsCount=" + preparationSteps.size() + - "}"; + return "Recipe " + id + + " - " + name + + ": " + ingredients.size() + " ingredients / " + + preparationSteps.size() + " steps"; } @SuppressWarnings("unused")