Issues with circuit analysis introduced in version 4.0.1. Wires and

jumpers are made non-conductive by mistake.

diylc/diylc-core/src/org/diylc/presenter/update.xml

@@ -2774,6 +2774,10 @@
 			<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 circuit analysis introduced in version 4.0.1. Wires and jumpers are made non-conductive by mistake.</description>
+				</org.diylc.appframework.update.Change>
 				<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>

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 index1 <= 1 && index2 <= 1;
+    return Math.abs(index1 - index2) == getControlPointCount() - 1;
   }  
 }

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 index1 <= 1 && index2 <= 1;
+    return index1 <= 1 && index2 <= 1 && index1 != index2;
   }  
   
   public boolean getMoveLabel() {

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 index1 <= 1 && index2 <= 1;
+    return Math.abs(index1 - index2) == getControlPointCount() - 1;
   } 
 }