X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fwires%2FWire.java;h=12f0f8a96d222e375c6da75e9549088c10313108;hb=e202298a91603f3b8cfae3c1192e5be796db2786;hp=d73ee61c8f4ddf0b6a4469db237cdce99fb5e68a;hpb=07faf07e3acb8b2afdc2bf65a46bc868faaed0f8;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
index d73ee61c..12f0f8a9 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
@@ -6,6 +6,8 @@ import static net.mograsim.logic.core.types.Bit.Z;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.mograsim.logic.core.LogicObservable;
+import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.timeline.Timeline;
 import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
@@ -165,10 +167,10 @@ public class Wire
 	}
 
 	/**
-	 * Adds an {@link WireObserver}, who will be notified when the value of the {@link Wire} is updated.
+	 * Adds an {@link LogicObserver}, who will be notified when the value of the {@link Wire} is updated.
 	 * 
-	 * @param ob The {@link WireObserver} to be notified of changes.
-	 * @return true if the given {@link WireObserver} was not already registered, false otherwise
+	 * @param ob The {@link LogicObserver} to be notified of changes.
+	 * @return true if the given {@link LogicObserver} was not already registered, false otherwise
 	 * 
 	 * @author Fabian Stemmler
 	 */
@@ -216,9 +218,9 @@ public class Wire
 	 * 
 	 * @author Fabian Stemmler
 	 */
-	public class ReadEnd
+	public class ReadEnd implements LogicObservable
 	{
-		private List<WireObserver> observers = new ArrayList<WireObserver>();
+		private List<LogicObserver> observers = new ArrayList<LogicObserver>();
 
 		private ReadEnd()
 		{
@@ -228,8 +230,7 @@ public class Wire
 
 		public void update(BitVector oldValues)
 		{
-			for (WireObserver ob : observers)
-				ob.update(this, oldValues);
+			notifyObservers();
 		}
 
 		/**
@@ -333,14 +334,22 @@ public class Wire
 			return length;
 		}
 
-		public boolean addObserver(WireObserver ob)
+		public Wire getWire()
 		{
-			return observers.add(ob);
+			return Wire.this;
 		}
 
-		public Wire getWire()
+		@Override
+		public void registerObserver(LogicObserver ob)
 		{
-			return Wire.this;
+			observers.add(ob);
+		}
+
+		@Override
+		public void notifyObservers()
+		{
+			for (LogicObserver ob : observers)
+				ob.update(this);
 		}
 	}
 
@@ -479,7 +488,6 @@ public class Wire
 	public String toString()
 	{
 		return String.format("wire 0x%08x value: %s inputs: %s", hashCode(), values, inputs);
-		// Arrays.toString(values), inputs.stream().map(i -> Arrays.toString(i.inputValues)).reduce((s1, s2) -> s1 + s2)
 	}
 
 	public static ReadEnd[] extractEnds(Wire[] w)