Merge branch 'develop' into bug/JAL-2399textColour

[jalview.git] / src / MCview / PDBChain.java

diff --git a/src/MCview/PDBChain.java b/src/MCview/PDBChain.java
index 6bc79dc..ba93046 100755 (executable)
--- a/src/MCview/PDBChain.java
+++ b/src/MCview/PDBChain.java
@@ -149,7 +149,7 @@ public class PDBChain
         pdbpos++;
       }
 
-      boolean sameResidue = Comparison.compareChars(as.astr1.charAt(i),
+      boolean sameResidue = Comparison.isSameResidue(as.astr1.charAt(i),
               as.astr2.charAt(i), false);
       if (sameResidue)
       {
@@ -518,10 +518,12 @@ public class PDBChain
       try
       {
         index = ResidueProperties.aa3Hash.get(b.at1.resName).intValue();
-        b.startCol = cs.findColour(ResidueProperties.aa[index].charAt(0));
+        b.startCol = cs.findColour(ResidueProperties.aa[index].charAt(0),
+                0, null, null, 0f);
 
         index = ResidueProperties.aa3Hash.get(b.at2.resName).intValue();
-        b.endCol = cs.findColour(ResidueProperties.aa[index].charAt(0));
+        b.endCol = cs.findColour(ResidueProperties.aa[index].charAt(0), 0,
+                null, null, 0f);
 
       } catch (Exception e)
       {