JAL-1517 source formatting

[jalview.git] / src / jalview / gui / AlignmentPanel.java

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 6ae19a5..134019d 100644 (file)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -424,16 +424,19 @@ public class AlignmentPanel extends GAlignmentPanel implements
   protected void validateAnnotationDimensions(boolean adjustPanelHeight)
   {
     int height = annotationPanel.adjustPanelHeight();
-    
-    int theight = av.getCharHeight() * (av.getAlignment().getHeight() + (!av.hasHiddenRows() ? 0 : av.getAlignment().getHiddenSequences().getSize()));
-    float sscaling = (float) (theight/(1.0*theight+height));
-    float ascaling=(float)(height*1.0/alignFrame.getHeight());
+
+    int theight = av.getCharHeight()
+            * (av.getAlignment().getHeight() + (!av.hasHiddenRows() ? 0
+                    : av.getAlignment().getHiddenSequences().getSize()));
+    float sscaling = (float) (theight / (1.0 * theight + height));
+    float ascaling = (float) (height * 1.0 / alignFrame.getHeight());
     int rheight = alignFrame.getHeight() - height - av.getCharHeight();
     if (adjustPanelHeight)
     {
-      // NOTE: this logic is different in the applet. Need a better algorithm to define behaviour
+      // NOTE: this logic is different in the applet. Need a better algorithm to
+      // define behaviour
       // try and set height according to alignment
-      if (ascaling>0 && sscaling < 0.5)
+      if (ascaling > 0 && sscaling < 0.5)
       {
         // if the alignment is too big then
         // default is 0.5 split
@@ -441,10 +444,11 @@ public class AlignmentPanel extends GAlignmentPanel implements
       }
       else
       {
-        // if space for more than one sequence row left when annotation is fully displayed then set height to annotation height
-        // otherwise, leave at least two lines of sequence shown.  
-        height = (rheight>av.getCharHeight()) ? height : (-av.getCharHeight() * 3
-                + (int) (alignFrame.getHeight() * (1 - sscaling)));
+        // if space for more than one sequence row left when annotation is fully
+        // displayed then set height to annotation height
+        // otherwise, leave at least two lines of sequence shown.
+        height = (rheight > av.getCharHeight()) ? height
+                : (-av.getCharHeight() * 3 + (int) (alignFrame.getHeight() * (1 - sscaling)));
       }
     }
     else
@@ -705,7 +709,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
         seqPanel.seqCanvas.fastPaint(scrollX, scrollY);
         scalePanel.repaint();
 
-        if (av.getShowAnnotation() && scrollX!=0)
+        if (av.getShowAnnotation() && scrollX != 0)
         {
           annotationPanel.fastPaint(scrollX);
         }
@@ -1111,8 +1115,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
   void makeAlignmentImage(int type, File file)
   {
     long progress = System.currentTimeMillis();
-    boolean headless = (System.getProperty("java.awt.headless") != null
-            && System.getProperty("java.awt.headless").equals("true"));
+    boolean headless = (System.getProperty("java.awt.headless") != null && System
+            .getProperty("java.awt.headless").equals("true"));
     if (alignFrame != null && !headless)
     {
       alignFrame.setProgressBar("Saving "