Added a flag to control if the "/<seq_start>-<seq_end>" field of

SequenceI.Name is included in fastA format files. This is used in the
Jemboss client.

diff --git a/src/jalview/io/FastaFile.java b/src/jalview/io/FastaFile.java
index 9a6e060..586ede6 100755 (executable)
--- a/src/jalview/io/FastaFile.java
+++ b/src/jalview/io/FastaFile.java
@@ -98,7 +98,12 @@ public class FastaFile extends AlignFile {
   public static String print(SequenceI[] s, int len) {\r
     return print(s,len,true);\r
   }\r
+\r
   public static String print(SequenceI[] s, int len,boolean gaps) {\r
+    return print(s,len,gaps,true);\r
+  }\r
+\r
+  public static String print(SequenceI[] s, int len,boolean gaps, boolean displayId) {\r
     StringBuffer out = new StringBuffer();\r
     int i = 0;\r
     while (i < s.length && s[i] != null) {\r
@@ -108,8 +113,8 @@ public class FastaFile extends AlignFile {
       } else {\r
         seq = AlignSeq.extractGaps("-. ",s[i].getSequence());\r
       }\r
-\r
-      out.append(">" + s[i].getName() + "/" + s[i].getStart() + "-" + s[i].getEnd() + "\n");\r
+      // used to always put this here: + "/" + s[i].getStart() + "-" + s[i].getEnd() +\r
+      out.append(">" + ((displayId) ? s[i].getDisplayId() : s[i].getName())+"\n");\r
 \r
       int nochunks = seq.length() / len + 1;\r
 \r

diff --git a/src/jalview/ws/Jemboss.java b/src/jalview/ws/Jemboss.java
index 336be27..a8bf163 100755 (executable)
--- a/src/jalview/ws/Jemboss.java
+++ b/src/jalview/ws/Jemboss.java
@@ -134,12 +134,12 @@ public class Jemboss
     for (int i=0; i<sequences.length; i++) {
         myseq[i] = new Sequence(sequences[i]);
     }
-    // Uniqueify, and 
+    // Uniqueify, and
     Hashtable namemap = uniquify(myseq);
     // Load sequence file into hash
-    
+
     filesToMove.put("jalseqs.fasta",
-                    jalview.io.FastaFile.print(myseq,124,false).getBytes());
+                    jalview.io.FastaFile.print(myseq,124,false, false).getBytes());
 
     if(vamsas_server.getUseAuth() == true)
       if(vamsas_server.getServiceUserName() == null)
@@ -163,7 +163,7 @@ public class Jemboss
           String alfile = h.get(thiskey).toString();
           String format = IdentifyFile.Identify(alfile, "Paste");
           SequenceI[] alignment = null;
-          
+
           if (FormatProperties.contains(format))
             alignment = FormatAdapter.read(alfile, "Paste", format);
           else