X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodeladapter%2Fcomponentadapters%2FTriStateBufferAdapter.java;h=56a838b75d8d62d05cdbb3406f4dc8bf0ad22693;hb=552986fd8718d5f2db00802015fdd1ecd58a5a2f;hp=ba8c4843e24c3e7b1e46c38bd4b5c673687f6313;hpb=bf6ca666751678667bae09e7b6b34460271a41ae;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/TriStateBufferAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/TriStateBufferAdapter.java
index ba8c4843..56a838b7 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/TriStateBufferAdapter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/TriStateBufferAdapter.java
@@ -2,44 +2,31 @@ package net.mograsim.logic.model.modeladapter.componentadapters;
 
 import java.util.Map;
 
-import net.mograsim.logic.core.LogicObserver;
-import net.mograsim.logic.core.components.TriStateBuffer;
+import net.mograsim.logic.core.components.CoreTriStateBuffer;
 import net.mograsim.logic.core.timeline.Timeline;
-import net.mograsim.logic.core.wires.Wire;
-import net.mograsim.logic.core.wires.Wire.ReadEnd;
-import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
-import net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer;
+import net.mograsim.logic.core.wires.CoreWire;
+import net.mograsim.logic.core.wires.CoreWire.ReadEnd;
+import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd;
+import net.mograsim.logic.model.model.components.atomic.ModelTriStateBuffer;
 import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.modeladapter.LogicModelParameters;
+import net.mograsim.logic.model.modeladapter.CoreModelParameters;
 
-public class TriStateBufferAdapter implements ComponentAdapter<GUITriStateBuffer>
+public class TriStateBufferAdapter implements ComponentAdapter<ModelTriStateBuffer>
 {
 	@Override
-	public Class<GUITriStateBuffer> getSupportedClass()
+	public Class<ModelTriStateBuffer> getSupportedClass()
 	{
-		return GUITriStateBuffer.class;
+		return ModelTriStateBuffer.class;
 	}
 
 	@SuppressWarnings("unused")
 	@Override
-	public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, GUITriStateBuffer guiTsb,
-			Map<Pin, Wire> logicWiresPerPin)
+	public void createAndLinkComponent(Timeline timeline, CoreModelParameters params, ModelTriStateBuffer modelTsb,
+			Map<Pin, CoreWire> logicWiresPerPin)
 	{
-		ReadEnd in = logicWiresPerPin.get(guiTsb.getPin("IN")).createReadOnlyEnd();
-		ReadEnd enable = logicWiresPerPin.get(guiTsb.getPin("EN")).createReadOnlyEnd();
-		ReadWriteEnd out = logicWiresPerPin.get(guiTsb.getPin("OUT")).createReadWriteEnd();
-		new TriStateBuffer(timeline, params.gateProcessTime, in, out, enable);
-		// TODO debug code below - remove
-		String msgHeader = '<' + guiTsb.name + ">: ";
-		LogicObserver obs = c ->
-		{
-			System.out.println(msgHeader + "wire states:");
-			System.out.println(msgHeader + "  in    : " + in.getValues());
-			System.out.println(msgHeader + "  enable: " + enable.getValues());
-			System.out.println(msgHeader + "  out   : " + out.getValues());
-		};
-		in.registerObserver(obs);
-		enable.registerObserver(obs);
-		out.registerObserver(obs);
+		ReadEnd in = logicWiresPerPin.get(modelTsb.getPin("IN")).createReadOnlyEnd();
+		ReadEnd enable = logicWiresPerPin.get(modelTsb.getPin("EN")).createReadOnlyEnd();
+		ReadWriteEnd out = logicWiresPerPin.get(modelTsb.getPin("OUT")).createReadWriteEnd();
+		new CoreTriStateBuffer(timeline, params.gateProcessTime, in, out, enable);
 	}
 }