formatting

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

diff --git a/src/jalview/io/ClustalFile.java b/src/jalview/io/ClustalFile.java
index 8c0cac1..83045a2 100755 (executable)
--- a/src/jalview/io/ClustalFile.java
+++ b/src/jalview/io/ClustalFile.java
@@ -49,9 +49,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 +62,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 +101,7 @@ public class ClustalFile extends AlignFile
                 {
                   tempseq.append(str.nextToken());
                 }
-                top=false;
+                top = false;
               }
             }
           }
@@ -109,13 +109,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,26 +160,32 @@ 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());
@@ -184,7 +194,7 @@ public class ClustalFile extends AlignFile
 
   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;