X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FModelSplitter.java;h=805831faf6249c6404dbe8ce0a3ace5636bc6fb2;hb=1f645882d229fc3d4081e4c5060559d75dc2cc24;hp=2f7a98de517ca60ae1dfe9174cb72a209c02143b;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelSplitter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelSplitter.java
index 2f7a98de..805831fa 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelSplitter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelSplitter.java
@@ -6,11 +6,11 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.core.wires.CoreWire.ReadEnd;
-import net.mograsim.logic.model.model.ViewModelModifiable;
+import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
 import net.mograsim.logic.model.model.wires.Pin;
 import net.mograsim.logic.model.model.wires.PinUsage;
-import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
+import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.SplitterAdapter;
 import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
@@ -29,20 +29,20 @@ public class ModelSplitter extends ModelComponent
 	private ReadEnd inputEnd;
 	private final ReadEnd[] outputEnds;
 
-	public ModelSplitter(ViewModelModifiable model, int logicWidth)
+	public ModelSplitter(LogicModelModifiable model, int logicWidth)
 	{
 		this(model, logicWidth, null);
 	}
 
-	public ModelSplitter(ViewModelModifiable model, int logicWidth, String name)
+	public ModelSplitter(LogicModelModifiable model, int logicWidth, String name)
 	{
 		super(model, name);
 		this.logicWidth = logicWidth;
 		setSize(width, (logicWidth - 1) * heightPerPin);
-		addPin(this.inputPin = new Pin(this, "I", logicWidth, PinUsage.TRISTATE, 0, (logicWidth - 1) * heightPerPin / 2));
+		addPin(this.inputPin = new Pin(model, this, "I", logicWidth, PinUsage.TRISTATE, 0, (logicWidth - 1) * heightPerPin / 2));
 		double outputHeight = (logicWidth - 1) * heightPerPin;
 		for (int i = 0; i < logicWidth; i++, outputHeight -= 10)
-			addPin(new Pin(this, "O" + i, 1, PinUsage.TRISTATE, width, outputHeight));
+			addPin(new Pin(model, this, "O" + i, 1, PinUsage.TRISTATE, width, outputHeight));
 		outputEnds = new ReadEnd[logicWidth];
 	}
 
@@ -91,7 +91,7 @@ public class ModelSplitter extends ModelComponent
 		return logicWidth;
 	}
 
-	public void setLogicModelBinding(ReadEnd inputEnd, ReadEnd[] outputEnds)
+	public void setCoreModelBinding(ReadEnd inputEnd, ReadEnd[] outputEnds)
 	{
 		this.inputEnd = inputEnd;
 		System.arraycopy(outputEnds, 0, this.outputEnds, 0, logicWidth);
@@ -104,7 +104,7 @@ public class ModelSplitter extends ModelComponent
 
 	static
 	{
-		ViewLogicModelAdapter.addComponentAdapter(new SplitterAdapter());
+		LogicCoreAdapter.addComponentAdapter(new SplitterAdapter());
 		IndirectModelComponentCreator.setComponentSupplier(ModelSplitter.class.getCanonicalName(),
 				(m, p, n) -> new ModelSplitter(m, p.getAsInt(), n));
 	}