apply jalview code style

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

diff --git a/src/jalview/io/FeaturesFile.java b/src/jalview/io/FeaturesFile.java
index cfc08fb..7c70b54 100755 (executable)
--- a/src/jalview/io/FeaturesFile.java
+++ b/src/jalview/io/FeaturesFile.java
@@ -165,24 +165,27 @@ public class FeaturesFile extends AlignFile
               // fifth is either 'above','below', or 'none'.\r
               // sixth is a float value and only required when fifth is either\r
               // 'above' or 'below'.\r
-              StringTokenizer gcol = new StringTokenizer(colscheme, "|", true);\r
+              StringTokenizer gcol = new StringTokenizer(colscheme, "|",\r
+                      true);\r
               // set defaults\r
               int threshtype = AnnotationColourGradient.NO_THRESHOLD;\r
               float min = Float.MIN_VALUE, max = Float.MAX_VALUE, threshval = Float.NaN;\r
               boolean labelCol = false;\r
               // Parse spec line\r
               String mincol = gcol.nextToken();\r
-              if (mincol=="|")\r
+              if (mincol == "|")\r
               {\r
                 System.err\r
-                .println("Expected either 'label' or a colour specification in the line: "+line );\r
+                        .println("Expected either 'label' or a colour specification in the line: "\r
+                                + line);\r
                 continue;\r
               }\r
               String maxcol = null;\r
               if (mincol.toLowerCase().indexOf("label") == 0)\r
               {\r
                 labelCol = true;\r
-                mincol = (gcol.hasMoreTokens() ? gcol.nextToken() : null); // skip '|'\r
+                mincol = (gcol.hasMoreTokens() ? gcol.nextToken() : null); // skip\r
+                                                                           // '|'\r
                 mincol = (gcol.hasMoreTokens() ? gcol.nextToken() : null);\r
               }\r
               String abso = null, minval, maxval;\r
@@ -191,16 +194,20 @@ public class FeaturesFile extends AlignFile
                 // at least four more tokens\r
                 if (mincol.equals("|"))\r
                 {\r
-                  mincol="";\r
-                } else {\r
+                  mincol = "";\r
+                }\r
+                else\r
+                {\r
                   gcol.nextToken(); // skip next '|'\r
                 }\r
                 // continue parsing rest of line\r
                 maxcol = gcol.nextToken();\r
                 if (maxcol.equals("|"))\r
                 {\r
-                  maxcol="";\r
-                } else {\r
+                  maxcol = "";\r
+                }\r
+                else\r
+                {\r
                   gcol.nextToken(); // skip next '|'\r
                 }\r
                 abso = gcol.nextToken();\r
@@ -216,7 +223,8 @@ public class FeaturesFile extends AlignFile
                   gcol.nextToken(); // skip next '|'\r
                 }\r
                 maxval = gcol.nextToken();\r
-                if (gcol.hasMoreTokens()) {\r
+                if (gcol.hasMoreTokens())\r
+                {\r
                   gcol.nextToken(); // skip next '|'\r
                 }\r
                 try\r