projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'development' of
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
src
/
net
/
mograsim
/
logic
/
model
/
am2900
/
machine
/
Am2900Machine.java
diff --git
a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
index
0f0dcd5
..
f8abe44
100644
(file)
--- a/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
+++ b/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
@@
-23,7
+23,8
@@
public class Am2900Machine implements Machine
{
this.machineDefinition = am2900MachineDefinition;
viewModel = new ViewModelModifiable();
{
this.machineDefinition = am2900MachineDefinition;
viewModel = new ViewModelModifiable();
- IndirectGUIComponentCreator.createComponent(viewModel, "resource:Am2900Loader:/components/GUIAm2900.json");
+ IndirectGUIComponentCreator.createComponent(viewModel,
+ "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIAm2900.json");
LogicModelParameters params = new LogicModelParameters();
params.gateProcessTime = 50;
params.wireTravelTime = 10;
LogicModelParameters params = new LogicModelParameters();
params.gateProcessTime = 50;
params.wireTravelTime = 10;