X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFormatAdapter.java;h=4d8794f5326f6654d651418bf081ba4937cd5e38;hb=2305d687bac5ed8a76ecb93c54c7b090a928e362;hp=f09e8a0e4e80e27c23b95c074fb82627e7e906dc;hpb=136c0793b90b72b928c4d77dc109dd5c644e00d3;p=jalview.git diff --git a/src/jalview/io/FormatAdapter.java b/src/jalview/io/FormatAdapter.java index f09e8a0..4d8794f 100755 --- a/src/jalview/io/FormatAdapter.java +++ b/src/jalview/io/FormatAdapter.java @@ -33,6 +33,7 @@ import jalview.datamodel.SequenceI; import jalview.util.Comparison; import java.io.IOException; +import java.util.Locale; /** * Additional formatting methods used by the application in a number of places. @@ -116,8 +117,8 @@ public class FormatAdapter extends AppletFormatAdapter startIndex = startEnd[0]; endIndex = startEnd[1]; // get first non-gaped residue start position - while (Comparison.isGap(seqs[i] - .getCharAt(startIndex)) && startIndex < endIndex) + while (Comparison.isGap(seqs[i].getCharAt(startIndex)) + && startIndex < endIndex) { startIndex++; } @@ -161,7 +162,8 @@ public class FormatAdapter extends AppletFormatAdapter public boolean getCacheSuffixDefault(FileFormatI format) { - return Cache.getDefault(format.getName() + "_JVSUFFIX", true); + return Cache.getDefault(format.getName().toUpperCase(Locale.ROOT) + "_JVSUFFIX", + true); } public String formatSequences(FileFormatI format, AlignmentI alignment, @@ -211,12 +213,12 @@ public class FormatAdapter extends AppletFormatAdapter AlignmentAnnotation na = new AlignmentAnnotation(ala[i]); if (selgp != null) { - hidden.makeVisibleAnnotation(selgp.getStartRes(), - selgp.getEndRes(), na); + na.makeVisibleAnnotation(selgp.getStartRes(), selgp.getEndRes(), + hidden); } else { - hidden.makeVisibleAnnotation(na); + na.makeVisibleAnnotation(hidden); } alv.addAnnotation(na); }