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 / ModelAndGate.java

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 820991b..3e83693 100644 (file)
--- 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,22 +1,23 @@
 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.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