X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fsnippets%2Fhighlevelstatehandlers%2Fstandard%2FStandardHighLevelStateHandler.java;h=af3ad22b1999b01df7f949b976119a624cd2414b;hb=039f31334c661633b71e945aa4332cedb7055526;hp=9afa7c497acc22f15130da1abab41a02935985ec;hpb=1e6eee9a46051c1e3f841b9675d3337ba3b72ac7;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java index 9afa7c49..af3ad22b 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java @@ -7,7 +7,7 @@ import java.util.function.BiFunction; import java.util.function.Function; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.serializing.IdentifierGetter; +import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.snippets.HighLevelStateHandler; import net.mograsim.logic.model.snippets.SnippetDefinintion; import net.mograsim.logic.model.snippets.SubmodelComponentSnippetSuppliers; @@ -142,7 +142,13 @@ public class StandardHighLevelStateHandler implements HighLevelStateHandler } @Override - public StandardHighLevelStateHandlerParams getParamsForSerializing(IdentifierGetter idGetter) + public String getIDForSerializing(IdentifyParams idParams) + { + return "standard"; + } + + @Override + public StandardHighLevelStateHandlerParams getParamsForSerializing(IdentifyParams idParams) { StandardHighLevelStateHandlerParams params = new StandardHighLevelStateHandlerParams(); params.subcomponentHighLevelStates = new HashMap<>(); @@ -152,8 +158,8 @@ public class StandardHighLevelStateHandler implements HighLevelStateHandler String stateID = e.getKey(); SubcomponentHighLevelStateHandler handler = e.getValue(); SubcomponentHighLevelStateHandlerParams handlerParams = new SubcomponentHighLevelStateHandlerParams(); - handlerParams.id = idGetter.subcomponentHighLevelStateHandlerIDs.apply(handler); - handlerParams.params = handler.getParamsForSerializingJSON(idGetter); + handlerParams.id = handler.getIDForSerializing(idParams); + handlerParams.params = handler.getParamsForSerializingJSON(idParams); params.subcomponentHighLevelStates.put(stateID, handlerParams); } for (Entry e : atomicHighLevelStateHandlers.entrySet()) @@ -161,8 +167,8 @@ public class StandardHighLevelStateHandler implements HighLevelStateHandler String stateID = e.getKey(); AtomicHighLevelStateHandler handler = e.getValue(); AtomicHighLevelStateHandlerParams handlerParams = new AtomicHighLevelStateHandlerParams(); - handlerParams.id = idGetter.atomicHighLevelStateHandlerIDs.apply(handler); - handlerParams.params = handler.getParamsForSerializingJSON(idGetter); + handlerParams.id = handler.getIDForSerializing(idParams); + handlerParams.params = handler.getParamsForSerializingJSON(idParams); params.atomicHighLevelStates.put(stateID, handlerParams); } return params;