From 148a58630b38b30d4d24a21e3f55c357f5b4d0bc Mon Sep 17 00:00:00 2001 From: Christian Femers Date: Tue, 3 Sep 2019 06:29:10 +0200 Subject: [PATCH] Move components to an actual resource folder (that will remain in jar) --- net.mograsim.logic.model.am2900/.classpath | 3 +- .../resources/components/GUIAm2900.json | 83 +++++++++++++++++++ .../components/GUI_rsLatch.json | 0 .../{ => resources}/components/GUIand.json | 0 .../{ => resources}/components/GUIand41.json | 0 .../components/GUIandor414.json | 0 .../{ => resources}/components/GUIdemux2.json | 0 .../{ => resources}/components/GUIdff.json | 0 .../{ => resources}/components/GUIdff4.json | 0 .../components/GUIdff4_invwe.json | 0 .../{ => resources}/components/GUIdlatch.json | 0 .../components/GUIdlatch4.json | 0 .../components/GUIfulladder.json | 0 .../components/GUIhalfadder.json | 0 .../{ => resources}/components/GUImux1.json | 0 .../{ => resources}/components/GUImux1_4.json | 0 .../{ => resources}/components/GUImux2.json | 0 .../{ => resources}/components/GUImux2_4.json | 0 .../{ => resources}/components/GUImux3.json | 0 .../{ => resources}/components/GUInand3.json | 0 .../{ => resources}/components/GUInot4.json | 0 .../{ => resources}/components/GUIor4.json | 0 .../{ => resources}/components/GUIor_4.json | 0 .../{ => resources}/components/GUIram2.json | 0 .../{ => resources}/components/GUIram4.json | 0 .../{ => resources}/components/GUIsel1.json | 0 .../{ => resources}/components/GUIsel2_4.json | 0 .../{ => resources}/components/GUIsel3_4.json | 0 .../{ => resources}/components/GUIxor.json | 0 .../components/am2901/GUIAm2901.json | 0 .../am2901/GUIAm2901ALUFuncDecode.json | 0 .../am2901/GUIAm2901ALUInclDecode.json | 0 ...ALUInclSourceDecodeInclFunctionDecode.json | 0 .../components/am2901/GUIAm2901ALUOneBit.json | 0 .../am2901/GUIAm2901DestDecode.json | 0 .../am2901/GUIAm2901SourceDecode.json | 0 .../components/am2904/GUIAm2904.json | 0 .../components/am2904/GUIAm2904MSR.json | 0 .../components/am2904/GUIAm2904TestLogic.json | 0 .../components/am2904/GUIAm2904muSR.json | 0 .../components/am2910/GUIAm2910.json | 0 41 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 net.mograsim.logic.model.am2900/resources/components/GUIAm2900.json rename net.mograsim.logic.model.am2900/{ => resources}/components/GUI_rsLatch.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIand.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIand41.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIandor414.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIdemux2.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIdff.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIdff4.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIdff4_invwe.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIdlatch.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIdlatch4.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIfulladder.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIhalfadder.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUImux1.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUImux1_4.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUImux2.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUImux2_4.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUImux3.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUInand3.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUInot4.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIor4.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIor_4.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIram2.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIram4.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIsel1.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIsel2_4.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIsel3_4.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/GUIxor.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2901/GUIAm2901.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2901/GUIAm2901ALUFuncDecode.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2901/GUIAm2901ALUInclDecode.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2901/GUIAm2901ALUOneBit.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2901/GUIAm2901DestDecode.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2901/GUIAm2901SourceDecode.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2904/GUIAm2904.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2904/GUIAm2904MSR.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2904/GUIAm2904TestLogic.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2904/GUIAm2904muSR.json (100%) rename net.mograsim.logic.model.am2900/{ => resources}/components/am2910/GUIAm2910.json (100%) diff --git a/net.mograsim.logic.model.am2900/.classpath b/net.mograsim.logic.model.am2900/.classpath index da70a87e..a4556e76 100644 --- a/net.mograsim.logic.model.am2900/.classpath +++ b/net.mograsim.logic.model.am2900/.classpath @@ -8,10 +8,11 @@ + - + diff --git a/net.mograsim.logic.model.am2900/resources/components/GUIAm2900.json b/net.mograsim.logic.model.am2900/resources/components/GUIAm2900.json new file mode 100644 index 00000000..f4f5c595 --- /dev/null +++ b/net.mograsim.logic.model.am2900/resources/components/GUIAm2900.json @@ -0,0 +1,83 @@ +{ + "width": 224.0, + "height": 136.0, + "interfacePins": [], + "innerScale": 0.4, + "submodel": { + "components": [ + { + "id": "GUIAm2901", + "name": "DeserializedSubmodelComponent#0", + "pos": { + "x": 315.0, + "y": 25.0 + } + }, + { + "id": "GUIAm2901", + "name": "DeserializedSubmodelComponent#1", + "pos": { + "x": 375.0, + "y": 25.0 + } + }, + { + "id": "GUIAm2901", + "name": "DeserializedSubmodelComponent#2", + "pos": { + "x": 435.0, + "y": 25.0 + } + }, + { + "id": "GUIAm2901", + "name": "DeserializedSubmodelComponent#3", + "pos": { + "x": 495.0, + "y": 25.0 + } + }, + { + "id": "GUIAm2904", + "name": "DeserializedSubmodelComponent#4", + "pos": { + "x": 175.0, + "y": 25.0 + } + }, + { + "id": "GUIAm2910", + "name": "DeserializedSubmodelComponent#5", + "pos": { + "x": 35.0, + "y": 135.0 + } + }, + { + "id": "GUIClock", + "name": "GUIClock#0", + "pos": { + "x": 90.0, + "y": 30.0 + }, + "params": { + "delta": 1000, + "orientation": "DOWN" + } + } + ], + "wires": [], + "version": "0.1.1" + }, + "symbolRendererSnippetID": "simpleRectangularLike", + "symbolRendererParams": { + "centerText": "_rsLatch", + "centerTextHeight": 5.0, + "horizontalComponentCenter": 17.5, + "pinLabelHeight": 3.5, + "pinLabelMargin": 0.5 + }, + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "default", + "version": "0.1.5" +} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json b/net.mograsim.logic.model.am2900/resources/components/GUI_rsLatch.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUI_rsLatch.json rename to net.mograsim.logic.model.am2900/resources/components/GUI_rsLatch.json diff --git a/net.mograsim.logic.model.am2900/components/GUIand.json b/net.mograsim.logic.model.am2900/resources/components/GUIand.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIand.json rename to net.mograsim.logic.model.am2900/resources/components/GUIand.json diff --git a/net.mograsim.logic.model.am2900/components/GUIand41.json b/net.mograsim.logic.model.am2900/resources/components/GUIand41.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIand41.json rename to net.mograsim.logic.model.am2900/resources/components/GUIand41.json diff --git a/net.mograsim.logic.model.am2900/components/GUIandor414.json b/net.mograsim.logic.model.am2900/resources/components/GUIandor414.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIandor414.json rename to net.mograsim.logic.model.am2900/resources/components/GUIandor414.json diff --git a/net.mograsim.logic.model.am2900/components/GUIdemux2.json b/net.mograsim.logic.model.am2900/resources/components/GUIdemux2.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIdemux2.json rename to net.mograsim.logic.model.am2900/resources/components/GUIdemux2.json diff --git a/net.mograsim.logic.model.am2900/components/GUIdff.json b/net.mograsim.logic.model.am2900/resources/components/GUIdff.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIdff.json rename to net.mograsim.logic.model.am2900/resources/components/GUIdff.json diff --git a/net.mograsim.logic.model.am2900/components/GUIdff4.json b/net.mograsim.logic.model.am2900/resources/components/GUIdff4.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIdff4.json rename to net.mograsim.logic.model.am2900/resources/components/GUIdff4.json diff --git a/net.mograsim.logic.model.am2900/components/GUIdff4_invwe.json b/net.mograsim.logic.model.am2900/resources/components/GUIdff4_invwe.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIdff4_invwe.json rename to net.mograsim.logic.model.am2900/resources/components/GUIdff4_invwe.json diff --git a/net.mograsim.logic.model.am2900/components/GUIdlatch.json b/net.mograsim.logic.model.am2900/resources/components/GUIdlatch.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIdlatch.json rename to net.mograsim.logic.model.am2900/resources/components/GUIdlatch.json diff --git a/net.mograsim.logic.model.am2900/components/GUIdlatch4.json b/net.mograsim.logic.model.am2900/resources/components/GUIdlatch4.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIdlatch4.json rename to net.mograsim.logic.model.am2900/resources/components/GUIdlatch4.json diff --git a/net.mograsim.logic.model.am2900/components/GUIfulladder.json b/net.mograsim.logic.model.am2900/resources/components/GUIfulladder.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIfulladder.json rename to net.mograsim.logic.model.am2900/resources/components/GUIfulladder.json diff --git a/net.mograsim.logic.model.am2900/components/GUIhalfadder.json b/net.mograsim.logic.model.am2900/resources/components/GUIhalfadder.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIhalfadder.json rename to net.mograsim.logic.model.am2900/resources/components/GUIhalfadder.json diff --git a/net.mograsim.logic.model.am2900/components/GUImux1.json b/net.mograsim.logic.model.am2900/resources/components/GUImux1.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUImux1.json rename to net.mograsim.logic.model.am2900/resources/components/GUImux1.json diff --git a/net.mograsim.logic.model.am2900/components/GUImux1_4.json b/net.mograsim.logic.model.am2900/resources/components/GUImux1_4.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUImux1_4.json rename to net.mograsim.logic.model.am2900/resources/components/GUImux1_4.json diff --git a/net.mograsim.logic.model.am2900/components/GUImux2.json b/net.mograsim.logic.model.am2900/resources/components/GUImux2.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUImux2.json rename to net.mograsim.logic.model.am2900/resources/components/GUImux2.json diff --git a/net.mograsim.logic.model.am2900/components/GUImux2_4.json b/net.mograsim.logic.model.am2900/resources/components/GUImux2_4.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUImux2_4.json rename to net.mograsim.logic.model.am2900/resources/components/GUImux2_4.json diff --git a/net.mograsim.logic.model.am2900/components/GUImux3.json b/net.mograsim.logic.model.am2900/resources/components/GUImux3.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUImux3.json rename to net.mograsim.logic.model.am2900/resources/components/GUImux3.json diff --git a/net.mograsim.logic.model.am2900/components/GUInand3.json b/net.mograsim.logic.model.am2900/resources/components/GUInand3.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUInand3.json rename to net.mograsim.logic.model.am2900/resources/components/GUInand3.json diff --git a/net.mograsim.logic.model.am2900/components/GUInot4.json b/net.mograsim.logic.model.am2900/resources/components/GUInot4.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUInot4.json rename to net.mograsim.logic.model.am2900/resources/components/GUInot4.json diff --git a/net.mograsim.logic.model.am2900/components/GUIor4.json b/net.mograsim.logic.model.am2900/resources/components/GUIor4.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIor4.json rename to net.mograsim.logic.model.am2900/resources/components/GUIor4.json diff --git a/net.mograsim.logic.model.am2900/components/GUIor_4.json b/net.mograsim.logic.model.am2900/resources/components/GUIor_4.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIor_4.json rename to net.mograsim.logic.model.am2900/resources/components/GUIor_4.json diff --git a/net.mograsim.logic.model.am2900/components/GUIram2.json b/net.mograsim.logic.model.am2900/resources/components/GUIram2.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIram2.json rename to net.mograsim.logic.model.am2900/resources/components/GUIram2.json diff --git a/net.mograsim.logic.model.am2900/components/GUIram4.json b/net.mograsim.logic.model.am2900/resources/components/GUIram4.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIram4.json rename to net.mograsim.logic.model.am2900/resources/components/GUIram4.json diff --git a/net.mograsim.logic.model.am2900/components/GUIsel1.json b/net.mograsim.logic.model.am2900/resources/components/GUIsel1.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIsel1.json rename to net.mograsim.logic.model.am2900/resources/components/GUIsel1.json diff --git a/net.mograsim.logic.model.am2900/components/GUIsel2_4.json b/net.mograsim.logic.model.am2900/resources/components/GUIsel2_4.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIsel2_4.json rename to net.mograsim.logic.model.am2900/resources/components/GUIsel2_4.json diff --git a/net.mograsim.logic.model.am2900/components/GUIsel3_4.json b/net.mograsim.logic.model.am2900/resources/components/GUIsel3_4.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIsel3_4.json rename to net.mograsim.logic.model.am2900/resources/components/GUIsel3_4.json diff --git a/net.mograsim.logic.model.am2900/components/GUIxor.json b/net.mograsim.logic.model.am2900/resources/components/GUIxor.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/GUIxor.json rename to net.mograsim.logic.model.am2900/resources/components/GUIxor.json diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json b/net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json rename to net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901.json diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json b/net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901ALUFuncDecode.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json rename to net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901ALUFuncDecode.json diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json b/net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901ALUInclDecode.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json rename to net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901ALUInclDecode.json diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json b/net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json rename to net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json b/net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901ALUOneBit.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json rename to net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901ALUOneBit.json diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json b/net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901DestDecode.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json rename to net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901DestDecode.json diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json b/net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901SourceDecode.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json rename to net.mograsim.logic.model.am2900/resources/components/am2901/GUIAm2901SourceDecode.json diff --git a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json b/net.mograsim.logic.model.am2900/resources/components/am2904/GUIAm2904.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json rename to net.mograsim.logic.model.am2900/resources/components/am2904/GUIAm2904.json diff --git a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904MSR.json b/net.mograsim.logic.model.am2900/resources/components/am2904/GUIAm2904MSR.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2904/GUIAm2904MSR.json rename to net.mograsim.logic.model.am2900/resources/components/am2904/GUIAm2904MSR.json diff --git a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json b/net.mograsim.logic.model.am2900/resources/components/am2904/GUIAm2904TestLogic.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json rename to net.mograsim.logic.model.am2900/resources/components/am2904/GUIAm2904TestLogic.json diff --git a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904muSR.json b/net.mograsim.logic.model.am2900/resources/components/am2904/GUIAm2904muSR.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2904/GUIAm2904muSR.json rename to net.mograsim.logic.model.am2900/resources/components/am2904/GUIAm2904muSR.json diff --git a/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json b/net.mograsim.logic.model.am2900/resources/components/am2910/GUIAm2910.json similarity index 100% rename from net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json rename to net.mograsim.logic.model.am2900/resources/components/am2910/GUIAm2910.json -- 2.17.1