Merge branch 'develop' into features/JAL-1705_ensembl

[jalview.git] / src / jalview / ws / jws2 / JPred301Client.java

diff --git a/src/jalview/ws/jws2/JPred301Client.java b/src/jalview/ws/jws2/JPred301Client.java
index db70fa0..e4d6329 100644 (file)
--- a/src/jalview/ws/jws2/JPred301Client.java
+++ b/src/jalview/ws/jws2/JPred301Client.java
@@ -128,8 +128,7 @@ public class JPred301Client extends JabawsMsaInterfaceAlignCalcWorker
           String[] k = jpredRowLabels.get(fsq.getId());
           if (k == null)
           {
-            k = new String[]
-            { fsq.getId(), "JNet Output" };
+            k = new String[] { fsq.getId(), "JNet Output" };
           }
           if (fsq.getId().startsWith("JNETSOL"))
           {
@@ -142,7 +141,8 @@ public class JPred301Client extends JabawsMsaInterfaceAlignCalcWorker
               {
                 sol[spos] = '0';
               }
-              if (vseq[spos] == 'B' && (sol[spos]=='0' || sol[spos] < amnt))
+              if (vseq[spos] == 'B'
+                      && (sol[spos] == '0' || sol[spos] < amnt))
               {
                 sol[spos] = amnt;
               }
@@ -252,7 +252,7 @@ public class JPred301Client extends JabawsMsaInterfaceAlignCalcWorker
         try
         {
           elm[i] = new Annotation("" + annot, "" + annot, annot,
-                  Integer.valueOf(""+annot));
+                  Integer.valueOf("" + annot));
         } catch (Exception x)
         {
           System.err.println("Expected numeric value in character '"