X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FModelAndGate.java;h=3e83693793b5cdbefe842e5fe6d8f05b25602845;hb=92862c4723c5eff22257e8de06166a124efb5d77;hp=3707a783ee476db117b3fbd3b172e2ac9224e99e;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelAndGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelAndGate.java
index 3707a783..3e836937 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelAndGate.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelAndGate.java
@@ -1,27 +1,28 @@
 package net.mograsim.logic.model.model.components.atomic;
 
 import net.mograsim.logic.core.components.gates.CoreAndGate;
-import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
+import net.mograsim.logic.model.model.LogicModelModifiable;
+import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter;
 import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 
 public class ModelAndGate extends SimpleRectangularModelGate
 {
-	public ModelAndGate(ViewModelModifiable model, int logicWidth)
+	public ModelAndGate(LogicModelModifiable model, int logicWidth)
 	{
 		this(model, logicWidth, null);
 	}
 
-	public ModelAndGate(ViewModelModifiable model, int logicWidth, String name)
+	public ModelAndGate(LogicModelModifiable model, int logicWidth, String name)
 	{
-		super(model, "AndGate", "&", false, logicWidth, name);
+		super(model, "AndGate", "&", false, logicWidth, name, false);
 		setInputCount(2);// TODO make variable
+		init();
 	}
 
 	static
 	{
-		ViewLogicModelAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelAndGate.class, CoreAndGate::new));
+		LogicCoreAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelAndGate.class, CoreAndGate::new));
 		IndirectModelComponentCreator.setComponentSupplier(ModelAndGate.class.getCanonicalName(),
 				(m, p, n) -> new ModelAndGate(m, p.getAsInt(), n));
 	}