X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FModelOrGate.java;h=888188d1f9c0ec98d3f751bef876c7e86f63f278;hb=3a52b6bffe52db5dd5ca907b4b3dfd368a58e14f;hp=de0aa7f73cff23a6f2d84eee85d60f015b87f6f3;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelOrGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelOrGate.java index de0aa7f7..888188d1 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelOrGate.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelOrGate.java @@ -1,19 +1,19 @@ package net.mograsim.logic.model.model.components.atomic; import net.mograsim.logic.core.components.gates.CoreOrGate; -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 ModelOrGate extends SimpleRectangularModelGate { - public ModelOrGate(ViewModelModifiable model, int logicWidth) + public ModelOrGate(LogicModelModifiable model, int logicWidth) { this(model, logicWidth, null); } - public ModelOrGate(ViewModelModifiable model, int logicWidth, String name) + public ModelOrGate(LogicModelModifiable model, int logicWidth, String name) { super(model, "OrGate", "\u22651", false, logicWidth, name);// ">=1" setInputCount(2); @@ -21,7 +21,7 @@ public class ModelOrGate extends SimpleRectangularModelGate static { - ViewLogicModelAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelOrGate.class, CoreOrGate::new)); + LogicCoreAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelOrGate.class, CoreOrGate::new)); IndirectModelComponentCreator.setComponentSupplier(ModelOrGate.class.getCanonicalName(), (m, p, n) -> new ModelOrGate(m, p.getAsInt(), n)); }