From f48f2e47ec2a1871ee856e7cf3efc35637cdf7be Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Fri, 6 Sep 2019 00:03:32 +0200 Subject: [PATCH] Cleaned LogicModelModifiable.getDefaultComponentName --- .../logic/model/model/LogicModelModifiable.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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++) { -- 2.17.1