X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Feditor%2Fhandles%2FHandleManager.java;h=518900381d9cda8c401b87c4bcbda2a6f7701f10;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=e4fb3142a67f1277cb384da3b947b41e9e80f037;hpb=878d036669f4aa9d0c332ced43da3a08b94655e9;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java
index e4fb3142..51890038 100644
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java
@@ -8,14 +8,17 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.mograsim.logic.model.editor.Editor;
 import net.mograsim.logic.model.editor.states.EditorState;
+import net.mograsim.logic.model.editor.util.PrioritySet;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
+import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
 import net.mograsim.logic.model.model.wires.GUIWire;
 import net.mograsim.logic.model.model.wires.MovablePin;
 import net.mograsim.logic.model.model.wires.Pin;
@@ -35,8 +38,6 @@ public class HandleManager
 	private final Editor editor;
 	private boolean initialized = false;
 
-	private CornerHandle cornerHandle;
-
 	public HandleManager(Editor editor)
 	{
 		this.editor = editor;
@@ -44,7 +45,7 @@ public class HandleManager
 		handlePerInterfacePin = new HashMap<>();
 		pointHandlesPerWire = new HashMap<>();
 		handlePerComp = new HashMap<>();
-		handles = new HashSet<>();
+		handles = new PrioritySet<>((a, b) -> Integer.compare(a.getPriority(), b.getPriority()));
 		wirePointHandles = new HashSet<>();
 		handlePerWire = new HashMap<>();
 
@@ -85,13 +86,13 @@ public class HandleManager
 			ViewModelModifiable model = editor.getSubmodel();
 			Map<String, GUIComponent> compsByName = model.getComponentsByName();
 			Set<GUIComponent> comps = new HashSet<>(compsByName.values());
-			GUIComponent interfaceComp = compsByName.get("_submodelinterface");
+			GUIComponent interfaceComp = compsByName.get(SubmodelComponent.SUBMODEL_INTERFACE_NAME);
 			comps.remove(interfaceComp);
 			registerInterfaceComponent(interfaceComp);
 			comps.forEach(c -> registerComponent(c));
 
-			model.getWires().forEach(w -> registerWire(w));
-			addHandle(cornerHandle = new CornerHandle(editor.toBeEdited));
+			model.getWiresByName().values().forEach(w -> registerWire(w));
+			addHandle(new CornerHandle(editor.toBeEdited));
 		}
 	}
 
@@ -114,8 +115,13 @@ public class HandleManager
 
 	private void registerWire(GUIWire wire)
 	{
-		wire.addPathChangedListener((w, diff) ->
+		Point[] path = wire.getPath();
+		AtomicInteger oldLength = new AtomicInteger(path == null ? 0 : path.length);
+		wire.addPathChangedListener(w ->
 		{
+			Point[] newPath = w.getPath();
+			int newLength = newPath == null ? 0 : newPath.length;
+			int diff = newLength - oldLength.getAndSet(newLength);
 			if (diff != 0)
 			{
 				if (diff > 0)
@@ -134,9 +140,9 @@ public class HandleManager
 			pointHandlesPerWire.get(w).forEach(h -> h.updatePos());
 		});
 		addWireHandle(wire);
-		if (wire.getPath() == null)
+		if (path == null)
 			return;
-		for (int i = 0; i < wire.getPath().length; i++)
+		for (int i = 0; i < path.length; i++)
 		{
 			addWirePointHandle(wire);
 		}
@@ -148,7 +154,7 @@ public class HandleManager
 
 	private void addComponentHandle(GUIComponent c)
 	{
-		ComponentHandle h = new ComponentHandle(c);
+		ComponentHandle h = new ComponentHandle(editor.getSubmodel(), c);
 		handlePerComp.put(c, h);
 		addHandle(h);
 	}
@@ -210,11 +216,14 @@ public class HandleManager
 
 	void destroyWirePointHandle(GUIWire owner, WirePointHandle h)
 	{
-		List<WirePointHandle> handles = pointHandlesPerWire.get(owner);
-		int pointIndex = handles.indexOf(h);
-		handles.remove(pointIndex);
-		removeHandle(h);
-		owner.removePathPoint(pointIndex);
+		if (pointHandlesPerWire.containsKey(owner))
+		{
+			List<WirePointHandle> handles = pointHandlesPerWire.get(owner);
+			int pointIndex = handles.indexOf(h);
+			handles.remove(pointIndex);
+			removeHandle(h);
+			owner.removePathPoint(pointIndex);
+		}
 	}
 
 	private void removeWirePointHandles(GUIWire owner)
@@ -231,7 +240,7 @@ public class HandleManager
 
 	private void addWireHandle(GUIWire w)
 	{
-		WireHandle h = new WireHandle(w);
+		WireHandle h = new WireHandle(editor.getSubmodel(), w);
 		handlePerWire.put(w, h);
 		addHandle(h);
 	}
@@ -335,18 +344,13 @@ public class HandleManager
 	public void click(Point clicked, int stateMask)
 	{
 		EditorState entryState = editor.stateManager.getState();
-
-		if (!cornerHandle.click(clicked.x, clicked.y, stateMask, entryState))
-			if (!click(handlePerPin.values(), clicked, entryState, stateMask))
-				if (!click(handlePerInterfacePin.values(), clicked, entryState, stateMask))
-					if (!click(getWirePointHandles(), clicked, entryState, stateMask))
-						if (!click(getWireHandles(), clicked, entryState, stateMask))
-							if (!click(handlePerComp.values(), clicked, entryState, stateMask))
-								entryState.clickedEmpty(clicked, stateMask);
+		// TODO: As soon as wires connected to a component being removed also are removed, change priority)
+		if (!click(handles, clicked, entryState, stateMask))
+			entryState.clickedEmpty(clicked, stateMask);
 		entryState.clicked(clicked, stateMask);
 	}
 
-	private boolean click(Collection<? extends Handle> handles, Point clicked, EditorState state, int stateMask)
+	private static boolean click(Collection<? extends Handle> handles, Point clicked, EditorState state, int stateMask)
 	{
 		for (Handle h : handles)
 			if (h.click(clicked.x, clicked.y, stateMask, state))