{
public static final Version JSON_VERSION_CURRENT_SERIALIZING = Version.parseSemver("0.1.5");
public static final Version JSON_VERSION_LATEST_SUPPORTED_DESERIALIZING = Version.parseSemver("0.1.5");
- public static final Version JSON_VERSION_EARLIEST_WITH_USAGE_SERIALIZED = Version.parseSemver("0.1.4");
+ public static final Version JSON_VERSION_EARLIEST_WITH_USAGE_SERIALIZED = Version.parseSemver("0.1.5");
// convenience methods
/**
*
* @author Daniel Kirschten
*/
- public static void serialize(SubmodelComponent comp, IdentifierGetter idGetter, String targetPath) throws IOException
+ public static void serialize(SubmodelComponent comp, IdentifyParams idParams, String targetPath) throws IOException
{
- JsonHandler.writeJson(serialize(comp, idGetter), targetPath);
+ JsonHandler.writeJson(serialize(comp, idParams), targetPath);
}
/**
*/
public static SubmodelComponentParams serialize(SubmodelComponent comp)
{
- return serialize(comp, new IdentifierGetter());
+ return serialize(comp, new IdentifyParams());
}
// "core" methods
* @author Fabian Stemmler
* @author Daniel Kirschten
*/
- @SuppressWarnings("unused") // for GUIWire being created
+ @SuppressWarnings("unused") // for ModelWire being created
public static SubmodelComponent deserialize(ViewModelModifiable model, SubmodelComponentParams params, String name,
String idForSerializingOverride, JsonElement paramsForSerializingOverride)
{
Version version = params.version;
if (version.compareTo(JSON_VERSION_LATEST_SUPPORTED_DESERIALIZING) > 0)
throw new IllegalArgumentException("JSON version " + version + " not supported yet");
- boolean hasUsageSerialized = version.compareTo(JSON_VERSION_EARLIEST_WITH_USAGE_SERIALIZED) > 0;
+ boolean hasUsageSerialized = version.compareTo(JSON_VERSION_EARLIEST_WITH_USAGE_SERIALIZED) >= 0;
DeserializedSubmodelComponent comp = new DeserializedSubmodelComponent(model, name, idForSerializingOverride,
paramsForSerializingOverride);
comp.setSubmodelScale(params.innerScale);
* @author Fabian Stemmler
* @author Daniel Kirschten
*/
- public static SubmodelComponentParams serialize(SubmodelComponent comp, IdentifierGetter idGetter)
+ public static SubmodelComponentParams serialize(SubmodelComponent comp, IdentifyParams idParams)
{
SubmodelComponentParams params = new SubmodelComponentParams(JSON_VERSION_CURRENT_SERIALIZING);
params.innerScale = comp.getSubmodelScale();
- params.submodel = ViewModelSerializer.serialize(comp.submodel, idGetter);
+ params.submodel = ViewModelSerializer.serialize(comp.submodel, idParams);
params.width = comp.getWidth();
params.height = comp.getHeight();
Renderer symbolRenderer = comp.getSymbolRenderer();
if (symbolRenderer != null)
{
- params.symbolRendererSnippetID = idGetter.symbolRendererIDs.apply(symbolRenderer);
- params.symbolRendererParams = symbolRenderer.getParamsForSerializingJSON(idGetter);
+ params.symbolRendererSnippetID = symbolRenderer.getIDForSerializing(idParams);
+ params.symbolRendererParams = symbolRenderer.getParamsForSerializingJSON(idParams);
}
Renderer outlineRenderer = comp.getOutlineRenderer();
if (outlineRenderer != null)
{
- params.outlineRendererSnippetID = idGetter.outlineRendererIDs.apply(outlineRenderer);
- params.outlineRendererParams = outlineRenderer.getParamsForSerializingJSON(idGetter);
+ params.outlineRendererSnippetID = outlineRenderer.getIDForSerializing(idParams);
+ params.outlineRendererParams = outlineRenderer.getParamsForSerializingJSON(idParams);
}
HighLevelStateHandler highLevelStateHandler = comp.getHighLevelStateHandler();
if (highLevelStateHandler != null)
{
- params.highLevelStateHandlerSnippetID = idGetter.highLevelStateHandlerIDs.apply(highLevelStateHandler);
- params.highLevelStateHandlerParams = highLevelStateHandler.getParamsForSerializingJSON(idGetter);
+ params.highLevelStateHandlerSnippetID = highLevelStateHandler.getIDForSerializing(idParams);
+ params.highLevelStateHandlerParams = highLevelStateHandler.getParamsForSerializingJSON(idParams);
}
return params;