Merge branch 'develop' into patch/JAL-3088_finalbracenotinrightplace

[jalview.git] / src / jalview / io / gff / ExonerateHelper.java

diff --git a/src/jalview/io/gff/ExonerateHelper.java b/src/jalview/io/gff/ExonerateHelper.java
index 91add1a..77b641a 100644 (file)
--- a/src/jalview/io/gff/ExonerateHelper.java
+++ b/src/jalview/io/gff/ExonerateHelper.java
@@ -20,6 +20,8 @@
  */
 package jalview.io.gff;
 
+import java.util.Locale;
+
 import jalview.datamodel.AlignedCodonFrame;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.MappingType;
@@ -88,7 +90,7 @@ public class ExonerateHelper extends Gff2Helper
               relaxedIdMatching);
     } catch (IOException ivfe)
     {
-      System.err.println(ivfe);
+      jalview.bin.Console.errPrintln(ivfe);
     }
 
     /*
@@ -198,7 +200,7 @@ public class ExonerateHelper extends Gff2Helper
     }
     else if (!"+".equals(strand))
     {
-      System.err.println("Strand must be specified for alignment");
+      jalview.bin.Console.errPrintln("Strand must be specified for alignment");
       return;
     }
 
@@ -237,7 +239,7 @@ public class ExonerateHelper extends Gff2Helper
     String[] tokens = region.split(" ");
     if (tokens.length != 3)
     {
-      System.err.println("Malformed Align descriptor: " + region);
+      jalview.bin.Console.errPrintln("Malformed Align descriptor: " + region);
       return null;
     }
 
@@ -255,7 +257,7 @@ public class ExonerateHelper extends Gff2Helper
       alignCount = Integer.parseInt(tokens[2]);
     } catch (NumberFormatException nfe)
     {
-      System.err.println(nfe.toString());
+      jalview.bin.Console.errPrintln(nfe.toString());
       return null;
     }
 
@@ -341,7 +343,7 @@ public class ExonerateHelper extends Gff2Helper
     // e.g. exonerate:protein2genome:local
     if (model != null)
     {
-      String mdl = model.toLowerCase();
+      String mdl = model.toLowerCase(Locale.ROOT);
       if (mdl.contains(PROTEIN2DNA) || mdl.contains(PROTEIN2GENOME)
               || mdl.contains(CODING2CODING) || mdl.contains(CODING2GENOME)
               || mdl.contains(CDNA2GENOME) || mdl.contains(GENOME2GENOME))
@@ -349,16 +351,20 @@ public class ExonerateHelper extends Gff2Helper
         return true;
       }
     }
-    System.err.println("Sorry, I don't handle exonerate model " + model);
+    jalview.bin.Console.errPrintln("Sorry, I don't handle exonerate model " + model);
     return false;
   }
 
+  /**
+   * An override to set feature group to "exonerate" instead of the default GFF
+   * source value (column 2)
+   */
   @Override
   protected SequenceFeature buildSequenceFeature(String[] gff,
           Map<String, List<String>> set)
   {
-    SequenceFeature sf = super.buildSequenceFeature(gff, set);
-    sf.setFeatureGroup("exonerate");
+    SequenceFeature sf = super.buildSequenceFeature(gff, TYPE_COL,
+            "exonerate", set);
 
     return sf;
   }