steven/csep-2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: vague ingredient description now persists

Browse source
This commit is contained in:
Zhongheng Liu 2026-01-24 14:48:22 +01:00
commit aec8a6bc17
Signed by: steven
GPG key ID: F69B980899C1C09D
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/src/main/java/client/scenes/recipe/IngredientListCell.java
View file

@ -64,18 +64,21 @@ public class IngredientListCell extends OrderedEditableListCell<RecipeIngredient
Optional<Double> templateAmount = Optional.empty(); Optional<Double> templateAmount = Optional.empty();
Optional<Unit> unit = Optional.empty(); Optional<Unit> unit = Optional.empty();
TextField amountInput;
// Initialize the input fields with some initial data if we get a formal ingredient // Initialize the input fields with some initial data if we get a formal ingredient
if (ingredient.getClass().equals(FormalIngredient.class)) { if (ingredient.getClass().equals(FormalIngredient.class)) {
FormalIngredient formal = (FormalIngredient) ingredient; FormalIngredient formal = (FormalIngredient) ingredient;
templateAmount = Optional.of(formal.getAmount()); templateAmount = Optional.of(formal.getAmount());
unit = Optional.of(Unit.fromString(formal.getUnitSuffix()).orElseThrow( unit = Optional.of(Unit.fromString(formal.getUnitSuffix()).orElseThrow(
() -> new RuntimeException("FormalIngredient whereas invalid unit"))); () -> new RuntimeException("FormalIngredient whereas invalid unit")));
amountInput = new TextField(templateAmount.map(Object::toString).orElse(null));
} else {
assert ingredient instanceof VagueIngredient;
amountInput = new TextField(((VagueIngredient) ingredient).getDescription());
} }
// TODO initialize some other data in the case of vague ingredient
// Initialize the input boxes // Initialize the input boxes
TextField amountInput = new TextField(templateAmount.map(Object::toString).orElse(null));
ChoiceBox<Unit> unitChoice = new ChoiceBox<>(); ChoiceBox<Unit> unitChoice = new ChoiceBox<>();
// initialize the current unit if it is present // initialize the current unit if it is present
@ -115,7 +118,6 @@ public class IngredientListCell extends OrderedEditableListCell<RecipeIngredient
menu.setText(getLocaleString("app.prompt.new-ingredient")); // otherwise the text label on menu refuses to update menu.setText(getLocaleString("app.prompt.new-ingredient")); // otherwise the text label on menu refuses to update
selectedIngredient.setValue(null); // indicate null to signal a new ingredient creation selectedIngredient.setValue(null); // indicate null to signal a new ingredient creation
logger.info("Making new ingredient"); logger.info("Making new ingredient");
// TODO printError() integration
TextField newIngredientNameInput = makeNewIngredientNameField(selectedIngredient::set); TextField newIngredientNameInput = makeNewIngredientNameField(selectedIngredient::set);
container.getChildren().add(newIngredientNameInput); container.getChildren().add(newIngredientNameInput);
}); });