X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FModelNandGate.java;h=d06c81c0985922d00dd0b19c6c85358db46271f8;hb=3a52b6bffe52db5dd5ca907b4b3dfd368a58e14f;hp=f2acc944639420fdfdf1f15573c34d894f6a4c69;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNandGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNandGate.java index f2acc944..d06c81c0 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNandGate.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNandGate.java @@ -1,19 +1,19 @@ package net.mograsim.logic.model.model.components.atomic; import net.mograsim.logic.core.components.gates.CoreNandGate; -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 ModelNandGate extends SimpleRectangularModelGate { - public ModelNandGate(ViewModelModifiable model, int logicWidth) + public ModelNandGate(LogicModelModifiable model, int logicWidth) { this(model, logicWidth, null); } - public ModelNandGate(ViewModelModifiable model, int logicWidth, String name) + public ModelNandGate(LogicModelModifiable model, int logicWidth, String name) { super(model, "NandGate", "&", true, logicWidth, name); setInputCount(2);// TODO make variable @@ -21,7 +21,7 @@ public class ModelNandGate extends SimpleRectangularModelGate static { - ViewLogicModelAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelNandGate.class, CoreNandGate::new)); + LogicCoreAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelNandGate.class, CoreNandGate::new)); IndirectModelComponentCreator.setComponentSupplier(ModelNandGate.class.getCanonicalName(), (m, p, n) -> new ModelNandGate(m, p.getAsInt(), n)); }