X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodeladapter%2Fcomponentadapters%2FMergerAdapter.java;h=22d61122e94726a04bd1dcdcd8e05012e176c1a4;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=e5e4430045f7b7c2099ae827b78f0df1e65e4f7b;hpb=452b5630f12a4ffa8b15012980f2e6b8469c571b;p=Mograsim.git

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