X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FRNAHelicesColour.java;h=583405bce3cff104b29ba373ae202b860a29d482;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=0a3705282cf7417be4482e31b79392e3302b30b9;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git diff --git a/src/jalview/schemes/RNAHelicesColour.java b/src/jalview/schemes/RNAHelicesColour.java index 0a37052..583405b 100644 --- a/src/jalview/schemes/RNAHelicesColour.java +++ b/src/jalview/schemes/RNAHelicesColour.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.schemes; @@ -65,6 +67,7 @@ public class RNAHelicesColour extends ResidueColourScheme this.annotation = annotation; refresh(); } + public RNAHelicesColour(AnnotatedCollectionI alignment) { super(ResidueProperties.nucleotideIndex); @@ -77,28 +80,31 @@ public class RNAHelicesColour extends ResidueColourScheme { // This loop will find the first rna structure annotation by which to colour - // the sequences. + // the sequences. AlignmentAnnotation[] annotations = alignment.getAlignmentAnnotation(); - for (int i = 0; i < annotations.length; i++) { - - // is this a sensible way of determining type of annotation? - if (annotations[i].getRNAStruc() != null) { - annotation = annotations[i]; - break; - } + for (int i = 0; i < annotations.length; i++) + { + + // is this a sensible way of determining type of annotation? + if (annotations[i].getRNAStruc() != null) + { + annotation = annotations[i]; + break; + } } refresh(); } + private long lastrefresh = -1; public void refresh() { - - if (annotation!=null && ((annotation._rnasecstr == null - || lastrefresh != annotation._rnasecstr.hashCode()) - && annotation.isValidStruc())) + + if (annotation != null + && ((annotation._rnasecstr == null || lastrefresh != annotation._rnasecstr + .hashCode()) && annotation.isValidStruc())) { annotation.getRNAStruc(); lastrefresh = annotation._rnasecstr.hashCode();