JAL-2349 store/restore mappable contact matrix in project and fix up interactive...

[jalview.git] / src / jalview / ws / datamodel / alphafold / PAEContactMatrix.java

diff --git a/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java b/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
index 9d7891d..d496097 100644 (file)
--- a/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
+++ b/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
@@ -209,21 +209,21 @@ public class PAEContactMatrix extends MappableContactMatrix<PAEContactMatrix> im
   @Override
   public ContactListI getContactList(final int column)
   {
-    final int _column;
-    if (toSeq != null)
-    {
-      int[] word = toSeq.locateInTo(column, column);
-      if (word == null)
-      {
-        return null;
-      }
-      _column = word[0];
-    }
-    else
-    {
-      _column = column;
-    }
-    if (_column < 0 || _column >= elements.length)
+//    final int _column;
+//    if (toSeq != null)
+//    {
+//      int[] word = toSeq.locateInTo(column, column);
+//      if (word == null)
+//      {
+//        return null;
+//      }
+//      _column = word[0];
+//    }
+//    else
+//    {
+//      _column = column;
+//    }
+    if (column < 0 || column >= elements.length)
     {
       return null;
     }
@@ -233,7 +233,7 @@ public class PAEContactMatrix extends MappableContactMatrix<PAEContactMatrix> im
       @Override
       public int getPosition()
       {
-        return _column;
+        return column;
       }
 
       @Override
@@ -245,12 +245,11 @@ public class PAEContactMatrix extends MappableContactMatrix<PAEContactMatrix> im
       @Override
       public double getContactAt(int mcolumn)
       {
-        int[] column=(toSeq==null) ? new int[] {mcolumn} : toSeq.locateInTo(mcolumn,mcolumn);
-        if (column==null || column[0] < 0 || column[0] >= elements[_column].length)
+        if (mcolumn < 0 || mcolumn >= elements[column].length)
         {
           return -1;
         }
-        return elements[_column][column[0]];
+        return elements[column][mcolumn];
       }
     });
   }