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=6f3919a99a55656cf23c97cca2bf54ba3c75e1d9;hb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;hp=b6de1acb2724f88b30edaae0819a0d690102ece3;hpb=0a04a4ed66ecebd4254541c4977599f6052c115a;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 b6de1acb..6f3919a9 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
@@ -21,11 +21,11 @@ import net.mograsim.logic.model.editor.states.StateManager;
 import net.mograsim.logic.model.editor.ui.DialogManager;
 import net.mograsim.logic.model.editor.ui.EditorGUI;
 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.model.components.ModelComponent;
+import net.mograsim.logic.model.model.wires.ModelWire;
 import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
 import net.mograsim.logic.model.serializing.IdentifyParams;
-import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
+import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler;
 import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer;
 import net.mograsim.logic.model.snippets.symbolrenderers.DefaultSymbolRenderer;
@@ -36,7 +36,7 @@ public final class Editor
 	final Set<ComponentInfo> copyBuffer = new HashSet<>();
 	public final DeserializedSubmodelComponent toBeEdited;
 	public final HandleManager handleManager;
-	final static Map<GUIComponent, String> identifierPerComponent = new HashMap<>();
+	final static Map<ModelComponent, String> identifierPerComponent = new HashMap<>();
 	public final EditorGUI gui;
 	public final StateManager stateManager;
 	private final SaveLoadManager saveManager;
@@ -127,7 +127,7 @@ public final class Editor
 		selection.clear();
 		for (ComponentInfo info : copyBuffer)
 		{
-			GUIComponent comp = addComponent(info.identifier, info.params);
+			ModelComponent comp = addComponent(info.identifier, info.params);
 			ComponentHandle h = handleManager.getHandle(comp);
 			h.reqMove(info.relX, info.relY);
 			selection.add(h);
@@ -154,7 +154,7 @@ public final class Editor
 			String selected = gui.getAddListSelected();
 			try
 			{
-				GUIComponent c = addComponent(selected, params);
+				ModelComponent c = addComponent(selected, params);
 				selection.clear();
 				selection.add(handleManager.getHandle(c));
 				moveSelection(x, y);
@@ -171,14 +171,14 @@ public final class Editor
 		}
 	}
 
-	private GUIComponent addComponent(String identifier, JsonElement params)
+	private ModelComponent addComponent(String identifier, JsonElement params)
 	{
-		GUIComponent comp = IndirectGUIComponentCreator.createComponent(toBeEdited.getSubmodelModifiable(), identifier, params);
+		ModelComponent comp = IndirectModelComponentCreator.createComponent(toBeEdited.getSubmodelModifiable(), identifier, params);
 		identifierPerComponent.put(comp, identifier);
 		return comp;
 	}
 
-	public static String getIdentifier(GUIComponent c)
+	public static String getIdentifier(ModelComponent c)
 	{
 		if (identifierPerComponent.containsKey(c))
 			return identifierPerComponent.get(c);
@@ -225,7 +225,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]);
+		new ModelWire(toBeEdited.getSubmodelModifiable(), a.getPin(), b.getPin(), new Point[0]);
 	}
 
 	public static enum Snapping