X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2FLogicModelModifiable.java;fp=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2FLogicModelModifiable.java;h=e903257f19609c6665bd222465f20c1142a2f7ba;hb=f48f2e47ec2a1871ee856e7cf3efc35637cdf7be;hp=4801d416c35f5655fe9fd56600ea2aea041161a8;hpb=71d300be42fd0315fa6d0d27023ef8f2c7092e36;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModelModifiable.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModelModifiable.java index 4801d416..e903257f 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModelModifiable.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModelModifiable.java @@ -4,21 +4,14 @@ import java.util.Set; import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.ModelWire; +import net.mograsim.logic.model.serializing.IdentifyParams; public class LogicModelModifiable extends LogicModel { public String getDefaultComponentName(ModelComponent component) { Set componentNames = getComponentsByName().keySet(); - // TODO get the ID of component - // The following does not work because this method is called in the constructor of DeserializedSubmodelComponent at a time where - // idForSerializingOverride is not yet set -// String componentID = null; -// if (component instanceof DeserializedSubmodelComponent) -// componentID = ((DeserializedSubmodelComponent) component).idForSerializingOverride; -// if (componentID == null) -// componentID = component.getClass().getSimpleName(); - String componentID = component.getClass().getSimpleName(); + String componentID = component.getIDForSerializing(new IdentifyParams()); String nameBase = componentID + '#'; for (int i = 0;; i++) {