Merge remote-tracking branch 'origin/releases/Release_2_10_2b1_Branch'

[jalview.git] / src / jalview / ext / varna / VarnaCommands.java

diff --git a/src/jalview/ext/varna/VarnaCommands.java b/src/jalview/ext/varna/VarnaCommands.java
index d65f1d5..4dd0648 100644 (file)
--- a/src/jalview/ext/varna/VarnaCommands.java
+++ b/src/jalview/ext/varna/VarnaCommands.java
@@ -48,8 +48,7 @@ public class VarnaCommands
   public static String[] getColourBySequenceCommand(
           StructureSelectionManager ssm, String[] files,
           SequenceI[][] sequence, SequenceRenderer sr,
-          FeatureColourFinder finder,
-          AlignmentI alignment)
+          FeatureColourFinder finder, AlignmentI alignment)
   {
     ArrayList<String> str = new ArrayList<String>();
     StringBuffer command = new StringBuffer();
@@ -91,21 +90,14 @@ public class VarnaCommands
               Color col = sr.getResidueColour(sequence[pdbfnum][s], r,
                       finder);
 
-              String newSelcom = (mapping[m].getChain() != " " ? ":"
-                      + mapping[m].getChain() : "")
-                      + "/"
-                      + (pdbfnum + 1)
-                      + ".1"
-                      + ";color["
-                      + col.getRed()
-                      + ","
-                      + col.getGreen()
-                      + ","
+              String newSelcom = (mapping[m].getChain() != " "
+                      ? ":" + mapping[m].getChain()
+                      : "") + "/" + (pdbfnum + 1) + ".1" + ";color["
+                      + col.getRed() + "," + col.getGreen() + ","
                       + col.getBlue() + "]";
-              if (command.length() > newSelcom.length()
-                      && command.substring(
-                              command.length() - newSelcom.length())
-                              .equals(newSelcom))
+              if (command.length() > newSelcom.length() && command
+                      .substring(command.length() - newSelcom.length())
+                      .equals(newSelcom))
               {
                 command = VarnaCommands.condenseCommand(command, pos);
                 continue;