X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FStockholmFile.java;h=dc4fabd56e855bda07fa52ce72542bfef8ce2597;hb=cef7be0f9008ff15318e3479a5de35e127071ef3;hp=e22ee0a40800dc58e93b64a04d54dbc29f127bb0;hpb=e327ac5df98f528afeb347ac9a79085ad0d0975b;p=jalview.git diff --git a/src/jalview/io/StockholmFile.java b/src/jalview/io/StockholmFile.java index e22ee0a..dc4fabd 100644 --- a/src/jalview/io/StockholmFile.java +++ b/src/jalview/io/StockholmFile.java @@ -195,7 +195,7 @@ public class StockholmFile extends AlignFile String version; // String id; Hashtable seqAnn = new Hashtable(); // Sequence related annotations - LinkedHashMap seqs = new LinkedHashMap(); + LinkedHashMap seqs = new LinkedHashMap<>(); Regex p, r, rend, s, x; // Temporary line for processing RNA annotation // String RNAannot = ""; @@ -656,7 +656,7 @@ public class StockholmFile extends AlignFile strucAnn = new Hashtable(); } - Vector newStruc = new Vector(); + Vector newStruc = new Vector<>(); parseAnnotationRow(newStruc, type, ns); for (AlignmentAnnotation alan : newStruc) { @@ -708,7 +708,7 @@ public class StockholmFile extends AlignFile private void guessDatabaseFor(Sequence seqO, String dbr, String dbsource) { DBRefEntry dbrf = null; - List dbrs = new ArrayList(); + List dbrs = new ArrayList<>(); String seqdb = "Unknown", sdbac = "" + dbr; int st = -1, en = -1, p; if ((st = sdbac.indexOf("/")) > -1) @@ -997,6 +997,7 @@ public class StockholmFile extends AlignFile } } + // output annotations while (i < s.length && s[i] != null) { @@ -1009,7 +1010,6 @@ public class StockholmFile extends AlignFile String key = type2id(alAnot[j].label); boolean isrna = alAnot[j].isValidStruc(); - if (isrna) { // hardwire to secondary structure if there is RNA secondary @@ -1030,7 +1030,8 @@ public class StockholmFile extends AlignFile for (int k = 0; k < ann.length; k++) { seq += outputCharacter(key, k, isrna, ann, s[i]); - } + + } out.append(seq); out.append(newline); } @@ -1090,6 +1091,8 @@ public class StockholmFile extends AlignFile out.append(newline); } } + + out.append("//"); out.append(newline); @@ -1154,7 +1157,7 @@ public class StockholmFile extends AlignFile out.append("# STOCKHOLM 1.0"); out.append(newline); print(getSeqsAsArray(), false); - + out.append("//"); out.append(newline); return out.toString();