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=7e2316079adaa4053d3b63bdb94d22ecd2132b66;hb=a86976434d00dce2652d93256cc12b6e3a0f324a;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..7e231607 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,6 +8,7 @@ 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;
 
@@ -90,7 +91,7 @@ public class HandleManager
 			registerInterfaceComponent(interfaceComp);
 			comps.forEach(c -> registerComponent(c));
 
-			model.getWires().forEach(w -> registerWire(w));
+			model.getWiresByName().values().forEach(w -> registerWire(w));
 			addHandle(cornerHandle = 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 = oldLength.getAndSet(newLength) - 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);
 		}
@@ -346,7 +352,7 @@ public class HandleManager
 		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))