Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / model / components / atomic / ModelNandGate.java

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 f2acc94..b4e91d8 100644 (file)
--- 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,27 +1,28 @@
 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);
+               super(model, "NandGate", "&", true, logicWidth, name, false);
                setInputCount(2);// TODO make variable
+               init();
        }
 
        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));
        }