projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied formatter to all source files
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
modeladapter
/
componentadapters
/
MergerAdapter.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java
index
4b2834d
..
22d6112
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java
@@
-7,7
+7,7
@@
import net.mograsim.logic.core.wires.CoreWire;
import net.mograsim.logic.core.wires.CoreWire.ReadEnd;
import net.mograsim.logic.model.model.components.atomic.ModelMerger;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.core.wires.CoreWire.ReadEnd;
import net.mograsim.logic.model.model.components.atomic.ModelMerger;
import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.modeladapter.
Logic
ModelParameters;
+import net.mograsim.logic.model.modeladapter.
Core
ModelParameters;
public class MergerAdapter implements ComponentAdapter<ModelMerger>
{
public class MergerAdapter implements ComponentAdapter<ModelMerger>
{
@@
-18,7
+18,7
@@
public class MergerAdapter implements ComponentAdapter<ModelMerger>
}
@Override
}
@Override
- public void createAndLinkComponent(Timeline timeline,
Logic
ModelParameters params, ModelMerger modelComponent,
+ public void createAndLinkComponent(Timeline timeline,
Core
ModelParameters params, ModelMerger modelComponent,
Map<Pin, CoreWire> logicWiresPerPin)
{
CoreWire output = logicWiresPerPin.get(modelComponent.getPin("O"));
Map<Pin, CoreWire> logicWiresPerPin)
{
CoreWire output = logicWiresPerPin.get(modelComponent.getPin("O"));
@@
-29,6
+29,6
@@
public class MergerAdapter implements ComponentAdapter<ModelMerger>
CoreWire.fuse(input, output, 0, i);
inputEnds[i] = input.createReadOnlyEnd();
}
CoreWire.fuse(input, output, 0, i);
inputEnds[i] = input.createReadOnlyEnd();
}
- modelComponent.set
Logic
ModelBinding(inputEnds, output.createReadOnlyEnd());
+ modelComponent.set
Core
ModelBinding(inputEnds, output.createReadOnlyEnd());
}
}
\ No newline at end of file
}
}
\ No newline at end of file