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

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

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java
index 1a5a50e..3cfa5f2 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java
@@ -3,32 +3,32 @@ package net.mograsim.logic.model.modeladapter.componentadapters;
 import java.util.Map;
 
 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.model.model.components.atomic.GUISplitter;
+import net.mograsim.logic.core.wires.CoreWire;
+import net.mograsim.logic.core.wires.CoreWire.ReadEnd;
+import net.mograsim.logic.model.model.components.atomic.ModelSplitter;
 import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.modeladapter.LogicModelParameters;
+import net.mograsim.logic.model.modeladapter.CoreModelParameters;
 
-public class SplitterAdapter implements ComponentAdapter<GUISplitter>
+public class SplitterAdapter implements ComponentAdapter<ModelSplitter>
 {
        @Override
-       public Class<GUISplitter> getSupportedClass()
+       public Class<ModelSplitter> getSupportedClass()
        {
-               return GUISplitter.class;
+               return ModelSplitter.class;
        }
 
        @Override
-       public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, GUISplitter guiComponent,
-                       Map<Pin, Wire> logicWiresPerPin)
+       public void createAndLinkComponent(Timeline timeline, CoreModelParameters params, ModelSplitter modelComponent,
+                       Map<Pin, CoreWire> logicWiresPerPin)
        {
-               Wire input = logicWiresPerPin.get(guiComponent.getPin("I"));
-               ReadEnd[] outputEnds = new ReadEnd[guiComponent.logicWidth];
-               for (int i = 0; i < guiComponent.logicWidth; i++)
+               CoreWire input = logicWiresPerPin.get(modelComponent.getPin("I"));
+               ReadEnd[] outputEnds = new ReadEnd[modelComponent.logicWidth];
+               for (int i = 0; i < modelComponent.logicWidth; i++)
                {
-                       Wire output = logicWiresPerPin.get(guiComponent.getPin("O" + i));
-                       Wire.fuse(input, output, guiComponent.logicWidth - 1 - i, 0, 1);
+                       CoreWire output = logicWiresPerPin.get(modelComponent.getPin("O" + (modelComponent.logicWidth - 1 - i)));
+                       CoreWire.fuse(input, output, i, 0);
                        outputEnds[i] = output.createReadOnlyEnd();
                }
-               guiComponent.setLogicModelBinding(input.createReadOnlyEnd(), outputEnds);
+               modelComponent.setCoreModelBinding(input.createReadOnlyEnd(), outputEnds);
        }
 }
\ No newline at end of file