X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAlignFile.java;h=f933961b3c6886330bcdc2f2520aa195913cd66f;hb=2f1b1f33d31e1b068cea66d66f0bed29a4585cf7;hp=630dc6cdcdedf2b0a001dda247d42d09fce2fefa;hpb=783520af519c958e10a2af29f1d4242e1ab890a3;p=jalview.git

diff --git a/src/jalview/io/AlignFile.java b/src/jalview/io/AlignFile.java
index 630dc6c..f933961 100755
--- a/src/jalview/io/AlignFile.java
+++ b/src/jalview/io/AlignFile.java
@@ -39,7 +39,6 @@ public abstract class AlignFile extends FileParse
     Vector headers;
     long start;
     long end;
-    boolean dbPrefix = false;
     boolean jvSuffix = true;
 
     /**
@@ -152,67 +151,31 @@ public abstract class AlignFile extends FileParse
      */
     public abstract String print();
 
-    public void addDBPrefix(boolean b)
-    {
-      dbPrefix = b;
-    }
-
     public void addJVSuffix(boolean b)
     {
       jvSuffix = b;
     }
 
     /**
-     * A general parser for ids. Will look for dbrefs in
-     * Uniprot format source|id
-     * And also Jalview /start-end
+     * A general parser for ids.
      *
      * @String id Id to be parsed
      */
     Sequence parseId(String id)
     {
-      Sequence seq = new Sequence("","");
+      Sequence seq = null;
+      id = id.trim();
       int space = id.indexOf(" ");
       if(space>-1)
       {
+        seq = new Sequence(id.substring(0, space),"");
         seq.setDescription(id.substring(space+1));
-        id = id.substring(0, space);
       }
-
-      // Read in any DB refs first
-      StringTokenizer st;
-      st = new StringTokenizer(id, "|");
-
-      while (st.countTokens()>2)
+      else
       {
-        seq.addDBRef( new DBRefEntry( st.nextToken(), "0", st.nextToken()));
+        seq = new Sequence(id, "");
       }
 
-      if(st.hasMoreTokens())
-        id = st.nextToken();
-
-
-      // Remove /start-end from sequence
-      if (id.indexOf("/") > 0)
-      {
-        st = new StringTokenizer(id, "/");
-
-        if (st.countTokens() == 2)
-        {
-          id = st.nextToken();
-
-          String tmp = st.nextToken();
-
-          st = new StringTokenizer(tmp, "-");
-
-          if (st.countTokens() == 2)
-          {
-            seq.setStart( Integer.valueOf(st.nextToken()).intValue() );
-            seq.setEnd( Integer.valueOf(st.nextToken()).intValue() );
-          }
-        }
-      }
-      seq.setName(id);
       return seq;
     }
 
@@ -225,25 +188,7 @@ public abstract class AlignFile extends FileParse
      */
     String printId(SequenceI seq)
     {
-      StringBuffer result = new StringBuffer();
-      if(dbPrefix && seq.getDBRef()!=null)
-      {
-        Vector dbrefs = seq.getDBRef();
-        for(int i=0; i<dbrefs.size(); i++)
-        {
-          DBRefEntry entry = (DBRefEntry)dbrefs.elementAt(i);
-          result.append(entry.getSource()+"|"+entry.getAccessionId()+"|");
-        }
-      }
-
-      result.append(seq.getName());
-
-      if(jvSuffix)
-      {
-        result.append("/"+seq.getStart()+"-"+seq.getEnd());
-      }
-
-      return result.toString();
+     return seq.getDisplayId(jvSuffix);
     }
 
 }