From 422779cc67647f9495b06f5fb84e9b27de95e0c2 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Sun, 18 Aug 2019 21:01:34 +0200 Subject: [PATCH] Renamed GUIAm2904RegCTInstrDecode and added it to standardCompIDMapping --- ...gCTInstrDecode.java => GUIAm2904RegCTInstrDecode.java} | 8 ++++---- .../logic/model/examples/GUIComponentTestbench.java | 2 +- .../model/serializing/standardComponentIDMapping.json | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/{RegCTInstrDecode.java => GUIAm2904RegCTInstrDecode.java} (96%) diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/RegCTInstrDecode.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java similarity index 96% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/RegCTInstrDecode.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java index 436eaffb..d010b302 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/RegCTInstrDecode.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java @@ -16,9 +16,9 @@ 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 RegCTInstrDecode extends SimpleRectangularHardcodedGUIComponent +public class GUIAm2904RegCTInstrDecode extends SimpleRectangularHardcodedGUIComponent { - public RegCTInstrDecode(ViewModelModifiable model, String name) + public GUIAm2904RegCTInstrDecode(ViewModelModifiable model, String name) { super(model, name, "Instruction\ndecode"); setSize(80, 80); @@ -261,7 +261,7 @@ public class RegCTInstrDecode extends SimpleRectangularHardcodedGUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(RegCTInstrDecode.class.getCanonicalName(), - (m, p, n) -> new RegCTInstrDecode(m, n)); + IndirectGUIComponentCreator.setComponentSupplier(GUIAm2904RegCTInstrDecode.class.getCanonicalName(), + (m, p, n) -> new GUIAm2904RegCTInstrDecode(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java index 57813223..45f538cc 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java @@ -26,7 +26,7 @@ public class GUIComponentTestbench public static void createTestbench(ViewModelModifiable model) { GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, - "class:net.mograsim.logic.model.am2900.components.am2904.RegCTInstrDecode"); + "class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904RegCTInstrDecode"); // guess which pins are outputs and which are inputs // TODO this code exists four times... but it seems too "hacky" to put it in a helper class 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 92cd2f5b..9fa80d0c 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 @@ -7,6 +7,7 @@ mograsim version: 0.1.3 "GUIAm2901ALUInclDecode": "file:components/am2901/GUIAm2901ALUInclDecode.json", "GUIAm2901ALUInclSourceDecodeInclFunctionDecode": "file:components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json", "GUIAm2901ALUOneBit": "file:components/am2901/GUIAm2901ALUOneBit.json", + "GUIAm2904RegCTInstrDecode": "class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904RegCTInstrDecode", "GUIAm2901DestDecode": "file:components/am2901/GUIAm2901DestDecode.json", "GUIAm2901SourceDecode": "file:components/am2901/GUIAm2901SourceDecode.json", "GUIAm2910InstrPLA": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA", -- 2.17.1