projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented GUI_rsLatch's high level state handling
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
src
/
net
/
mograsim
/
logic
/
model
/
examples
/
SubmodelComponentTestbench.java
diff --git
a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/SubmodelComponentTestbench.java
b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/SubmodelComponentTestbench.java
index
0d9c604
..
6a42d70
100644
(file)
--- a/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/SubmodelComponentTestbench.java
+++ b/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/SubmodelComponentTestbench.java
@@
-1,5
+1,7
@@
package net.mograsim.logic.model.examples;
package net.mograsim.logic.model.examples;
+import java.io.IOException;
+import java.io.UncheckedIOException;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
@@
-10,7
+12,7
@@
import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch;
import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
import net.mograsim.logic.model.model.wires.GUIWire;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
import net.mograsim.logic.model.model.wires.GUIWire;
import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.serializing.SubmodelComponent
Des
erializer;
+import net.mograsim.logic.model.serializing.SubmodelComponent
S
erializer;
public class SubmodelComponentTestbench
{
public class SubmodelComponentTestbench
{
@@
-22,7
+24,15
@@
public class SubmodelComponentTestbench
@SuppressWarnings("unused") // for GUIWires being created
public static void createTestbench(ViewModelModifiable model)
{
@SuppressWarnings("unused") // for GUIWires being created
public static void createTestbench(ViewModelModifiable model)
{
- SubmodelComponent comp = SubmodelComponentDeserializer.create(model, "components/am2901/GUIAm2901.json");
+ SubmodelComponent comp;
+ try
+ {
+ comp = SubmodelComponentSerializer.deserialize(model, "components/am2901/GUIAm2901.json");
+ }
+ catch (IOException e)
+ {
+ throw new UncheckedIOException(e);
+ }
// guess which pins are outputs and which are inputs
// TODO this code exists three times... but it seems too "hacky" to put it in a helper class
// guess which pins are outputs and which are inputs
// TODO this code exists three times... but it seems too "hacky" to put it in a helper class