ViewLogicModelAdapter now uses NandGate for GUINandGate

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / modeladapter / ViewLogicModelAdapter.java

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
index 09cd6cb..8c478ae 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
@@ -10,8 +10,8 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import net.mograsim.logic.core.components.Component;
 import net.mograsim.logic.core.components.gates.AndGate;
+import net.mograsim.logic.core.components.gates.NandGate;
 import net.mograsim.logic.core.components.gates.NotGate;
 import net.mograsim.logic.core.components.gates.OrGate;
 import net.mograsim.logic.core.timeline.Timeline;
@@ -20,6 +20,7 @@ import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.ui.model.ViewModel;
 import net.mograsim.logic.ui.model.components.GUIAndGate;
 import net.mograsim.logic.ui.model.components.GUIComponent;
+import net.mograsim.logic.ui.model.components.GUINandGate;
 import net.mograsim.logic.ui.model.components.GUINotGate;
 import net.mograsim.logic.ui.model.components.GUIOrGate;
 import net.mograsim.logic.ui.model.components.SubmodelComponent;
@@ -27,7 +28,7 @@ import net.mograsim.logic.ui.model.components.SubmodelInterface;
 import net.mograsim.logic.ui.model.wires.GUIWire;
 import net.mograsim.logic.ui.model.wires.Pin;
 import net.mograsim.logic.ui.model.wires.WireCrossPoint;
-import net.mograsim.logic.ui.modeladapter.componentadapters.Am2901NANDBasedAdapter;
+import net.mograsim.logic.ui.modeladapter.componentadapters.AtomicAm2901NANDBasedAdapter;
 import net.mograsim.logic.ui.modeladapter.componentadapters.BitDisplayAdapter;
 import net.mograsim.logic.ui.modeladapter.componentadapters.ComponentAdapter;
 import net.mograsim.logic.ui.modeladapter.componentadapters.ManualSwitchAdapter;
@@ -42,9 +43,10 @@ public class ViewLogicModelAdapter
                componentAdaptersModifiable.add(new SimpleGateAdapter<>(GUIOrGate.class, OrGate::new));
                componentAdaptersModifiable.add(new SimpleGateAdapter<>(GUIAndGate.class, AndGate::new));
                componentAdaptersModifiable.add(new SimpleGateAdapter<>(GUINotGate.class, (t, p, o, i) -> new NotGate(t, p, i[0], o)));
+               componentAdaptersModifiable.add(new SimpleGateAdapter<>(GUINandGate.class, NandGate::new));
                componentAdaptersModifiable.add(new ManualSwitchAdapter());
                componentAdaptersModifiable.add(new BitDisplayAdapter());
-               componentAdaptersModifiable.add(new Am2901NANDBasedAdapter());
+               componentAdaptersModifiable.add(new AtomicAm2901NANDBasedAdapter());
                // TODO list all adapters here
                componentAdapters = Collections.unmodifiableMap(
                                componentAdaptersModifiable.stream().collect(Collectors.toMap(ComponentAdapter::getSupportedClass, Function.identity())));
@@ -157,12 +159,12 @@ public class ViewLogicModelAdapter
        }
 
        @SuppressWarnings("unchecked")
-       private static <G extends GUIComponent> Component createAndLinkComponent(Timeline timeline, LogicModelParameters params,
+       private static <G extends GUIComponent> void createAndLinkComponent(Timeline timeline, LogicModelParameters params,
                        GUIComponent guiComponent, Map<Pin, Wire> logicWiresPerPin, ComponentAdapter<G> adapter)
        {
                if (adapter == null)
                        throw new IllegalArgumentException("Unknown component class: " + guiComponent.getClass());
-               return adapter.createAndLinkComponent(timeline, params, (G) guiComponent, logicWiresPerPin);
+               adapter.createAndLinkComponent(timeline, params, (G) guiComponent, logicWiresPerPin);
        }
 
        private ViewLogicModelAdapter()