X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FIndirectModelComponentCreator.java;h=fce47c17154861b41fbe8599cd0bd27b86aa9f94;hb=3a52b6bffe52db5dd5ca907b4b3dfd368a58e14f;hp=b6585742da166116d4b0e4dfd7ad3e818c079f9e;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java index b6585742..fce47c17 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java @@ -12,7 +12,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonNull; import com.google.gson.JsonObject; -import net.mograsim.logic.model.model.ViewModelModifiable; +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; @@ -76,22 +76,22 @@ public class IndirectModelComponentCreator componentSuppliers.put(id, componentSupplier); } - public static ModelComponent createComponent(ViewModelModifiable model, String id) + public static ModelComponent createComponent(LogicModelModifiable model, String id) { return createComponent(model, id, (String) null); } - public static ModelComponent createComponent(ViewModelModifiable model, String id, String name) + public static ModelComponent createComponent(LogicModelModifiable model, String id, String name) { return createComponent(model, id, JsonNull.INSTANCE, name); } - public static ModelComponent createComponent(ViewModelModifiable model, String id, JsonElement params) + public static ModelComponent createComponent(LogicModelModifiable model, String id, JsonElement params) { return createComponent(model, id, params, null); } - public static ModelComponent createComponent(ViewModelModifiable model, String id, JsonElement params, String name) + public static ModelComponent createComponent(LogicModelModifiable model, String id, JsonElement params, String name) { if (id == null) throw new NullPointerException("Component ID is null"); @@ -184,7 +184,7 @@ public class IndirectModelComponentCreator return id.matches("jsonfile:(.+)|(resloader:([^:]+):)?(jsonres|class):[^:]+"); } - private static SubmodelComponent loadComponentFromJsonObject(ViewModelModifiable model, String id, String name, JsonObject jsonContents) + private static SubmodelComponent loadComponentFromJsonObject(LogicModelModifiable model, String id, String name, JsonObject jsonContents) { componentCache.putIfAbsent(id, jsonContents); SerializablePojo jsonContentsAsSerializablePojo = JsonHandler.parser.fromJson(jsonContents, SerializablePojo.class); @@ -217,6 +217,6 @@ public class IndirectModelComponentCreator public static interface ComponentSupplier { - public ModelComponent create(ViewModelModifiable model, JsonElement params, String name); + public ModelComponent create(LogicModelModifiable model, JsonElement params, String name); } } \ No newline at end of file