Rename Product -> Element

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

@@ -9,7 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data @EqualsAndHashCode(callSuper=false)
-public class Product extends Observable.Instance implements CompoundRecipeComponent {
+public class Element extends Observable.Instance implements CompoundRecipeComponent {
 	String name;
 	List<Phase> phases;
 

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

@@ -16,15 +16,15 @@ public class Recipe implements CompoundRecipeComponent {
 	int servings;
 	// TODO: Nutrition information
 	Optional<ImageIcon> photo; // TODO JSONIZATION	
-	List<Product> products = new ArrayList<>();
+	List<Element> elements = new ArrayList<>();
 	
 	@Override
-	public Stream<Product> getComponents() {
-		return products.stream();
+	public Stream<Element> getComponents() {
+		return elements.stream();
 	}
 	
 	@Override
 	public Stream<Ingredient> getIngredientsAsStream() {
-		return getComponents().flatMap(Product::getIngredientsAsStream);
+		return getComponents().flatMap(Element::getIngredientsAsStream);
 	}
 }

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

@@ -6,7 +6,7 @@ import javax.swing.JScrollPane;
 import org.leumasjaffe.observer.ForwardingObservableListener;
 import org.leumasjaffe.observer.ObserverDispatch;
 import org.leumasjaffe.recipe.model.Phase;
-import org.leumasjaffe.recipe.model.Product;
+import org.leumasjaffe.recipe.model.Element;
 
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
@@ -18,11 +18,11 @@ import javax.swing.JSeparator;
 
 @SuppressWarnings("serial")
 @FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
-public class ProductPanel extends JScrollPane {
+public class ElementPanel extends JScrollPane {
 	JPanel panelViewPort;
-	ForwardingObservableListener<Product> listener = new ForwardingObservableListener<>();
+	ForwardingObservableListener<Element> listener = new ForwardingObservableListener<>();
 
-	public ProductPanel(Product product) {
+	public ElementPanel(Element element) {
 		JPanel panelColumnHeader = new JPanel();
 		setColumnHeaderView(panelColumnHeader);
 		
@@ -33,12 +33,12 @@ public class ProductPanel extends JScrollPane {
 		setViewportView(panelViewPort);
 		panelViewPort.setLayout(new VerticalLayout(5));
 				
-		for (final Phase phase : product.getPhases()) {
+		for (final Phase phase : element.getPhases()) {
 			panelViewPort.add(new PhasePanel(phase));
 			panelViewPort.add(new JSeparator());
 		}
 		
-		listener.setObserved(product, product.getPhases());
+		listener.setObserved(element, element.getPhases());
 	}
 	
 	@Override

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

@@ -5,7 +5,7 @@ import javax.swing.JPanel;
 import org.jdesktop.swingx.VerticalLayout;
 import org.leumasjaffe.observer.ObservableListener;
 import org.leumasjaffe.observer.ObserverDispatch;
-import org.leumasjaffe.recipe.model.Product;
+import org.leumasjaffe.recipe.model.Element;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -19,12 +19,12 @@ import java.awt.GridBagConstraints;
 
 @SuppressWarnings("serial")
 @FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
-public class ProductSummaryPanel extends JPanel {
-	ObservableListener<JPanel, Product> listener;
+public class ElementSummaryPanel extends JPanel {
+	ObservableListener<JPanel, Element> listener;
 	@Getter(AccessLevel.PACKAGE) JLabel lblProductName;
 	@Getter(AccessLevel.PACKAGE) JPanel panelIngredients;
 	
-	public ProductSummaryPanel(final Product product) {
+	public ElementSummaryPanel(final Element element) {
 		GridBagLayout gridBagLayout = new GridBagLayout();
 		gridBagLayout.columnWidths = new int[]{0, 0, 0};
 		gridBagLayout.rowHeights = new int[]{0, 0, 0};
@@ -32,7 +32,7 @@ public class ProductSummaryPanel extends JPanel {
 		gridBagLayout.rowWeights = new double[]{0.0, 1.0, Double.MIN_VALUE};
 		setLayout(gridBagLayout);
 		
-		lblProductName = new JLabel(product.getName());
+		lblProductName = new JLabel(element.getName());
 		GridBagConstraints gbc_lblProductName = new GridBagConstraints();
 		gbc_lblProductName.insets = new Insets(0, 0, 5, 5);
 		gbc_lblProductName.gridx = 0;
@@ -51,9 +51,9 @@ public class ProductSummaryPanel extends JPanel {
 		
 		listener = new ObservableListener<>(panelIngredients, (c, t) -> {
 			c.removeAll();
-			product.getIngredients().stream().map(SummaryIngredientPanel::new).forEach(c::add);
+			element.getIngredients().stream().map(SummaryIngredientPanel::new).forEach(c::add);
 		});
-		listener.setObserved(product);
+		listener.setObserved(element);
 	}
 	
 	@Override

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

@@ -4,7 +4,7 @@ import javax.swing.JFrame;
 import javax.swing.JTabbedPane;
 
 import org.leumasjaffe.recipe.controller.FileController;
-import org.leumasjaffe.recipe.model.Product;
+import org.leumasjaffe.recipe.model.Element;
 import org.leumasjaffe.recipe.model.Recipe;
 
 import lombok.AccessLevel;
@@ -47,11 +47,11 @@ public class RecipeFrame extends JFrame implements FileController.ViewModel {
 	@Override
 	public void setModel(final Recipe recipe) {
 		// TODO Clear underlying panels
-		recipe.getProducts().forEach(this::addProduct);
+		recipe.getElements().forEach(this::addElements);
 	}
 	
-	private void addProduct(final Product comp) {
+	private void addElements(final Element comp) {
 		summaryPanel.addProduct(comp);
-		tabbedPane.addTab(comp.getName(), new ProductPanel(comp));
+		tabbedPane.addTab(comp.getName(), new ElementPanel(comp));
 	}
 }

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

@@ -12,7 +12,7 @@ import javax.swing.JTextField;
 import javax.swing.JTextPane;
 
 import org.jdesktop.swingx.VerticalLayout;
-import org.leumasjaffe.recipe.model.Product;
+import org.leumasjaffe.recipe.model.Element;
 
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
@@ -89,8 +89,8 @@ public class SummaryPanel extends JPanel {
 		add(txtpnDescription, gbc_txtpnDescription);
 	}
 
-	void addProduct(final Product comp) {
-		panelIngredients.add(new ProductSummaryPanel(comp));
+	void addProduct(final Element comp) {
+		panelIngredients.add(new ElementSummaryPanel(comp));
 		panelIngredients.add(new JSeparator());
 	}
 }

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

@@ -8,12 +8,12 @@ import java.util.Arrays;
 
 import org.junit.jupiter.api.Test;
 
-class ProductTest {
+class ElementTest {
 	private static final Amount _1g = new Amount("1 g");
 
 	@Test
 	void testMergesIngredientsWithDifferentPrep() {
-		final Product prod = new Product();
+		final Element prod = new Element();
 		final Phase phase = new Phase();
 		final Step step = new Step();
 		step.setIngredients(Arrays.asList(

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

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

src/test/java/org/leumasjaffe/recipe/view/ProductPanelTest.java

@@ -12,24 +12,24 @@ import org.junit.runner.RunWith;
 import org.leumasjaffe.mock.MockObserverListener;
 import org.leumasjaffe.observer.ObserverDispatch;
 import org.leumasjaffe.recipe.model.Phase;
-import org.leumasjaffe.recipe.model.Product;
+import org.leumasjaffe.recipe.model.Element;
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
 @RunWith(JUnitPlatform.class)
-class ProductPanelTest extends SwingTestCase {
+class ElementPanelTest extends SwingTestCase {
 	
 	@Spy MockObserverListener listener;
 	final Phase stub = new Phase();
-	@Mock Product stuff;
-	ProductPanel panel;
+	@Mock Element stuff;
+	ElementPanel panel;
 
 	@BeforeEach
 	void setUp() {
 		doReturn(Arrays.asList(stub)).when(stuff).getPhases();
-		panel = new ProductPanel(stuff);
+		panel = new ElementPanel(stuff);
 		
 		listener.setObserved(stuff);
 		// setObserved() calls update

src/test/java/org/leumasjaffe/recipe/view/ProductSummaryPanelTest.java

@@ -15,16 +15,16 @@ import org.junit.runner.RunWith;
 import org.leumasjaffe.observer.ObserverDispatch;
 import org.leumasjaffe.recipe.model.Amount;
 import org.leumasjaffe.recipe.model.Ingredient;
-import org.leumasjaffe.recipe.model.Product;
+import org.leumasjaffe.recipe.model.Element;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
 @RunWith(JUnitPlatform.class)
-class ProductSummaryPanelTest extends SwingTestCase {
+class ElementSummaryPanelTest extends SwingTestCase {
 	
-	@Mock Product stuff;
-	ProductSummaryPanel panel;
+	@Mock Element stuff;
+	ElementSummaryPanel panel;
 	
 	@BeforeEach
 	void setUp() {
@@ -34,7 +34,7 @@ class ProductSummaryPanelTest extends SwingTestCase {
 				new Ingredient("Garlic", "", new Amount("2 tsp"))))
 		.when(stuff).getIngredients();
 		
-		panel = new ProductSummaryPanel(stuff);
+		panel = new ElementSummaryPanel(stuff);
 	}
 
 	@Test

src/test/resources/example.json

@@ -1,7 +1,7 @@
 {
   "title": "Peanut Chicken Curry",
   "description": "A fusion style peanut-butter based chicken curry from Chef John of FoodWishes.com",
-  "products": [
+  "elements": [
     {
       "name": "Curry",
       "phases": [