|
|
@@ -1,12 +1,8 @@
|
|
|
package org.leumasjaffe.recipe.view;
|
|
|
|
|
|
import javax.swing.JFrame;
|
|
|
-import javax.swing.JTabbedPane;
|
|
|
|
|
|
import org.leumasjaffe.recipe.controller.FileController;
|
|
|
-import org.leumasjaffe.recipe.model.Element;
|
|
|
-import org.leumasjaffe.recipe.model.RecipeCard;
|
|
|
-import org.leumasjaffe.recipe.view.summary.SummaryPanel;
|
|
|
|
|
|
import lombok.AccessLevel;
|
|
|
import lombok.experimental.FieldDefaults;
|
|
|
@@ -16,12 +12,11 @@ import javax.swing.JMenu;
|
|
|
|
|
|
@SuppressWarnings("serial")
|
|
|
@FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
|
|
|
-public class RecipeManagerFrame extends JFrame implements FileController.ViewModel {
|
|
|
- SummaryPanel summaryPanel;
|
|
|
- JTabbedPane tabbedPane;
|
|
|
+public class RecipeManagerFrame extends JFrame {
|
|
|
|
|
|
public RecipeManagerFrame() {
|
|
|
- FileController fileController = new FileController(this);
|
|
|
+ RecipeCardPanel panel = new RecipeCardPanel();
|
|
|
+ FileController fileController = new FileController(panel);
|
|
|
|
|
|
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
|
|
|
|
|
@@ -31,12 +26,8 @@ public class RecipeManagerFrame extends JFrame implements FileController.ViewMod
|
|
|
JMenu mnFile = new FileMenu(this, fileController);
|
|
|
menuBar.add(mnFile);
|
|
|
|
|
|
- tabbedPane = new JTabbedPane();
|
|
|
- setContentPane(tabbedPane);
|
|
|
+ setContentPane(panel);
|
|
|
|
|
|
- summaryPanel = new SummaryPanel();
|
|
|
- tabbedPane.addTab("Summary", summaryPanel);
|
|
|
-
|
|
|
// fileController.create();
|
|
|
fileController.open("src/test/resources/example.json");
|
|
|
|
|
|
@@ -44,15 +35,4 @@ public class RecipeManagerFrame extends JFrame implements FileController.ViewMod
|
|
|
repaint();
|
|
|
setVisible(true);
|
|
|
}
|
|
|
-
|
|
|
- @Override
|
|
|
- public void setModel(final RecipeCard card) {
|
|
|
- // TODO Clear underlying panels
|
|
|
- card.getElements().forEach(this::addElements);
|
|
|
- }
|
|
|
-
|
|
|
- private void addElements(final Element comp) {
|
|
|
- summaryPanel.addProduct(comp);
|
|
|
- tabbedPane.addTab(comp.getName(), new ElementPanel(comp));
|
|
|
- }
|
|
|
}
|