Update with new feature in observable:0.4.0

pom.xml

@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.leumasjaffe</groupId>
       <artifactId>observer</artifactId>
-      <version>0.3</version>
+      <version>0.4.0</version>
     </dependency>
     <dependency>
       <groupId>org.leumasjaffe</groupId>

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

@@ -2,8 +2,7 @@ package org.leumasjaffe.recipe.view;
 
 import javax.swing.JPanel;
 
-import org.leumasjaffe.observer.IndirectObservableListener;
-import org.leumasjaffe.observer.ObserverDispatch;
+import org.leumasjaffe.observer.ForwardingObservableListener;
 import org.leumasjaffe.recipe.model.Card;
 import org.leumasjaffe.recipe.model.Preparation;
 import org.leumasjaffe.recipe.model.Rest;
@@ -13,7 +12,7 @@ import org.jdesktop.swingx.VerticalLayout;
 @SuppressWarnings("serial")
 public class CardPanel extends JPanel {
 	private int steps = 0;
-	private final IndirectObservableListener<CardPanel, Card> listener;
+	private final ForwardingObservableListener<Card> listener = new ForwardingObservableListener<>();
 
 	public CardPanel(final Card card) {		
 		setLayout(new VerticalLayout(5));
@@ -21,9 +20,6 @@ public class CardPanel extends JPanel {
 		card.getPreparation().ifPresent(this::addPrep);
 		card.getCooking().forEach(this::addStep);
 		card.getRest().ifPresent(this::addRest);
-		listener = new IndirectObservableListener<>(this, (c, t) -> {
-			ObserverDispatch.notifySubscribers(t);
-		});
 		listener.setObserved(card, card.getCooking().toArray(new Step[0]));
 	}
 	

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

@@ -3,8 +3,7 @@ package org.leumasjaffe.recipe.view;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
-import org.leumasjaffe.observer.IndirectObservableListener;
-import org.leumasjaffe.observer.ObserverDispatch;
+import org.leumasjaffe.observer.ForwardingObservableListener;
 import org.leumasjaffe.recipe.model.Card;
 import org.leumasjaffe.recipe.model.Product;
 import org.jdesktop.swingx.VerticalLayout;
@@ -15,7 +14,7 @@ import javax.swing.JSeparator;
 @SuppressWarnings("serial")
 public class ProductPanel extends JScrollPane {
 	private JPanel panelViewPort;
-	private final IndirectObservableListener<ProductPanel, Product> listener;
+	private final ForwardingObservableListener<Product> listener = new ForwardingObservableListener<>();
 
 	public ProductPanel(Product product) {
 		JPanel panelColumnHeader = new JPanel();
@@ -33,9 +32,6 @@ public class ProductPanel extends JScrollPane {
 			panelViewPort.add(new JSeparator());
 		}
 		
-		listener = new IndirectObservableListener<>(this, (c, t) -> {
-			ObserverDispatch.notifySubscribers(t);
-		});
 		listener.setObserved(product, product.getCards().toArray(new Card[0]));
 	}
 }

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

@@ -3,8 +3,7 @@ package org.leumasjaffe.recipe.view;
 import javax.swing.JPanel;
 import javax.swing.event.DocumentListener;
 
-import org.leumasjaffe.observer.IndirectObservableListener;
-import org.leumasjaffe.observer.ObserverDispatch;
+import org.leumasjaffe.observer.ForwardingObservableListener;
 import org.leumasjaffe.recipe.model.Ingredient;
 import org.leumasjaffe.recipe.model.Step;
 
@@ -23,7 +22,7 @@ import java.awt.Dimension;
 public class StepPanel extends JPanel implements AutoGrowPanel.DocumentListenable {
 	private JLabel lblIndex;
 	private JTextPane txtpnInstructions;
-	private final IndirectObservableListener<StepPanel, Step> listener;
+	private final ForwardingObservableListener<Step> listener = new ForwardingObservableListener<>();
 		
 	public StepPanel(int zeroIndex, Step step) {
 		GridBagLayout gridBagLayout = new GridBagLayout();
@@ -88,9 +87,6 @@ public class StepPanel extends JPanel implements AutoGrowPanel.DocumentListenabl
 		add(txtpnInstructions, gbc_txtpnInstructions);
 		
 		setListPosition(zeroIndex);
-		listener = new IndirectObservableListener<>(this, (c, t) -> {
-			ObserverDispatch.notifySubscribers(t);
-		});
 		listener.setObserved(step, step.getIngredients().toArray(new Ingredient[0]));
 	}