Merge branch 'bug/JAL-2507_rnasecstrstockholmoutput' into develop

[jalview.git] / src / jalview / io / StockholmFile.java

diff --git a/src/jalview/io/StockholmFile.java b/src/jalview/io/StockholmFile.java
index 2061f29..a47e1ea 100644 (file)
--- a/src/jalview/io/StockholmFile.java
+++ b/src/jalview/io/StockholmFile.java
@@ -800,9 +800,9 @@ public class StockholmFile extends AlignFile
   {
     String convert1, convert2 = null;
 
-    convert1 = OPEN_PAREN.replaceAll(annots);
-    convert2 = CLOSE_PAREN.replaceAll(convert1);
-    annots = convert2;
+    // convert1 = OPEN_PAREN.replaceAll(annots);
+    // convert2 = CLOSE_PAREN.replaceAll(convert1);
+    // annots = convert2;
 
     String type = label;
     if (label.contains("_cons"))
@@ -978,15 +978,19 @@ public class StockholmFile extends AlignFile
         {
           for (int j = 0; j < alAnot.length; j++)
           {
-            if (ds.getSequenceFeatures() != null)
+
+            String key = type2id(alAnot[j].label);
+            boolean isrna = alAnot[j].isValidStruc();
+
+            if (isrna)
             {
-              feature = ds.getSequenceFeatures()[0].type;
+              // hardwire to secondary structure if there is RNA secondary
+              // structure on the annotation
+              key = "SS";
             }
-            // ?bug - feature may still have previous loop value
-            String key = type2id(feature);
-
             if (key == null)
             {
+
               continue;
             }
 
@@ -994,7 +998,6 @@ public class StockholmFile extends AlignFile
             out.append(new Format("%-" + maxid + "s").form("#=GR "
                     + printId(s[i], jvSuffix) + " " + key + " "));
             ann = alAnot[j].annotations;
-            boolean isrna = alAnot[j].isValidStruc();
             String seq = "";
             for (int k = 0; k < ann.length; k++)
             {