X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Feditor%2FSaveLoadManager.java;h=e690200e93d98443d532373acb2ab790d4ecdf4f;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=3d22b9cf2451de6d23f31594967d85d459d76ea2;hpb=3977f16649531ca3ba345c9cd5ec365e0b804783;p=Mograsim.git diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java index 3d22b9cf..e690200e 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java @@ -8,7 +8,7 @@ import org.eclipse.swt.widgets.Shell; import net.mograsim.logic.model.model.ViewModelModifiable; import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; -import net.mograsim.logic.model.serializing.IdentifierGetter; +import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; import net.mograsim.logic.model.serializing.SubmodelComponentSerializer; public class SaveLoadManager @@ -48,14 +48,7 @@ public class SaveLoadManager { try { - IdentifierGetter idGetter = new IdentifierGetter(); - idGetter.componentIDs = c -> - { - if (Editor.identifierPerComponent.containsKey(c)) - return Editor.identifierPerComponent.get(c); - return "class:" + c.getClass().getCanonicalName(); - }; - SubmodelComponentSerializer.serialize(editor.toBeEdited, idGetter, savePath); + SubmodelComponentSerializer.serialize(editor.toBeEdited, savePath); } catch (IOException e) { @@ -75,7 +68,8 @@ public class SaveLoadManager fdShell.dispose(); if (result != null) { - new Editor((DeserializedSubmodelComponent) SubmodelComponentSerializer.deserialize(new ViewModelModifiable(), result)); + new Editor((DeserializedSubmodelComponent) IndirectGUIComponentCreator.createComponent(new ViewModelModifiable(), + "file:" + result)); } } }