From 0f0739c9784118b6fbfa19b70b159aa6fa88fea2 Mon Sep 17 00:00:00 2001
From: bancika <bancika@Bancika-PC>
Date: Fri, 27 Mar 2020 10:08:22 +0100
Subject: [PATCH] Issues with connectivity check with some components (e.g.
 Jumper) where the middle of the component was considered as a connected point

---
 .../src/org/diylc/presenter/update.xml           | 16 ++++++++++++++++
 .../components/connectivity/HookupWire.java      |  2 +-
 .../diylc/components/connectivity/Jumper.java    |  2 +-
 .../components/connectivity/TwistedWire.java     |  4 ++--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index 85e9bcbc..013d8d76 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -2764,6 +2764,22 @@
 				</org.diylc.appframework.update.Change>
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
+		</org.diylc.appframework.update.Version>
+		<org.diylc.appframework.update.Version>
+			<versionNumber>
+				<major>4</major>
+				<minor>1</minor>
+				<build>0</build>
+			</versionNumber>
+			<releaseDate>2020-03-26 00:00:00.000 CET</releaseDate>
+			<name></name>
+			<changes>				
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Issues with connectivity check with some components (e.g. Jumper) where the middle of the component was considered as a connected point</description>
+				</org.diylc.appframework.update.Change>
+			</changes>
+			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>	
 	</a>
 </java.util.Arrays_-ArrayList>
diff --git a/diylc/diylc-library/src/org/diylc/components/connectivity/HookupWire.java b/diylc/diylc-library/src/org/diylc/components/connectivity/HookupWire.java
index 0c92c859..e8d9fdd0 100644
--- a/diylc/diylc-library/src/org/diylc/components/connectivity/HookupWire.java
+++ b/diylc/diylc-library/src/org/diylc/components/connectivity/HookupWire.java
@@ -136,6 +136,6 @@ public class HookupWire extends AbstractCurvedComponent<Void> implements IContin
 
   @Override
   public boolean arePointsConnected(int index1, int index2) {
-    return Math.abs(index1 - index2) == getControlPointCount() - 1;
+    return index1 <= 1 && index2 <= 1;
   }  
 }
diff --git a/diylc/diylc-library/src/org/diylc/components/connectivity/Jumper.java b/diylc/diylc-library/src/org/diylc/components/connectivity/Jumper.java
index 88fcad81..003e421c 100644
--- a/diylc/diylc-library/src/org/diylc/components/connectivity/Jumper.java
+++ b/diylc/diylc-library/src/org/diylc/components/connectivity/Jumper.java
@@ -161,7 +161,7 @@ public class Jumper extends AbstractLeadedComponent<Void> implements IContinuity
 
   @Override
   public boolean arePointsConnected(int index1, int index2) {
-    return true;
+    return index1 <= 1 && index2 <= 1;
   }  
   
   public boolean getMoveLabel() {
diff --git a/diylc/diylc-library/src/org/diylc/components/connectivity/TwistedWire.java b/diylc/diylc-library/src/org/diylc/components/connectivity/TwistedWire.java
index 4265caa7..444d923e 100644
--- a/diylc/diylc-library/src/org/diylc/components/connectivity/TwistedWire.java
+++ b/diylc/diylc-library/src/org/diylc/components/connectivity/TwistedWire.java
@@ -436,6 +436,6 @@ public class TwistedWire extends AbstractCurvedComponent<Void> implements IConti
   
   @Override
   public boolean arePointsConnected(int index1, int index2) {
-    return Math.abs(index1 - index2) == getControlPointCount() - 1;
-  }  
+    return index1 <= 1 && index2 <= 1;
+  } 
 }