X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FClustalFile.java;h=5dd0e40f82092213f9b9ab2db4cb95308073a7bf;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=710ef4a252a97939ef0df455982512a54da1767e;hpb=1933431422afc7955684a0bae6c7028a2f8484c8;p=jalview.git

diff --git a/src/jalview/io/ClustalFile.java b/src/jalview/io/ClustalFile.java
index 710ef4a..5dd0e40 100755
--- a/src/jalview/io/ClustalFile.java
+++ b/src/jalview/io/ClustalFile.java
@@ -1,27 +1,34 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.io;
 
-import java.io.*;
-import java.util.*;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
+import jalview.util.Format;
 
-import jalview.datamodel.*;
-import jalview.util.*;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
 
 public class ClustalFile extends AlignFile
 {
@@ -49,9 +56,9 @@ public class ClustalFile extends AlignFile
   {
     int i = 0;
     boolean flag = false;
-    boolean rna=false;
-    boolean top=false;
-    StringBuffer pssecstr=new StringBuffer(),consstr=new StringBuffer();
+    boolean rna = false;
+    boolean top = false;
+    StringBuffer pssecstr = new StringBuffer(), consstr = new StringBuffer();
     Vector headers = new Vector();
     Hashtable seqhash = new Hashtable();
     StringBuffer tempseq;
@@ -62,9 +69,9 @@ public class ClustalFile extends AlignFile
     {
       while ((line = nextLine()) != null)
       {
-        if (line.length()==0)
+        if (line.length() == 0)
         {
-          top=true;
+          top = true;
         }
         if (line.indexOf(" ") != 0)
         {
@@ -101,7 +108,7 @@ public class ClustalFile extends AlignFile
                 {
                   tempseq.append(str.nextToken());
                 }
-                top=false;
+                top = false;
               }
             }
           }
@@ -109,13 +116,17 @@ public class ClustalFile extends AlignFile
           {
             flag = true;
           }
-        } else {
+        }
+        else
+        {
           if (line.matches("\\s+(-|\\.|\\(|\\[|\\]|\\))+"))
           {
             if (top)
             {
               pssecstr.append(line.trim());
-            } else {
+            }
+            else
+            {
               consstr.append(line.trim());
             }
           }
@@ -156,34 +167,41 @@ public class ClustalFile extends AlignFile
                           + headers.elementAt(i));
         }
       }
-      AlignmentAnnotation lastssa=null;
-      if (pssecstr.length()==maxLength)
+      AlignmentAnnotation lastssa = null;
+      if (pssecstr.length() == maxLength)
       {
-        Vector ss=new Vector();
-        AlignmentAnnotation ssa=lastssa=StockholmFile.parseAnnotationRow(ss, "secondary structure", pssecstr.toString());
-        ssa.label="Secondary Structure";
+        Vector ss = new Vector();
+        AlignmentAnnotation ssa = lastssa = StockholmFile
+                .parseAnnotationRow(ss, "secondary structure",
+                        pssecstr.toString());
+        ssa.label = "Secondary Structure";
         annotations.addElement(ssa);
       }
-      if (consstr.length()==maxLength)
+      if (consstr.length() == maxLength)
       {
-        Vector ss=new Vector();
-        AlignmentAnnotation ssa=StockholmFile.parseAnnotationRow(ss, "secondary structure", consstr.toString());
-        ssa.label="Consensus Secondary Structure";
-        if (lastssa==null || !lastssa.getRNAStruc().equals(ssa.getRNAStruc().replace('-', '.')))
+        Vector ss = new Vector();
+        AlignmentAnnotation ssa = StockholmFile.parseAnnotationRow(ss,
+                "secondary structure", consstr.toString());
+        ssa.label = "Consensus Secondary Structure";
+        if (lastssa == null
+                || !lastssa.getRNAStruc().equals(
+                        ssa.getRNAStruc().replace('-', '.')))
         {
           annotations.addElement(ssa);
         }
       }
     }
   }
+
   public String print()
   {
     return print(getSeqsAsArray());
+    // TODO: locaRNA style aln output
   }
 
   public String print(SequenceI[] s)
   {
-    StringBuffer out = new StringBuffer("CLUSTAL"+newline+newline);
+    StringBuffer out = new StringBuffer("CLUSTAL" + newline + newline);
 
     int max = 0;
     int maxid = 0;