diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java index de5d08a21688c7fa5f13407939d333a0bfc22450..585ddf65b9128b6d280458b19594aa13ab8a8c4b 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java @@ -65,7 +65,7 @@ public class AddIngredientController implements Initializable { ingredientsList = stringIngredients.stream().toArray(String[] ::new); ingredients = FXCollections.observableArrayList(stringIngredients); // Fill list with ingredients - listView.setItems(ingredients); + listView.setItems(ingredients.sorted()); } diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/SuggestRecipesController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/SuggestRecipesController.java index 83e531dd39134a640ba47d108e68cf73da7cf1b1..b75c3666373f334706844506d0b14f8955a5667b 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/SuggestRecipesController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/SuggestRecipesController.java @@ -79,7 +79,7 @@ public class SuggestRecipesController implements Initializable { //TODO: Duplicate code and assertion. assert ingredientsAtHand != null; fridge = FXCollections.observableArrayList(ingredientsAtHand.getIngredientsAtHand().stream().map(foodItem -> foodItem.label).toList()); - fridgeList.setItems(fridge); + fridgeList.setItems(fridge.sorted()); setRecipeTiles(); }else if(clickedButton.get() == ButtonType.CANCEL) { @@ -96,7 +96,7 @@ public class SuggestRecipesController implements Initializable { //TODO: Remove toUppercase solution above. //TODO: Consider factoring out to a update method. fridge = FXCollections.observableArrayList(ingredientsAtHand.getIngredientsAtHand().stream().map(foodItem -> foodItem.label).toList()); - fridgeList.setItems(fridge); + fridgeList.setItems(fridge.sorted()); setRecipeTiles(); } @@ -187,7 +187,7 @@ public class SuggestRecipesController implements Initializable { ingredientsAtHand = FileHandler.readIngredientsAtHand("Fridge"); fridge = FXCollections.observableArrayList(ingredientsAtHand.getIngredientsAtHand().stream().map(foodItem -> foodItem.label).toList()); //List<String> fridgeLabels = fridge; - fridgeList.setItems(fridge); + fridgeList.setItems(fridge.sorted()); recipeRegister = FileHandler.readRecipeRegister("Recipes"); recipes = FXCollections.observableArrayList(recipeRegister.getRecipes()); diff --git a/src/main/resources/recipes/Fridge.register b/src/main/resources/recipes/Fridge.register index 83848d6fd226f7551f15576b03c66454ca5bddd2..0e4a95b22b3310d0ce09df8bebd3d056e747f807 100644 --- a/src/main/resources/recipes/Fridge.register +++ b/src/main/resources/recipes/Fridge.register @@ -1,4 +1,3 @@ -TOMATO WHEAT_FLOUR ONION EGG @@ -20,3 +19,4 @@ OLIVE_OIL OIL BUTTER GARLIC_CLOVE +HAM