From 20645fed1366ca22b92adc9f5a8459d1541f72d8 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Fri, 15 Feb 2019 22:52:36 +0100
Subject: [PATCH] fix switched jack point location proper node names

---
 .../electromechanical/OpenJack1_4.java          | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java
index e39251c8..d8065533 100644
--- a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java
+++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java
@@ -298,8 +298,8 @@ public class OpenJack1_4 extends AbstractMultiPartComponent<String> {
 
     int centerY = y + springLength - holeToEdge;
 
-    AffineTransform.getRotateInstance(SLEEVE_THETA, x, centerY).transform(controlPoints[0], controlPoints[1]);
-    AffineTransform.getRotateInstance(RING_THETA, x, centerY).transform(controlPoints[0], controlPoints[2]);
+    AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, x, centerY).transform(controlPoints[0], controlPoints[1]);
+    AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, x, centerY).transform(controlPoints[0], controlPoints[2]);
 
     // Rotate if needed
     if (orientation != Orientation.DEFAULT) {
@@ -420,6 +420,19 @@ public class OpenJack1_4 extends AbstractMultiPartComponent<String> {
     this.showLabels = showLabels;
   }
   
+  @Override
+  public String getControlPointNodeName(int index) {
+    if (index == 0)
+      return "Tip";
+    if (index == 1)
+      return "Sleeve";
+    if (index == 2 && getType() == OpenJackType.STEREO)
+      return "Ring";
+    if (index == 2 && getType() == OpenJackType.SWITCHED)
+      return "Shunt";
+    return null;
+  }
+  
   public enum OpenJackType {
 
     MONO, STEREO, SWITCHED;