X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FCovariationColourScheme.java;h=dc7971b9e3582b2add896656a7601d8de0608b90;hb=f8d65c3705e11a6aacb4fcaff1bf76e4932f1609;hp=6cb095b32e8795a3237e21104bed3fa02384da1f;hpb=136c0793b90b72b928c4d77dc109dd5c644e00d3;p=jalview.git diff --git a/src/jalview/schemes/CovariationColourScheme.java b/src/jalview/schemes/CovariationColourScheme.java index 6cb095b..dc7971b 100644 --- a/src/jalview/schemes/CovariationColourScheme.java +++ b/src/jalview/schemes/CovariationColourScheme.java @@ -20,10 +20,9 @@ */ package jalview.schemes; +import jalview.api.AlignViewportI; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AnnotatedCollectionI; -import jalview.datamodel.SequenceCollectionI; -import jalview.datamodel.SequenceI; import jalview.util.ColorUtils; import java.awt.Color; @@ -38,9 +37,9 @@ import java.util.Map; */ public class CovariationColourScheme extends ResidueColourScheme { - public Map helixcolorhash = new Hashtable(); + public Map helixcolorhash = new Hashtable<>(); - public Map positionsToHelix = new Hashtable(); + public Map positionsToHelix = new Hashtable<>(); int numHelix = 0; @@ -51,8 +50,8 @@ public class CovariationColourScheme extends ResidueColourScheme * be coloured */ @Override - public ColourSchemeI getInstance(AnnotatedCollectionI coll, - Map hrs) + public ColourSchemeI getInstance(AlignViewportI view, + AnnotatedCollectionI coll) { return new CovariationColourScheme(coll.getAlignmentAnnotation()[0]); } @@ -77,10 +76,11 @@ public class CovariationColourScheme extends ResidueColourScheme positionsToHelix.put(this.annotation._rnasecstr[x].getEnd(), this.annotation._rnasecstr[x].getFeatureGroup()); - if (Integer.parseInt(this.annotation._rnasecstr[x].getFeatureGroup()) > numHelix) + if (Integer.parseInt( + this.annotation._rnasecstr[x].getFeatureGroup()) > numHelix) { - numHelix = Integer.parseInt(this.annotation._rnasecstr[x] - .getFeatureGroup()); + numHelix = Integer + .parseInt(this.annotation._rnasecstr[x].getFeatureGroup()); } }