Merge branch 'develop' into spike/JAL-4047/JAL-4048_columns_in_sequenceID

[jalview.git] / src / jalview / appletgui / TreeCanvas.java

diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java
index 8c3e39a..f965ff4 100755 (executable)
--- a/src/jalview/appletgui/TreeCanvas.java
+++ b/src/jalview/appletgui/TreeCanvas.java
@@ -131,7 +131,7 @@ public class TreeCanvas extends Panel
     {
       BinaryNode lf = leaves.elementAt(i);
 
-      if (lf instanceof SequenceNode && ((SequenceNode)lf).isPlaceholder())
+      if (lf instanceof SequenceNode && ((SequenceNode) lf).isPlaceholder())
       {
         has_placeholders = true;
       }
@@ -211,9 +211,10 @@ public class TreeCanvas extends Panel
         g.drawString(nodeLabel, xstart + 2, ypos - 2);
       }
 
-      String name = (markPlaceholders && node instanceof SequenceNode && ((SequenceNode) node).isPlaceholder())
-              ? (PLACEHOLDER + node.getName())
-              : node.getName();
+      String name = (markPlaceholders && node instanceof SequenceNode
+              && ((SequenceNode) node).isPlaceholder())
+                      ? (PLACEHOLDER + node.getName())
+                      : node.getName();
       FontMetrics fm = g.getFontMetrics(font);
       int charWidth = fm.stringWidth(name) + 3;
       int charHeight = fm.getHeight();
@@ -385,8 +386,8 @@ public class TreeCanvas extends Panel
     }
     else
     {
-      pickNode(pickBox, (BinaryNode) node.left(), chunk, scale, width,
-              offx, offy);
+      pickNode(pickBox, (BinaryNode) node.left(), chunk, scale, width, offx,
+              offy);
       pickNode(pickBox, (BinaryNode) node.right(), chunk, scale, width,
               offx, offy);
     }