From 70d9098dd01dfe29142a4184438175d5a013bb5b Mon Sep 17 00:00:00 2001 From: Fabian Stemmler Date: Mon, 24 Jun 2019 17:46:14 +0200 Subject: [PATCH] Reorganized location of .json components --- .../components/GUI_rsLatch.json | 2 +- .../components/GUIand.json | 2 +- .../components/GUIand41.json | 2 +- .../components/GUIandor414.json | 2 +- .../components/GUIdemux2.json | 2 +- .../components/GUIdff.json | 2 +- .../components/GUIdlatch.json | 2 +- .../components/GUIdlatch4.json | 2 +- .../components/GUIfulladder.json | 2 +- .../components/GUIhalfadder.json | 2 +- .../components/GUImux1.json | 2 +- .../components/GUImux1_4.json | 2 +- .../components/GUInand3.json | 2 +- .../components/GUInot4.json | 2 +- .../components/GUIor4.json | 2 +- .../components/GUIor_4.json | 2 +- .../components/GUIram2.json | 2 +- .../components/GUIram4.json | 2 +- .../components/GUIsel2_4.json | 2 +- .../components/GUIsel3_4.json | 2 +- .../components/GUIxor.json | 2 +- .../components/am2901/GUIAm2901.json | 2 +- .../components/am2901/GUIAm2901ALUFuncDecode.json | 2 +- .../components/am2901/GUIAm2901ALUInclDecode.json | 2 +- ...m2901ALUInclSourceDecodeInclFunctionDecode.json | 2 +- .../components/am2901/GUIAm2901ALUOneBit.json | 2 +- .../components/am2901/GUIAm2901DestDecode.json | 2 +- .../components/am2901/GUIAm2901QReg.json | 2 +- .../components/am2901/GUIAm2901SourceDecode.json | 2 +- .../components/mapping.json | 2 +- .../mograsim/logic/ui/examples/JsonExample.java | 14 ++++++++++---- .../ui/model/components/GUIComponentCreator.java | 3 ++- .../components/GUICustomComponentCreator.java | 3 --- .../src/net/mograsim/logic/ui/util/Version.java | 2 +- 34 files changed, 43 insertions(+), 39 deletions(-) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUI_rsLatch.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIand.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIand41.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIandor414.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIdemux2.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIdff.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIdlatch.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIdlatch4.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIfulladder.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIhalfadder.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUImux1.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUImux1_4.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUInand3.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUInot4.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIor4.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIor_4.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIram2.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIram4.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIsel2_4.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIsel3_4.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/GUIxor.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/am2901/GUIAm2901.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/am2901/GUIAm2901ALUFuncDecode.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/am2901/GUIAm2901ALUInclDecode.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/am2901/GUIAm2901ALUOneBit.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/am2901/GUIAm2901DestDecode.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/am2901/GUIAm2901QReg.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/am2901/GUIAm2901SourceDecode.json (99%) rename {net.mograsim.logic.ui => net.mograsim.logic.ui.am2900}/components/mapping.json (98%) diff --git a/net.mograsim.logic.ui/components/GUI_rsLatch.json b/net.mograsim.logic.ui.am2900/components/GUI_rsLatch.json similarity index 99% rename from net.mograsim.logic.ui/components/GUI_rsLatch.json rename to net.mograsim.logic.ui.am2900/components/GUI_rsLatch.json index 9195303f..186aac31 100644 --- a/net.mograsim.logic.ui/components/GUI_rsLatch.json +++ b/net.mograsim.logic.ui.am2900/components/GUI_rsLatch.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUI_rsLatch", diff --git a/net.mograsim.logic.ui/components/GUIand.json b/net.mograsim.logic.ui.am2900/components/GUIand.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIand.json rename to net.mograsim.logic.ui.am2900/components/GUIand.json index 6581c533..2ea36835 100644 --- a/net.mograsim.logic.ui/components/GUIand.json +++ b/net.mograsim.logic.ui.am2900/components/GUIand.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIand", diff --git a/net.mograsim.logic.ui/components/GUIand41.json b/net.mograsim.logic.ui.am2900/components/GUIand41.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIand41.json rename to net.mograsim.logic.ui.am2900/components/GUIand41.json index 6c88a16a..7b2757c9 100644 --- a/net.mograsim.logic.ui/components/GUIand41.json +++ b/net.mograsim.logic.ui.am2900/components/GUIand41.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIand41", diff --git a/net.mograsim.logic.ui/components/GUIandor414.json b/net.mograsim.logic.ui.am2900/components/GUIandor414.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIandor414.json rename to net.mograsim.logic.ui.am2900/components/GUIandor414.json index 19858349..d581e8f7 100644 --- a/net.mograsim.logic.ui/components/GUIandor414.json +++ b/net.mograsim.logic.ui.am2900/components/GUIandor414.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIandor414", diff --git a/net.mograsim.logic.ui/components/GUIdemux2.json b/net.mograsim.logic.ui.am2900/components/GUIdemux2.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIdemux2.json rename to net.mograsim.logic.ui.am2900/components/GUIdemux2.json index 44aaa4ad..d6b01c63 100644 --- a/net.mograsim.logic.ui/components/GUIdemux2.json +++ b/net.mograsim.logic.ui.am2900/components/GUIdemux2.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIdemux2", diff --git a/net.mograsim.logic.ui/components/GUIdff.json b/net.mograsim.logic.ui.am2900/components/GUIdff.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIdff.json rename to net.mograsim.logic.ui.am2900/components/GUIdff.json index 712733d5..5c0c80ab 100644 --- a/net.mograsim.logic.ui/components/GUIdff.json +++ b/net.mograsim.logic.ui.am2900/components/GUIdff.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIdff", diff --git a/net.mograsim.logic.ui/components/GUIdlatch.json b/net.mograsim.logic.ui.am2900/components/GUIdlatch.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIdlatch.json rename to net.mograsim.logic.ui.am2900/components/GUIdlatch.json index 7d874980..6811c4d4 100644 --- a/net.mograsim.logic.ui/components/GUIdlatch.json +++ b/net.mograsim.logic.ui.am2900/components/GUIdlatch.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIdlatch", diff --git a/net.mograsim.logic.ui/components/GUIdlatch4.json b/net.mograsim.logic.ui.am2900/components/GUIdlatch4.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIdlatch4.json rename to net.mograsim.logic.ui.am2900/components/GUIdlatch4.json index 0c7a9e65..e6316c36 100644 --- a/net.mograsim.logic.ui/components/GUIdlatch4.json +++ b/net.mograsim.logic.ui.am2900/components/GUIdlatch4.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIdlatch4", diff --git a/net.mograsim.logic.ui/components/GUIfulladder.json b/net.mograsim.logic.ui.am2900/components/GUIfulladder.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIfulladder.json rename to net.mograsim.logic.ui.am2900/components/GUIfulladder.json index 888df777..259ba270 100644 --- a/net.mograsim.logic.ui/components/GUIfulladder.json +++ b/net.mograsim.logic.ui.am2900/components/GUIfulladder.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIfulladder", diff --git a/net.mograsim.logic.ui/components/GUIhalfadder.json b/net.mograsim.logic.ui.am2900/components/GUIhalfadder.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIhalfadder.json rename to net.mograsim.logic.ui.am2900/components/GUIhalfadder.json index a83a1e44..5e1371e1 100644 --- a/net.mograsim.logic.ui/components/GUIhalfadder.json +++ b/net.mograsim.logic.ui.am2900/components/GUIhalfadder.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIhalfadder", diff --git a/net.mograsim.logic.ui/components/GUImux1.json b/net.mograsim.logic.ui.am2900/components/GUImux1.json similarity index 99% rename from net.mograsim.logic.ui/components/GUImux1.json rename to net.mograsim.logic.ui.am2900/components/GUImux1.json index f36fc7c1..9f373e2a 100644 --- a/net.mograsim.logic.ui/components/GUImux1.json +++ b/net.mograsim.logic.ui.am2900/components/GUImux1.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUImux1", diff --git a/net.mograsim.logic.ui/components/GUImux1_4.json b/net.mograsim.logic.ui.am2900/components/GUImux1_4.json similarity index 99% rename from net.mograsim.logic.ui/components/GUImux1_4.json rename to net.mograsim.logic.ui.am2900/components/GUImux1_4.json index a652c167..7d326ba7 100644 --- a/net.mograsim.logic.ui/components/GUImux1_4.json +++ b/net.mograsim.logic.ui.am2900/components/GUImux1_4.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUImux1_4", diff --git a/net.mograsim.logic.ui/components/GUInand3.json b/net.mograsim.logic.ui.am2900/components/GUInand3.json similarity index 99% rename from net.mograsim.logic.ui/components/GUInand3.json rename to net.mograsim.logic.ui.am2900/components/GUInand3.json index 2db174fb..fe953c30 100644 --- a/net.mograsim.logic.ui/components/GUInand3.json +++ b/net.mograsim.logic.ui.am2900/components/GUInand3.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUInand3", diff --git a/net.mograsim.logic.ui/components/GUInot4.json b/net.mograsim.logic.ui.am2900/components/GUInot4.json similarity index 99% rename from net.mograsim.logic.ui/components/GUInot4.json rename to net.mograsim.logic.ui.am2900/components/GUInot4.json index 1a4f9d1b..71e414e7 100644 --- a/net.mograsim.logic.ui/components/GUInot4.json +++ b/net.mograsim.logic.ui.am2900/components/GUInot4.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUInot4", diff --git a/net.mograsim.logic.ui/components/GUIor4.json b/net.mograsim.logic.ui.am2900/components/GUIor4.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIor4.json rename to net.mograsim.logic.ui.am2900/components/GUIor4.json index 4aba55a6..53da78d0 100644 --- a/net.mograsim.logic.ui/components/GUIor4.json +++ b/net.mograsim.logic.ui.am2900/components/GUIor4.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIor4", diff --git a/net.mograsim.logic.ui/components/GUIor_4.json b/net.mograsim.logic.ui.am2900/components/GUIor_4.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIor_4.json rename to net.mograsim.logic.ui.am2900/components/GUIor_4.json index 69bacd22..729cd821 100644 --- a/net.mograsim.logic.ui/components/GUIor_4.json +++ b/net.mograsim.logic.ui.am2900/components/GUIor_4.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIor_4", diff --git a/net.mograsim.logic.ui/components/GUIram2.json b/net.mograsim.logic.ui.am2900/components/GUIram2.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIram2.json rename to net.mograsim.logic.ui.am2900/components/GUIram2.json index 665d5a0c..df20ab50 100644 --- a/net.mograsim.logic.ui/components/GUIram2.json +++ b/net.mograsim.logic.ui.am2900/components/GUIram2.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIram2", diff --git a/net.mograsim.logic.ui/components/GUIram4.json b/net.mograsim.logic.ui.am2900/components/GUIram4.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIram4.json rename to net.mograsim.logic.ui.am2900/components/GUIram4.json index 2965fd09..605b061e 100644 --- a/net.mograsim.logic.ui/components/GUIram4.json +++ b/net.mograsim.logic.ui.am2900/components/GUIram4.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIram4", diff --git a/net.mograsim.logic.ui/components/GUIsel2_4.json b/net.mograsim.logic.ui.am2900/components/GUIsel2_4.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIsel2_4.json rename to net.mograsim.logic.ui.am2900/components/GUIsel2_4.json index d0e4289c..c98c1dc3 100644 --- a/net.mograsim.logic.ui/components/GUIsel2_4.json +++ b/net.mograsim.logic.ui.am2900/components/GUIsel2_4.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIsel2_4", diff --git a/net.mograsim.logic.ui/components/GUIsel3_4.json b/net.mograsim.logic.ui.am2900/components/GUIsel3_4.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIsel3_4.json rename to net.mograsim.logic.ui.am2900/components/GUIsel3_4.json index cf4ad9d4..b1f46478 100644 --- a/net.mograsim.logic.ui/components/GUIsel3_4.json +++ b/net.mograsim.logic.ui.am2900/components/GUIsel3_4.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIsel3_4", diff --git a/net.mograsim.logic.ui/components/GUIxor.json b/net.mograsim.logic.ui.am2900/components/GUIxor.json similarity index 99% rename from net.mograsim.logic.ui/components/GUIxor.json rename to net.mograsim.logic.ui.am2900/components/GUIxor.json index 42029dbc..f32f1a11 100644 --- a/net.mograsim.logic.ui/components/GUIxor.json +++ b/net.mograsim.logic.ui.am2900/components/GUIxor.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIxor", diff --git a/net.mograsim.logic.ui/components/am2901/GUIAm2901.json b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901.json similarity index 99% rename from net.mograsim.logic.ui/components/am2901/GUIAm2901.json rename to net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901.json index fa1d68e7..e93eea3a 100644 --- a/net.mograsim.logic.ui/components/am2901/GUIAm2901.json +++ b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIAm2901", diff --git a/net.mograsim.logic.ui/components/am2901/GUIAm2901ALUFuncDecode.json b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUFuncDecode.json similarity index 99% rename from net.mograsim.logic.ui/components/am2901/GUIAm2901ALUFuncDecode.json rename to net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUFuncDecode.json index 16bc1b11..1a838efc 100644 --- a/net.mograsim.logic.ui/components/am2901/GUIAm2901ALUFuncDecode.json +++ b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUFuncDecode.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIAm2901ALUFuncDecode", diff --git a/net.mograsim.logic.ui/components/am2901/GUIAm2901ALUInclDecode.json b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUInclDecode.json similarity index 99% rename from net.mograsim.logic.ui/components/am2901/GUIAm2901ALUInclDecode.json rename to net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUInclDecode.json index 09d738aa..9c3181cd 100644 --- a/net.mograsim.logic.ui/components/am2901/GUIAm2901ALUInclDecode.json +++ b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUInclDecode.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIAm2901ALUInclDecode", diff --git a/net.mograsim.logic.ui/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json similarity index 99% rename from net.mograsim.logic.ui/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json rename to net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json index 0b15fc07..71a63aa7 100644 --- a/net.mograsim.logic.ui/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json +++ b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode", diff --git a/net.mograsim.logic.ui/components/am2901/GUIAm2901ALUOneBit.json b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUOneBit.json similarity index 99% rename from net.mograsim.logic.ui/components/am2901/GUIAm2901ALUOneBit.json rename to net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUOneBit.json index cd8e6c0f..5466a04e 100644 --- a/net.mograsim.logic.ui/components/am2901/GUIAm2901ALUOneBit.json +++ b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUOneBit.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIAm2901ALUOneBit", diff --git a/net.mograsim.logic.ui/components/am2901/GUIAm2901DestDecode.json b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901DestDecode.json similarity index 99% rename from net.mograsim.logic.ui/components/am2901/GUIAm2901DestDecode.json rename to net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901DestDecode.json index 51dae7bb..3faa02d4 100644 --- a/net.mograsim.logic.ui/components/am2901/GUIAm2901DestDecode.json +++ b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901DestDecode.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIAm2901DestDecode", diff --git a/net.mograsim.logic.ui/components/am2901/GUIAm2901QReg.json b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901QReg.json similarity index 99% rename from net.mograsim.logic.ui/components/am2901/GUIAm2901QReg.json rename to net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901QReg.json index 27438688..85f0edf8 100644 --- a/net.mograsim.logic.ui/components/am2901/GUIAm2901QReg.json +++ b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901QReg.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIAm2901QReg", diff --git a/net.mograsim.logic.ui/components/am2901/GUIAm2901SourceDecode.json b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901SourceDecode.json similarity index 99% rename from net.mograsim.logic.ui/components/am2901/GUIAm2901SourceDecode.json rename to net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901SourceDecode.json index 6bc92acf..c8823710 100644 --- a/net.mograsim.logic.ui/components/am2901/GUIAm2901SourceDecode.json +++ b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901SourceDecode.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "type": "SimpleRectangularSubmodelComponent", "name": "GUIAm2901SourceDecode", diff --git a/net.mograsim.logic.ui/components/mapping.json b/net.mograsim.logic.ui.am2900/components/mapping.json similarity index 98% rename from net.mograsim.logic.ui/components/mapping.json rename to net.mograsim.logic.ui.am2900/components/mapping.json index 02f39368..6c7a8350 100644 --- a/net.mograsim.logic.ui/components/mapping.json +++ b/net.mograsim.logic.ui.am2900/components/mapping.json @@ -1,4 +1,4 @@ -mograsim version: 0.1.1 +mograsim version: 0.1.2 { "GUIAm2901": "file:components/am2901/GUIAm2901.json", "GUIAm2901ALUFuncDecode": "file:components/am2901/GUIAm2901ALUFuncDecode.json", diff --git a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/examples/JsonExample.java b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/examples/JsonExample.java index 4ebd32ae..a35ab2fb 100644 --- a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/examples/JsonExample.java +++ b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/examples/JsonExample.java @@ -1,10 +1,12 @@ package net.mograsim.logic.ui.examples; import java.io.IOException; +import java.util.HashMap; import net.mograsim.logic.ui.SimpleLogicUIStandalone; import net.mograsim.logic.ui.model.ViewModelModifiable; import net.mograsim.logic.ui.model.components.GUIBitDisplay; +import net.mograsim.logic.ui.model.components.GUIComponentCreator; import net.mograsim.logic.ui.model.components.GUICustomComponentCreator; import net.mograsim.logic.ui.model.components.GUIManualSwitch; import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent; @@ -18,7 +20,12 @@ public class JsonExample { public static void main(String[] args) { - SimpleLogicUIStandalone.executeVisualisation(JsonExample::refJsonFromJsonTest); + SimpleLogicUIStandalone.executeVisualisation(JsonExample::mappingTest); + } + + public static void mappingTest(ViewModelModifiable model) + { + GUIComponentCreator.create(model, "GUIAm2901", new HashMap()); } private static class TestComponent extends SimpleRectangularSubmodelComponent @@ -39,7 +46,6 @@ public class JsonExample t.calculateParams().writeJson("Test.json"); SubmodelComponent c = GUICustomComponentCreator.create(model, "Test.json"); c.moveTo(0, 50); - } public static void createHalfAdderExample(ViewModelModifiable model) @@ -57,7 +63,7 @@ public class JsonExample e.printStackTrace(); } - GUICustomComponentCreator.create(model, p, ""); + GUICustomComponentCreator.create(model, p); } @SuppressWarnings("unused") // for GUIWires being created @@ -99,7 +105,7 @@ public class JsonExample new GUIWire(model, adder.getPin("Y"), bdY.getInputPin()); new GUIWire(model, adder.getPin("Z"), bdZ.getInputPin()); - SubmodelComponent adder2 = GUICustomComponentCreator.create(model, pC, ""); + SubmodelComponent adder2 = GUICustomComponentCreator.create(model, pC); swA = new GUIManualSwitch(model); swA.moveTo(0, 70); diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponentCreator.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponentCreator.java index 3a234280..c8e33333 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponentCreator.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponentCreator.java @@ -13,7 +13,8 @@ import net.mograsim.logic.ui.util.JsonHandler; public class GUIComponentCreator { private final static Map componentMapping; - private final static String componentMappingPath = "components/mapping.json"; // TODO: manage this somewhere else + private final static String componentMappingPath = "../net.mograsim.logic.ui.am2900/components/mapping.json"; // TODO: manage this + // somewhere else static { diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUICustomComponentCreator.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUICustomComponentCreator.java index c153956c..1e2034e4 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUICustomComponentCreator.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUICustomComponentCreator.java @@ -1,8 +1,6 @@ package net.mograsim.logic.ui.model.components; import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Arrays; import java.util.Map; @@ -14,7 +12,6 @@ import net.mograsim.logic.ui.model.components.SubmodelComponentParams.InnerWireP import net.mograsim.logic.ui.model.components.SubmodelComponentParams.InterfacePinParams; import net.mograsim.logic.ui.model.wires.GUIWire; import net.mograsim.logic.ui.model.wires.MovablePin; -import net.mograsim.logic.ui.model.wires.WireCrossPoint; /** * Creates {@link SubmodelComponent}s from {@link SubmodelComponentParams} diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/Version.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/Version.java index 366ab02b..8e80249c 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/Version.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/Version.java @@ -2,7 +2,7 @@ package net.mograsim.logic.ui.util; public final class Version { - public final static Version jsonCompVersion = new Version(0, 1, 1); + public final static Version jsonCompVersion = new Version(0, 1, 2); public final int major, minor, patch; public Version(int major, int minor, int patch) -- 2.17.1