X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Feditor%2FEditor.java;h=37efbae21d5b0c1afbda258344c76592780b7b44;hb=089e41f47d9347c7772dde8fd12774142970b328;hp=e285574e26339d26591b9707e456a290ae97db73;hpb=d4f83fccf116789abf1a95a6486e53557b6f795e;p=Mograsim.git diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java index e285574e..37efbae2 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java @@ -7,7 +7,9 @@ import java.util.Optional; import java.util.Set; import com.google.gson.JsonElement; -import com.google.gson.JsonObject; +import com.google.gson.JsonNull; +import com.google.gson.JsonParser; +import com.google.gson.JsonSyntaxException; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.mograsim.logic.model.editor.handles.ComponentHandle; @@ -135,10 +137,28 @@ public final class Editor public void addComponent(double x, double y) { - GUIComponent c = addComponent(gui.getAddListSelected(), new JsonObject()); - selection.clear(); - selection.add(handleManager.getHandle(c)); - moveSelection(x, y); + boolean successful = false; + JsonElement params = JsonNull.INSTANCE; + outer: + while(!successful) + { + String selected = gui.getAddListSelected(); + try + { + GUIComponent c = addComponent(selected, params); + selection.clear(); + selection.add(handleManager.getHandle(c)); + moveSelection(x, y); + successful = true; + } + catch(UnsupportedOperationException | JsonSyntaxException | NumberFormatException e) + { + String result = DialogManager.openMultiLineTextDialog("Add component", "Create", "Cancel", "Parameters:"); + if(result == null) + break outer; + params = new JsonParser().parse(result); + } + } } private GUIComponent addComponent(String identifier, JsonElement params)