Move components to an actual resource folder (that will remain in jar)

[Mograsim.git] / net.mograsim.logic.model.editor / src / net / mograsim / logic / model / editor / Editor.java

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 e285574..2cc13c1 100644 (file)
--- 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
@@ -1,5 +1,6 @@
 package net.mograsim.logic.model.editor;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -7,7 +8,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;
@@ -21,6 +24,7 @@ import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.wires.GUIWire;
 import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
+import net.mograsim.logic.model.serializing.IdentifierGetter;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 
 public final class Editor
@@ -50,10 +54,10 @@ public final class Editor
                dialogManager = new DialogManager(gui.shell);
 
                toBeEdited.submodel.addComponentRemovedListener(c -> identifierPerComponent.remove(c));
-               
+
                gui.open();
        }
-       
+
        public ViewModelModifiable getSubmodel()
        {
                return toBeEdited.getSubmodelModifiable();
@@ -64,8 +68,8 @@ public final class Editor
                return selection;
        }
 
-       //TODO: Remove this error prone method: Relative offset may change between multiple moves,
-       //because Handles have different ways of responding to reqMove(...), causing strange behaviour
+       // TODO: Remove this error prone method: Relative offset may change between multiple moves,
+       // because Handles have different ways of responding to reqMove(...), causing strange behaviour
        @Deprecated
        public void moveSelection(double x, double y)
        {
@@ -81,7 +85,7 @@ public final class Editor
                        c.reqMove(newX, newY);
                }
        }
-       
+
        public void moveHandles(double x, double y, Map<Handle, Point> handleOffsetMap)
        {
                Point snapped = new Point(x, y);
@@ -110,7 +114,7 @@ public final class Editor
                for (Handle h : selection)
                {
                        Optional<ComponentInfo> cInfo = h.reqCopy(refPoint);
-                       if(cInfo.isPresent())
+                       if (cInfo.isPresent())
                                copyBuffer.add(cInfo.get());
                }
        }
@@ -127,31 +131,54 @@ public final class Editor
                }
                moveSelection(x, y);
        }
-       
+
        public void save()
        {
                saveManager.save();
        }
 
+       public void saveAs()
+       {
+               saveManager.openSaveAsDialog();
+       }
+
        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 (@SuppressWarnings("unused") 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)
        {
-               GUIComponent comp = IndirectGUIComponentCreator.createComponent(toBeEdited.getSubmodelModifiable(), identifier,
-                               params);
+               GUIComponent comp = IndirectGUIComponentCreator.createComponent(toBeEdited.getSubmodelModifiable(), identifier, params);
                identifierPerComponent.put(comp, identifier);
                return comp;
        }
-       
+
        public static String getIdentifier(GUIComponent c)
        {
-               return identifierPerComponent.get(c);
+               if (identifierPerComponent.containsKey(c))
+                       return identifierPerComponent.get(c);
+               return new IdentifierGetter().componentIDs.apply(c);
        }
 
        public void duplicate()
@@ -168,8 +195,10 @@ public final class Editor
                case OFF:
                        break;
                case ABSOLUTE:
-                       newP.x -= newP.x % snapX;
-                       newP.y -= newP.y % snapY;
+                       newP.x = (int) (newP.x / snapX + .5) * snapX;
+                       newP.y = (int) (newP.y / snapY + .5) * snapY;
+                       break;
+               default:
                        break;
                }
        }
@@ -179,7 +208,7 @@ public final class Editor
                public final double relX, relY;
                public final String identifier;
                public final JsonElement params;
-               
+
                public ComponentInfo(double relX, double relY, String identifier, JsonElement params)
                {
                        this.relX = relX;
@@ -189,6 +218,7 @@ public final class Editor
                }
        }
 
+       @SuppressWarnings("unused")
        public void addWire(PinHandle a, PinHandle b)
        {
                new GUIWire(toBeEdited.getSubmodelModifiable(), a.getPin(), b.getPin(), new Point[0]);
@@ -197,15 +227,15 @@ public final class Editor
        public static enum Snapping
        {
                OFF, ABSOLUTE;
-               
+
                @Override
                public String toString()
                {
                        return super.toString().toLowerCase();
                }
        }
-       
-       public static void main(String[] args)
+
+       public static void main(String[] args) throws IOException
        {
                SaveLoadManager.openLoadDialog();
        }