Rename Recipe -> RecipeCard; RecipeFrame -> RecipeManagerFrame

src/main/lombok/org/leumasjaffe/recipe/RecipeManager.java

@@ -1,6 +1,6 @@
 package org.leumasjaffe.recipe;
 
-import org.leumasjaffe.recipe.view.RecipeFrame;
+import org.leumasjaffe.recipe.view.RecipeManagerFrame;
 
 import lombok.experimental.UtilityClass;
 
@@ -8,7 +8,7 @@ import lombok.experimental.UtilityClass;
 public class RecipeManager {
 
 	public void main(String[] args) {
-		new RecipeFrame().setVisible(true);
+		new RecipeManagerFrame().setVisible(true);
 	}
 
 }

src/main/lombok/org/leumasjaffe/recipe/controller/FileController.java

@@ -10,7 +10,7 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
 
-import org.leumasjaffe.recipe.model.Recipe;
+import org.leumasjaffe.recipe.model.RecipeCard;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -25,13 +25,13 @@ import lombok.experimental.NonFinal;
 @FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
 public class FileController {
 	public static interface ViewModel {
-		void setModel(Recipe model);
+		void setModel(RecipeCard model);
 	}
 	
 	private static final ObjectMapper mapper;
 	SaveLoadHandle handle;
 	ViewModel viewmodel;
-	@NonFinal Recipe model = null;
+	@NonFinal RecipeCard model = null;
 	
 	static {
 		mapper = new ObjectMapper();
@@ -44,7 +44,7 @@ public class FileController {
 	}
 	
 	public void create() {
-		setModel(new Recipe());
+		setModel(new RecipeCard());
 	}
 	
 	public void save() {
@@ -69,7 +69,7 @@ public class FileController {
 	private void load(final Reader reader) {
 		try (Reader in = reader;
 				BufferedReader buf = new BufferedReader(in)) {
-			setModel(mapper.readValue(in, Recipe.class));
+			setModel(mapper.readValue(in, RecipeCard.class));
 		} catch (IOException ioe) {
 			handle.error(ioe);
 		}
@@ -84,8 +84,8 @@ public class FileController {
 		}
 	}
 	
-	private void setModel(Recipe recipe) {
-		this.model = recipe;
-		viewmodel.setModel(recipe);
+	private void setModel(RecipeCard card) {
+		this.model = card;
+		viewmodel.setModel(card);
 	}
 }

src/main/lombok/org/leumasjaffe/recipe/model/Recipe.java

@@ -10,7 +10,7 @@ import javax.swing.ImageIcon;
 import lombok.Data;
 
 @Data
-public class Recipe implements CompoundRecipeComponent {
+public class RecipeCard implements CompoundRecipeComponent {
 	String title;
 	String description;
 	int servings;

src/main/lombok/org/leumasjaffe/recipe/view/RecipeFrame.java

@@ -5,7 +5,7 @@ import javax.swing.JTabbedPane;
 
 import org.leumasjaffe.recipe.controller.FileController;
 import org.leumasjaffe.recipe.model.Element;
-import org.leumasjaffe.recipe.model.Recipe;
+import org.leumasjaffe.recipe.model.RecipeCard;
 import org.leumasjaffe.recipe.view.summary.SummaryPanel;
 
 import lombok.AccessLevel;
@@ -16,11 +16,11 @@ import javax.swing.JMenu;
 
 @SuppressWarnings("serial")
 @FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
-public class RecipeFrame extends JFrame implements FileController.ViewModel {
+public class RecipeManagerFrame extends JFrame implements FileController.ViewModel {
 	SummaryPanel summaryPanel;
 	JTabbedPane tabbedPane;
 	
-	public RecipeFrame() {
+	public RecipeManagerFrame() {
 		FileController fileController = new FileController(this);
 
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -46,9 +46,9 @@ public class RecipeFrame extends JFrame implements FileController.ViewModel {
 	}
 	
 	@Override
-	public void setModel(final Recipe recipe) {
+	public void setModel(final RecipeCard card) {
 		// TODO Clear underlying panels
-		recipe.getElements().forEach(this::addElements);
+		card.getElements().forEach(this::addElements);
 	}
 	
 	private void addElements(final Element comp) {

src/test/java/org/leumasjaffe/recipe/controller/FileControllerTest.java

@@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
-import org.leumasjaffe.recipe.model.Recipe;
+import org.leumasjaffe.recipe.model.RecipeCard;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InOrder;
 import org.mockito.InjectMocks;
@@ -30,14 +30,14 @@ class FileControllerTest {
 	@Test
 	void testCanCreateNewModel() {
 		controller.create();
-		verify(viewmodel).setModel(any(Recipe.class));
+		verify(viewmodel).setModel(any(RecipeCard.class));
 	}
 
 	@Test
 	void testRepeatedCreatesProvideNewObjects() {
 		InOrder inOrder = inOrder(viewmodel);
-		final ArgumentCaptor<Recipe> first = ArgumentCaptor.forClass(Recipe.class);
-		final ArgumentCaptor<Recipe> second = ArgumentCaptor.forClass(Recipe.class);
+		final ArgumentCaptor<RecipeCard> first = ArgumentCaptor.forClass(RecipeCard.class);
+		final ArgumentCaptor<RecipeCard> second = ArgumentCaptor.forClass(RecipeCard.class);
 
 		controller.create();
 		inOrder.verify(viewmodel).setModel(first.capture());

src/test/java/org/leumasjaffe/recipe/model/RecipeTest.java

@@ -13,7 +13,7 @@ class RecipeTest {
 
 	@Test
 	void testMergesIngredientsWithDifferentPrep() {
-		final Recipe recipe = new Recipe();
+		final RecipeCard card = new RecipeCard();
 		final Element prod = new Element();
 		final Phase phase = new Phase();
 		final Step step = new Step();
@@ -22,9 +22,9 @@ class RecipeTest {
 				new Ingredient("TEST", "B", _1g)));
 		phase.setCooking(Arrays.asList(step));
 		prod.setPhases(Arrays.asList(phase));
-		recipe.setElements(Arrays.asList(prod, prod));
-		assertThat(recipe.getIngredients(), hasSize(1));
-		assertThat(recipe.getIngredients(),
+		card.setElements(Arrays.asList(prod, prod));
+		assertThat(card.getIngredients(), hasSize(1));
+		assertThat(card.getIngredients(),
 				hasItem(new Ingredient("TEST", "", new Amount("4 g"))));
 	}