|
|
@@ -28,7 +28,6 @@ import java.awt.Dimension;
|
|
|
@FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
|
|
|
public class StepPanel extends JPanel implements AutoGrowPanel.DocumentListenable {
|
|
|
@Getter(AccessLevel.PACKAGE) JLabel lblIndex;
|
|
|
- @Getter(AccessLevel.PACKAGE) JLabel lblDuration;
|
|
|
@Getter(AccessLevel.PACKAGE) JTextPane txtpnInstructions;
|
|
|
@Getter(AccessLevel.PACKAGE) JPanel panelIngredients;
|
|
|
ForwardingObservableListener<Step> listener = new ForwardingObservableListener<>();
|
|
|
@@ -70,12 +69,12 @@ public class StepPanel extends JPanel implements AutoGrowPanel.DocumentListenabl
|
|
|
gbc_horizontalGlue.gridy = 0;
|
|
|
panelLeft.add(horizontalGlue, gbc_horizontalGlue);
|
|
|
|
|
|
- lblDuration = new JLabel("Requires: " + step.getDuration().toString());
|
|
|
- GridBagConstraints gbc_lblDuration = new GridBagConstraints();
|
|
|
- gbc_lblDuration.insets = new Insets(0, 0, 5, 0);
|
|
|
- gbc_lblDuration.gridx = 2;
|
|
|
- gbc_lblDuration.gridy = 0;
|
|
|
- panelLeft.add(lblDuration, gbc_lblDuration);
|
|
|
+ DurationPanel panelDuration = new DurationPanel("Requires", step.getDuration());
|
|
|
+ GridBagConstraints gbc_panelDuration = new GridBagConstraints();
|
|
|
+ gbc_panelDuration.insets = new Insets(0, 0, 5, 0);
|
|
|
+ gbc_panelDuration.gridx = 2;
|
|
|
+ gbc_panelDuration.gridy = 0;
|
|
|
+ panelLeft.add(panelDuration, gbc_panelDuration);
|
|
|
|
|
|
final List<Ingredient> ingredients = step.getIngredients();
|
|
|
panelIngredients = new AutoGrowPanel(IngredientPanel::new,
|