From 900b54a409bb115bcc04f46d904a96b539bf7b7d Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Sun, 18 Aug 2019 12:06:43 +0200 Subject: [PATCH] Renamed GUImux4_12 to GUIsel4_12 for consistency --- .../components/{GUImux4_12.java => GUIsel4_12.java} | 8 ++++---- .../model/serializing/standardComponentIDMapping.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/{GUImux4_12.java => GUIsel4_12.java} (90%) diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUImux4_12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java similarity index 90% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUImux4_12.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java index e43888ab..480a4b13 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUImux4_12.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java @@ -18,11 +18,11 @@ import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUImux4_12 extends SimpleRectangularHardcodedGUIComponent +public class GUIsel4_12 extends SimpleRectangularHardcodedGUIComponent { - public GUImux4_12(ViewModelModifiable model, String name) + public GUIsel4_12(ViewModelModifiable model, String name) { - super(model, name, "4-way MUX\n12 bit"); + super(model, name, "4-way SEL\n12 bit"); setSize(80, 40); addPin(new Pin(this, "SA", 1, 0, 5), Usage.INPUT, Position.RIGHT); addPin(new Pin(this, "SB", 1, 0, 15), Usage.INPUT, Position.RIGHT); @@ -79,6 +79,6 @@ public class GUImux4_12 extends SimpleRectangularHardcodedGUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(GUImux4_12.class.getCanonicalName(), (m, p, n) -> new GUImux4_12(m, n)); + IndirectGUIComponentCreator.setComponentSupplier(GUIsel4_12.class.getCanonicalName(), (m, p, n) -> new GUIsel4_12(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json index 08a0a1c1..92cd2f5b 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json @@ -32,7 +32,6 @@ mograsim version: 0.1.3 "GUIinc12": "class:net.mograsim.logic.model.am2900.components.GUIinc12", "GUImux1": "file:components/GUImux1.json", "GUImux1_4": "file:components/GUImux1_4.json", - "GUImux4_12": "class:net.mograsim.logic.model.am2900.components.GUImux4_12", "GUInand3": "file:components/GUInand3.json", "GUInor12": "class:net.mograsim.logic.model.am2900.components.GUInor12", "GUInot4": "file:components/GUInot4.json", @@ -43,6 +42,7 @@ mograsim version: 0.1.3 "GUIram5_12": "class:net.mograsim.logic.model.am2900.components.GUIram5_12", "GUIsel2_4": "file:components/GUIsel2_4.json", "GUIsel3_4": "file:components/GUIsel3_4.json", + "GUIsel4_12": "class:net.mograsim.logic.model.am2900.components.GUImux4_12", "GUISplitter": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", "GUIxor": "file:components/GUIxor.json", "WireCrossPoint": "class:net.mograsim.logic.model.model.wires.WireCrossPoint" -- 2.17.1