From 7df30691216ad44712c2664d1717aff550952752 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Mon, 3 Jun 2019 23:14:36 +0200 Subject: [PATCH 1/1] Renamed Am2901NANDBased to AtomicAm2901NANDBased --- .../{Am2901Example.java => AtomicAm2901Example.java} | 8 ++++---- ...Am2901NANDBased.java => AtomicAm2901NANDBased.java} | 4 ++-- .../logic/ui/modeladapter/ViewLogicModelAdapter.java | 4 ++-- ...dAdapter.java => AtomicAm2901NANDBasedAdapter.java} | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) rename net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/{Am2901Example.java => AtomicAm2901Example.java} (81%) rename net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/{Am2901NANDBased.java => AtomicAm2901NANDBased.java} (94%) rename net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/componentadapters/{Am2901NANDBasedAdapter.java => AtomicAm2901NANDBasedAdapter.java} (99%) diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/Am2901Example.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/AtomicAm2901Example.java similarity index 81% rename from net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/Am2901Example.java rename to net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/AtomicAm2901Example.java index 3ead2c7d..39ee8fc4 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/Am2901Example.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/AtomicAm2901Example.java @@ -2,26 +2,26 @@ package net.mograsim.logic.ui.examples; import net.mograsim.logic.ui.SimpleLogicUIStandalone; import net.mograsim.logic.ui.model.ViewModelModifiable; -import net.mograsim.logic.ui.model.components.Am2901NANDBased; +import net.mograsim.logic.ui.model.components.AtomicAm2901NANDBased; import net.mograsim.logic.ui.model.components.GUIBitDisplay; import net.mograsim.logic.ui.model.components.GUIManualSwitch; import net.mograsim.logic.ui.model.wires.GUIWire; import net.mograsim.logic.ui.modeladapter.LogicModelParameters; -public class Am2901Example +public class AtomicAm2901Example { public static void main(String[] args) { LogicModelParameters params = new LogicModelParameters(); params.gateProcessTime = 1; params.wireTravelTime = 1; - SimpleLogicUIStandalone.executeVisualisation(Am2901Example::createAm2901Example, params); + SimpleLogicUIStandalone.executeVisualisation(AtomicAm2901Example::createAm2901Example, params); } @SuppressWarnings("unused") // for GUIWires being created public static void createAm2901Example(ViewModelModifiable model) { - Am2901NANDBased am2901 = new Am2901NANDBased(model); + AtomicAm2901NANDBased am2901 = new AtomicAm2901NANDBased(model); am2901.moveTo(100, 0); for (int i = 0; i < am2901.inputNames.size(); i++) { diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/Am2901NANDBased.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/AtomicAm2901NANDBased.java similarity index 94% rename from net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/Am2901NANDBased.java rename to net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/AtomicAm2901NANDBased.java index 40357957..16587537 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/Am2901NANDBased.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/AtomicAm2901NANDBased.java @@ -10,12 +10,12 @@ import net.mograsim.logic.ui.model.ViewModelModifiable; import net.mograsim.logic.ui.model.wires.Pin; // TODO make a superclass -public class Am2901NANDBased extends GUIComponent +public class AtomicAm2901NANDBased extends GUIComponent { public final List inputNames; public final List outputNames; - public Am2901NANDBased(ViewModelModifiable model) + public AtomicAm2901NANDBased(ViewModelModifiable model) { super(model); 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 09cd6cba..ad363d33 100644 --- 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 @@ -27,7 +27,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; @@ -44,7 +44,7 @@ public class ViewLogicModelAdapter componentAdaptersModifiable.add(new SimpleGateAdapter<>(GUINotGate.class, (t, p, o, i) -> new NotGate(t, p, i[0], o))); 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()))); diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/componentadapters/Am2901NANDBasedAdapter.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/componentadapters/AtomicAm2901NANDBasedAdapter.java similarity index 99% rename from net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/componentadapters/Am2901NANDBasedAdapter.java rename to net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/componentadapters/AtomicAm2901NANDBasedAdapter.java index d75c139e..4e35762a 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/componentadapters/Am2901NANDBasedAdapter.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/componentadapters/AtomicAm2901NANDBasedAdapter.java @@ -7,20 +7,20 @@ import net.mograsim.logic.core.components.gates.AndGate; import net.mograsim.logic.core.components.gates.NotGate; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.Wire; -import net.mograsim.logic.ui.model.components.Am2901NANDBased; +import net.mograsim.logic.ui.model.components.AtomicAm2901NANDBased; import net.mograsim.logic.ui.model.wires.Pin; import net.mograsim.logic.ui.modeladapter.LogicModelParameters; -public class Am2901NANDBasedAdapter implements ComponentAdapter +public class AtomicAm2901NANDBasedAdapter implements ComponentAdapter { @Override - public Class getSupportedClass() + public Class getSupportedClass() { - return Am2901NANDBased.class; + return AtomicAm2901NANDBased.class; } @Override - public Component createAndLinkComponent(Timeline timeline, LogicModelParameters params, Am2901NANDBased guiComponent, + public Component createAndLinkComponent(Timeline timeline, LogicModelParameters params, AtomicAm2901NANDBased guiComponent, Map logicWiresPerPin) { Wire w00 = logicWiresPerPin.get(guiComponent.getPins().get(0)); -- 2.17.1