JAL-1551 spotlessApply

[jalview.git] / src / jalview / datamodel / Alignment.java

diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java
index 321eee3..4d3d578 100755 (executable)
--- a/src/jalview/datamodel/Alignment.java
+++ b/src/jalview/datamodel/Alignment.java
@@ -2050,14 +2050,14 @@ public class Alignment implements AlignmentI, AutoCloseable
   public ContactMatrixI getContactMatrixFor(AlignmentAnnotation _aa)
   {
     ContactMatrixI cm = cmholder.getContactMatrixFor(_aa);
-    if (cm==null && _aa.groupRef!=null)
+    if (cm == null && _aa.groupRef != null)
     {
       cm = _aa.groupRef.getContactMatrixFor(_aa);
     }
-    if (cm==null && _aa.sequenceRef!=null)
+    if (cm == null && _aa.sequenceRef != null)
     {
       cm = _aa.sequenceRef.getContactMatrixFor(_aa);
-      if (cm==null)
+      if (cm == null)
       {
         // TODO fix up this logic and unify with getContactListFor
         cm = _aa.sequenceRef.getDatasetSequence().getContactMatrixFor(_aa);
@@ -2080,10 +2080,12 @@ public class Alignment implements AlignmentI, AutoCloseable
       if (spos >= _aa.sequenceRef.getStart()
               && spos <= 1 + _aa.sequenceRef.getEnd())
       {
-        cl = _aa.sequenceRef.getContactListFor(_aa, spos);
+        cl = _aa.sequenceRef.getContactListFor(_aa,
+                spos - _aa.sequenceRef.getStart());
         if (cl == null && _aa.sequenceRef.getDatasetSequence() != null)
         {
-          _aa.sequenceRef.getDatasetSequence().getContactListFor(_aa, spos);
+          _aa.sequenceRef.getDatasetSequence().getContactListFor(_aa,
+                  spos - _aa.sequenceRef.getStart());
         }
       }
     }