Browse Source

Add Observable project, mark Ingredients (IngredientPanel) and Products (ProductSummaryPanel).

Sam Jaffe 5 năm trước cách đây
mục cha
commit
0a4fc0541c

+ 5 - 0
pom.xml

@@ -55,6 +55,11 @@
     </plugins>
   </build>
   <dependencies>
+    <dependency>
+      <groupId>org.leumasjaffe</groupId>
+      <artifactId>observer</artifactId>
+      <version>0.3</version>
+    </dependency>
     <dependency>
       <groupId>org.leumasjaffe</groupId>
       <artifactId>event</artifactId>

+ 5 - 2
src/main/lombok/org/leumasjaffe/recipe/model/Ingredient.java

@@ -1,11 +1,14 @@
 package org.leumasjaffe.recipe.model;
 
+import org.leumasjaffe.observer.Observable;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-@Data @AllArgsConstructor @NoArgsConstructor
-public class Ingredient {
+@Data @AllArgsConstructor @NoArgsConstructor @EqualsAndHashCode(callSuper=false)
+public class Ingredient extends Observable.Instance {
 	String name;
 	String preparation = "";
 	Amount amount;

+ 5 - 2
src/main/lombok/org/leumasjaffe/recipe/model/Product.java

@@ -3,10 +3,13 @@ package org.leumasjaffe.recipe.model;
 import java.util.List;
 import java.util.stream.Stream;
 
+import org.leumasjaffe.observer.Observable;
+
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-@Data
-public class Product implements CompoundRecipeComponent {
+@Data @EqualsAndHashCode(callSuper=false)
+public class Product extends Observable.Instance implements CompoundRecipeComponent {
 	String name;
 	List<Card> cards;