X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FAnnotationColourGradient.java;h=218b5fa9a7752cc5706ef82756eb5997338ac462;hb=e280466ffa0b7103da4a8ebe85aacbad354fd278;hp=78e850bacd01ba858e7357ab074005c8d8baa0a2;hpb=7dd551e9777c347dd483519522791d5cbb93576e;p=jalview.git diff --git a/src/jalview/schemes/AnnotationColourGradient.java b/src/jalview/schemes/AnnotationColourGradient.java index 78e850b..218b5fa 100755 --- a/src/jalview/schemes/AnnotationColourGradient.java +++ b/src/jalview/schemes/AnnotationColourGradient.java @@ -1,13 +1,13 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * 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. - * + * * 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 @@ -108,13 +108,16 @@ public class AnnotationColourGradient extends ResidueColourScheme { // TODO Auto-generated method stub super.alignmentChanged(alignment, hiddenReps); - + if (seqAssociated && annotation.getCalcId() != null) { - if (seqannot!=null) { + if (seqannot != null) + { seqannot.clear(); - } else { - seqannot=new IdentityHashMap(); + } + else + { + seqannot = new IdentityHashMap(); } for (AlignmentAnnotation alan : alignment.findAnnotation(annotation .getCalcId())) @@ -193,8 +196,9 @@ public class AnnotationColourGradient extends ResidueColourScheme public Color findColour(char c, int j, SequenceI seq) { Color currentColour = Color.white; - AlignmentAnnotation annotation=(seqAssociated ? seqannot.get(seq):this.annotation); - if (annotation==null) + AlignmentAnnotation annotation = (seqAssociated ? seqannot.get(seq) + : this.annotation); + if (annotation == null) { return currentColour; }