X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FAAFrequency.java;h=3a7995913b3110ae210806a277d9a3250c3fe82a;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=50045dc72a620ce73b344003c526c657109f0611;hpb=e5c9a94fcd7765b981e73640626989217276a46a;p=jalview.git diff --git a/src/jalview/analysis/AAFrequency.java b/src/jalview/analysis/AAFrequency.java index 50045dc..3a79959 100755 --- a/src/jalview/analysis/AAFrequency.java +++ b/src/jalview/analysis/AAFrequency.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -198,9 +198,8 @@ public class AAFrequency if (profile) { // TODO use a 1-dimensional array with jSize, nongap in [0] and [1] - residueHash.put(PROFILE, new int[][] - { values, new int[] - { jSize, nongap } }); + residueHash.put(PROFILE, new int[][] { values, + new int[] { jSize, nongap } }); } residueHash.put(MAXCOUNT, new Integer(maxCount)); residueHash.put(MAXRESIDUE, maxResidue); @@ -369,8 +368,7 @@ public class AAFrequency .append("%"); } consensus.annotations[i] = new Annotation(maxRes, - mouseOver.toString(), ' ', - value); + mouseOver.toString(), ' ', value); } } @@ -462,7 +460,8 @@ public class AAFrequency * @param hashtable * @return */ - public static int[] extractCdnaProfile(Hashtable hashtable, boolean ignoreGaps) + public static int[] extractCdnaProfile(Hashtable hashtable, + boolean ignoreGaps) { // this holds #seqs, #ungapped, and then codon count, indexed by encoded // codon triplet @@ -507,7 +506,7 @@ public class AAFrequency result[1] = distinctValuesCount; return Arrays.copyOfRange(result, 0, j); } - + /** * Compute a consensus for the cDNA coding for a protein alignment. * @@ -664,8 +663,7 @@ public class AAFrequency final int pct = codonCount * 100 / totalCount; String codon = String .valueOf(CodingUtils.decodeCodon(codonEncoded)); - percent = fmt == null ? Integer.toString(pct) : fmt - .form(pct); + percent = fmt == null ? Integer.toString(pct) : fmt.form(pct); if (showProfileLogo || codonCount == modalCodonCount) { if (percent.equals(lastPercent) && j > 0) @@ -678,8 +676,7 @@ public class AAFrequency if (samePercent.length() > 0) { mouseOver.append(samePercent).append(": ") - .append(lastPercent) - .append("% "); + .append(lastPercent).append("% "); } samePercent.setLength(0); samePercent.append(codon);