X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FIndirectModelComponentCreator.java;h=4bc9a36b9379862b757a49ee0371ab1adebe37a8;hb=22b03c5749439c8601238669ef7b790f48077043;hp=c149848a629ca7a357f2ddde03c7dc3f56abe98d;hpb=7d05144c25daa53e60fc9ed9fd503546a86567f8;p=Mograsim.git diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java index c149848a..4bc9a36b 100644 --- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java +++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java @@ -16,12 +16,9 @@ import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.util.JsonHandler; -import net.mograsim.logic.model.util.Version; public class IndirectModelComponentCreator { - public static final Version CURRENT_STD_ID_MAPPING_VERSION = Version.parseSemver("0.1.0"); - private static final Map standardComponentIDs = new HashMap<>(); private static final Map standardComponentIDsUnmodifiable = Collections.unmodifiableMap(standardComponentIDs); @@ -42,7 +39,7 @@ public class IndirectModelComponentCreator { if (s == null) throw new IOException("Resource not found"); - Map tmp = JsonHandler.readJson(s, StandardComponentIdMappingContainer.class).getMap(); + Map tmp = JsonHandler.readJson(s, Map.class); // don't use putAll to apply sanity checks tmp.forEach((st, id) -> {