projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made finding the ID of a JsonSerializable less ugly
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
model
/
components
/
submodels
/
SubmodelComponent.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
index
46d5945
..
f67be7d
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
@@
-17,7
+17,7
@@
import net.mograsim.logic.model.model.components.GUIComponent;
import net.mograsim.logic.model.model.wires.MovablePin;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.model.wires.PinUsage;
import net.mograsim.logic.model.model.wires.MovablePin;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.model.wires.PinUsage;
-import net.mograsim.logic.model.serializing.Identif
ierGetter
;
+import net.mograsim.logic.model.serializing.Identif
yParams
;
import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
import net.mograsim.logic.model.serializing.SubmodelComponentParams;
import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
import net.mograsim.logic.model.serializing.SubmodelComponentParams;
import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
@@
-422,9
+422,15
@@
public abstract class SubmodelComponent extends GUIComponent
// serializing
@Override
// serializing
@Override
- public S
ubmodelComponentParams getParamsForSerializing(IdentifierGetter idGetter
)
+ public S
tring getIDForSerializing(IdentifyParams idParams
)
{
{
- return SubmodelComponentSerializer.serialize(this, idGetter);
+ return "submodel";// TODO what ID?
+ }
+
+ @Override
+ public SubmodelComponentParams getParamsForSerializing(IdentifyParams idParams)
+ {
+ return SubmodelComponentSerializer.serialize(this, idParams);
}
// operations no longer supported
}
// operations no longer supported