Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / modeladapter / componentadapters / ClockAdapter.java

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ClockAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ClockAdapter.java
index 3066d35..adcda83 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ClockAdapter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ClockAdapter.java
@@ -6,25 +6,26 @@ import net.mograsim.logic.core.components.CoreClock;
 import net.mograsim.logic.core.timeline.Timeline;
 import net.mograsim.logic.core.wires.CoreWire;
 import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd;
-import net.mograsim.logic.model.model.components.atomic.GUIClock;
+import net.mograsim.logic.model.model.components.atomic.ModelClock;
 import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.modeladapter.LogicModelParameters;
+import net.mograsim.logic.model.modeladapter.CoreModelParameters;
 
-public class ClockAdapter implements ComponentAdapter<GUIClock>
+public class ClockAdapter implements ComponentAdapter<ModelClock>
 {
 
        @Override
-       public Class<GUIClock> getSupportedClass()
+       public Class<ModelClock> getSupportedClass()
        {
-               return GUIClock.class;
+               return ModelClock.class;
        }
 
        @Override
-       public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, GUIClock guiClock, Map<Pin, CoreWire> logicWiresPerPin)
+       public void createAndLinkComponent(Timeline timeline, CoreModelParameters params, ModelClock modelClock,
+                       Map<Pin, CoreWire> logicWiresPerPin)
        {
-               ReadWriteEnd out = logicWiresPerPin.get(guiClock.getOutputPin()).createReadWriteEnd();
-               CoreClock c = new CoreClock(timeline, out, guiClock.getDelta());
-               guiClock.setLogicModelBinding(c);
+               ReadWriteEnd out = logicWiresPerPin.get(modelClock.getOutputPin()).createReadWriteEnd();
+               CoreClock c = new CoreClock(timeline, out, modelClock.getDelta());
+               modelClock.setCoreModelBinding(c);
        }
 
 }
\ No newline at end of file