JAL-3438 spotless for 2.11.2.0

[jalview.git] / test / jalview / viewmodel / OverviewDimensionsShowHiddenTest.java

diff --git a/test/jalview/viewmodel/OverviewDimensionsShowHiddenTest.java b/test/jalview/viewmodel/OverviewDimensionsShowHiddenTest.java
index 842a0fd..b890e48 100644 (file)
--- a/test/jalview/viewmodel/OverviewDimensionsShowHiddenTest.java
+++ b/test/jalview/viewmodel/OverviewDimensionsShowHiddenTest.java
@@ -45,14 +45,20 @@ import org.testng.annotations.Test;
 public class OverviewDimensionsShowHiddenTest
 {
   AlignmentI al;
+
   OverviewDimensionsShowHidden od;
 
   // cached widths and heights
   int boxWidth;
+
   int boxHeight;
+
   int viewHeight;
+
   int viewWidth;
+
   int alheight;
+
   int alwidth;
 
   ViewportRanges vpranges;
@@ -78,7 +84,7 @@ public class OverviewDimensionsShowHiddenTest
     }
     ColumnSelection colsel = new ColumnSelection();
     hiddenCols.revealAllHiddenColumns(colsel);
-    
+
     vpranges = new ViewportRanges(al);
     vpranges.setViewportStartAndHeight(0, 18);
     vpranges.setViewportStartAndWidth(0, 63);
@@ -99,12 +105,12 @@ public class OverviewDimensionsShowHiddenTest
     alheight = vpranges.getAbsoluteAlignmentHeight();
     alwidth = vpranges.getAbsoluteAlignmentWidth();
 
-    boxWidth = Math.round((float) (vpranges.getEndRes()
-            - vpranges.getStartRes() + 1)
-            * od.getWidth() / alwidth);
-    boxHeight = Math.round((float) (vpranges.getEndSeq()
-            - vpranges.getStartSeq() + 1)
-            * od.getSequencesHeight() / alheight);
+    boxWidth = Math.round(
+            (float) (vpranges.getEndRes() - vpranges.getStartRes() + 1)
+                    * od.getWidth() / alwidth);
+    boxHeight = Math.round(
+            (float) (vpranges.getEndSeq() - vpranges.getStartSeq() + 1)
+                    * od.getSequencesHeight() / alheight);
   }
 
   @AfterClass(alwaysRun = true)
@@ -231,10 +237,8 @@ public class OverviewDimensionsShowHiddenTest
     assertEquals(od.getBoxHeight(), boxHeight);
     assertEquals(vpranges.getStartRes(),
             Math.round((float) od.getBoxX() * alwidth / od.getWidth()));
-    assertEquals(
-            vpranges.getStartSeq(),
-            Math.round((float) od.getBoxY() * alheight
-                    / od.getSequencesHeight()));
+    assertEquals(vpranges.getStartSeq(), Math.round(
+            (float) od.getBoxY() * alheight / od.getSequencesHeight()));
 
     // overly large boxY value reset to sequenceHeight - boxHeight
     mouseClick(od, 10, 520);
@@ -248,10 +252,8 @@ public class OverviewDimensionsShowHiddenTest
     // here (float) od.getBoxY() * alheight / od.getSequencesHeight() = 507.5
     // and round rounds to 508; however we get 507 working with row values
     // hence the subtraction of 1
-    assertEquals(
-            vpranges.getStartSeq(),
-            Math.round((float) od.getBoxY() * alheight
-                    / od.getSequencesHeight()) - 1);
+    assertEquals(vpranges.getStartSeq(), Math.round(
+            (float) od.getBoxY() * alheight / od.getSequencesHeight()) - 1);
 
     // click past end of alignment, as above
     mouseClick(od, 3000, 5);
@@ -260,10 +262,8 @@ public class OverviewDimensionsShowHiddenTest
     assertEquals(od.getBoxHeight(), boxHeight);
     assertEquals(vpranges.getStartRes(),
             Math.round((float) od.getBoxX() * alwidth / od.getWidth()));
-    assertEquals(
-            vpranges.getStartSeq(),
-            Math.round((float) od.getBoxY() * alheight
-                    / od.getSequencesHeight()));
+    assertEquals(vpranges.getStartSeq(), Math.round(
+            (float) od.getBoxY() * alheight / od.getSequencesHeight()));
 
     // move viewport so startRes non-zero and then mouseclick
     moveViewportH(20);
@@ -279,10 +279,8 @@ public class OverviewDimensionsShowHiddenTest
     assertEquals(vpranges.getStartRes(),
             Math.round((float) od.getBoxX() * alwidth / od.getWidth()));
     assertEquals(od.getBoxY(), oldboxy + 3);
-    assertEquals(
-            vpranges.getStartSeq(),
-            Math.round((float) od.getBoxY() * alheight
-                    / od.getSequencesHeight()));
+    assertEquals(vpranges.getStartSeq(), Math.round(
+            (float) od.getBoxY() * alheight / od.getSequencesHeight()));
 
     // click at top corner
     mouseClick(od, 0, 0);
@@ -314,19 +312,16 @@ public class OverviewDimensionsShowHiddenTest
     hiddenCols.hideColumns(0, lastHiddenCol);
 
     od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
-    assertEquals(od.getBoxX(),
-            Math.round((float) (lastHiddenCol + 1) * od.getWidth()
-                    / alwidth));
+    assertEquals(od.getBoxX(), Math
+            .round((float) (lastHiddenCol + 1) * od.getWidth() / alwidth));
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
 
     // try to click in hidden cols, check box does not move
     int xpos = 10;
     mouseClick(od, xpos, 0);
-    assertEquals(
-            od.getBoxX(),
-            Math.round((float) (lastHiddenCol + 1) * od.getWidth()
-                    / alwidth));
+    assertEquals(od.getBoxX(), Math
+            .round((float) (lastHiddenCol + 1) * od.getWidth() / alwidth));
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
@@ -341,8 +336,7 @@ public class OverviewDimensionsShowHiddenTest
     assertEquals(od.getBoxHeight(), boxHeight);
     assertEquals(vpranges.getStartSeq(), 0);
     assertEquals(vpranges.getStartRes(),
-            Math.round(
-                    (float) 60 * alwidth / od.getWidth())
+            Math.round((float) 60 * alwidth / od.getWidth())
                     - (lastHiddenCol + 1));
 
     // click to right of hidden columns such that box runs over right hand side
@@ -358,10 +352,8 @@ public class OverviewDimensionsShowHiddenTest
     assertEquals(vpranges.getStartRes(),
             Math.round((float) od.getBoxX() * alwidth / od.getWidth())
                     - (lastHiddenCol + 1));
-    assertEquals(
-            vpranges.getStartSeq(),
-            Math.round((float) od.getBoxY() * alheight
-                    / od.getSequencesHeight()));
+    assertEquals(vpranges.getStartSeq(), Math.round(
+            (float) od.getBoxY() * alheight / od.getSequencesHeight()));
   }
 
   /**
@@ -377,7 +369,7 @@ public class OverviewDimensionsShowHiddenTest
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(vpranges.getStartRes(), 0);
     assertEquals(vpranges.getStartSeq(), 0);
-    
+
     // hide columns 63-73, no change to box position or dimensions
     int firstHidden = 63;
     int lastHidden = 73;
@@ -393,12 +385,11 @@ public class OverviewDimensionsShowHiddenTest
     // move box so that it overlaps with hidden cols on one side
     // box width changes, boxX and scrollCol as for unhidden case
     int xpos = 54 - boxWidth / 2; // 54 is position in overview approx halfway
-                              // between cols 60 and 70
+    // between cols 60 and 70
     mouseClick(od, xpos, boxHeight / 2);
     assertEquals(od.getBoxX(), xpos - boxWidth / 2);
     assertEquals(od.getBoxY(), 0);
-    assertEquals(
-            od.getBoxWidth(),
+    assertEquals(od.getBoxWidth(),
             Math.round(boxWidth + (float) (lastHidden - firstHidden + 1)
                     * od.getWidth() / alwidth));
     assertEquals(od.getBoxHeight(), boxHeight);
@@ -413,8 +404,7 @@ public class OverviewDimensionsShowHiddenTest
     mouseClick(od, xpos, 0);
     assertEquals(od.getBoxX(), 24);
     assertEquals(od.getBoxY(), 0);
-    assertEquals(
-            od.getBoxWidth(),
+    assertEquals(od.getBoxWidth(),
             Math.round(boxWidth + (float) (lastHidden - firstHidden + 1)
                     * od.getWidth() / alwidth));
     assertEquals(od.getBoxHeight(), boxHeight);
@@ -434,7 +424,7 @@ public class OverviewDimensionsShowHiddenTest
     assertEquals(vpranges.getStartSeq(), 0);
     assertEquals(vpranges.getStartRes(),
             75 - (lastHidden - firstHidden + 1));
-    
+
     // move box so it goes beyond full width of alignment
     // boxX, scrollCol adjusted back, box width normal
     xpos = 3000;
@@ -443,14 +433,11 @@ public class OverviewDimensionsShowHiddenTest
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
-    assertEquals(
-            vpranges.getStartRes(),
+    assertEquals(vpranges.getStartRes(),
             Math.round(((float) od.getBoxX() * alwidth / od.getWidth())
                     - (lastHidden - firstHidden + 1)));
-    assertEquals(
-            vpranges.getStartSeq(),
-            Math.round((float) od.getBoxY() * alheight
-                    / od.getSequencesHeight()));
+    assertEquals(vpranges.getStartSeq(), Math.round(
+            (float) od.getBoxY() * alheight / od.getSequencesHeight()));
 
   }
 
@@ -484,9 +471,8 @@ public class OverviewDimensionsShowHiddenTest
     int xpos = 30;
     int ypos = 6;
     testBoxIsAtClickPoint(xpos, ypos);
-    assertEquals(vpranges.getStartSeq(), Math
-            .round((float) (ypos - boxHeight / 2) * alheight
-                    / od.getHeight()));
+    assertEquals(vpranges.getStartSeq(), Math.round(
+            (float) (ypos - boxHeight / 2) * alheight / od.getHeight()));
     assertEquals(vpranges.getStartRes(), Math.round(
             (float) (xpos - boxWidth / 2) * alwidth / od.getWidth()));
 
@@ -495,15 +481,13 @@ public class OverviewDimensionsShowHiddenTest
     xpos = Math.round((float) 145 * od.getWidth() / alwidth) - boxWidth;
     mouseClick(od, xpos + boxWidth / 2, boxHeight / 2);
     assertEquals(od.getBoxX(),
-            Math.round((float) (firstHidden - 1)
-                    * od.getWidth() / alwidth)
+            Math.round((float) (firstHidden - 1) * od.getWidth() / alwidth)
                     - boxWidth + 1);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
     assertEquals(vpranges.getStartRes(),
-            Math.round((float) (od.getBoxX()) * alwidth
-                    / od.getWidth()));
+            Math.round((float) (od.getBoxX()) * alwidth / od.getWidth()));
     assertEquals(vpranges.getStartSeq(), 0);
 
     // click in hidden cols
@@ -628,11 +612,9 @@ public class OverviewDimensionsShowHiddenTest
     assertEquals(od.getBoxX(),
             Math.round((float) 10 * od.getWidth() / alwidth));
     assertEquals(od.getBoxY(), 0);
-    assertEquals(
-            od.getBoxWidth(),
-            boxWidth
-                    + Math.round((float) (lastHidden - firstHidden + 1)
-                            * od.getWidth() / alwidth));
+    assertEquals(od.getBoxWidth(),
+            boxWidth + Math.round((float) (lastHidden - firstHidden + 1)
+                    * od.getWidth() / alwidth));
     assertEquals(od.getBoxHeight(), boxHeight);
 
     // move viewport to straddle hidden columns
@@ -640,11 +622,8 @@ public class OverviewDimensionsShowHiddenTest
     assertEquals(od.getBoxX(),
             Math.round((float) 63 * od.getWidth() / alwidth));
     assertEquals(od.getBoxY(), 0);
-    assertEquals(
-            od.getBoxWidth(),
-            boxWidth
-                    + Math.round((lastHidden - firstHidden + 1)
-                            * od.getWidth() / alwidth));
+    assertEquals(od.getBoxWidth(), boxWidth + Math.round(
+            (lastHidden - firstHidden + 1) * od.getWidth() / alwidth));
     assertEquals(od.getBoxHeight(), boxHeight);
 
     // move viewport to right of hidden columns, no overlap
@@ -680,9 +659,8 @@ public class OverviewDimensionsShowHiddenTest
     // viewport can't actually extend into hidden cols,
     // so move to the far right edge of the viewport
     moveViewport(firstHidden - viewWidth, 0);
-    assertEquals(od.getBoxX(),
-            Math.round((float) (firstHidden - viewWidth)
-                    * od.getWidth() / alwidth));
+    assertEquals(od.getBoxX(), Math.round(
+            (float) (firstHidden - viewWidth) * od.getWidth() / alwidth));
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
@@ -703,19 +681,16 @@ public class OverviewDimensionsShowHiddenTest
     // box moves to below hidden rows, height remains same
     moveViewport(0, 0);
     assertEquals(od.getBoxX(), 0);
-    assertEquals(od.getBoxY(),
-            Math.round((float) (lastHidden + 1) * od.getSequencesHeight()
-                    / alheight));
+    assertEquals(od.getBoxY(), Math.round(
+            (float) (lastHidden + 1) * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
 
     // move viewport to end of alignment
     moveViewport(0, 525 - viewHeight - lastHidden - 1);
     assertEquals(od.getBoxX(), 0);
-    assertEquals(
-            od.getBoxY(),
-            Math.round((float) (525 - viewHeight) * od.getSequencesHeight()
-                    / alheight));
+    assertEquals(od.getBoxY(), Math.round((float) (525 - viewHeight)
+            * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
   }
@@ -742,11 +717,10 @@ public class OverviewDimensionsShowHiddenTest
     // move viewport to straddle hidden rows
     moveViewport(0, 198);
     assertEquals(od.getBoxX(), 0);
-    assertEquals(od.getBoxY(), Math.round ((float)198 * od.getSequencesHeight()
-            / alheight));
+    assertEquals(od.getBoxY(),
+            Math.round((float) 198 * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxWidth(), boxWidth);
-    assertEquals(
-            od.getBoxHeight(),
+    assertEquals(od.getBoxHeight(),
             Math.round((float) (viewHeight + lastHidden - firstHidden + 1)
                     * od.getSequencesHeight() / alheight));
   }
@@ -774,8 +748,7 @@ public class OverviewDimensionsShowHiddenTest
     // viewport sits above hidden rows and does not include them
     moveViewport(0, firstHidden - viewHeight - 1);
     assertEquals(od.getBoxX(), 0);
-    assertEquals(
-            od.getBoxY(),
+    assertEquals(od.getBoxY(),
             Math.round((float) (firstHidden - viewHeight - 1)
                     * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -805,24 +778,21 @@ public class OverviewDimensionsShowHiddenTest
 
     od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
     assertEquals(od.getBoxX(), 0);
-    assertEquals(od.getBoxY(),
-            Math.round((float) (lastHiddenRow + 1)
-                    * od.getSequencesHeight() / alheight));
+    assertEquals(od.getBoxY(), Math.round((float) (lastHiddenRow + 1)
+            * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
 
     // click in hidden rows - same result
     mouseClick(od, 0, 0);
     assertEquals(od.getBoxX(), 0);
-    assertEquals(
-            od.getBoxY(),
-            Math.round((float) (lastHiddenRow + 1)
-                    * od.getSequencesHeight() / alheight));
+    assertEquals(od.getBoxY(), Math.round((float) (lastHiddenRow + 1)
+            * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
 
     // click below hidden rows
-    mouseClick(od, 0, 150 + boxHeight/2);
+    mouseClick(od, 0, 150 + boxHeight / 2);
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 150);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -861,18 +831,15 @@ public class OverviewDimensionsShowHiddenTest
     // click above hidden rows, so that box overlaps
     int rowpos = 35; // row value in residues
     int centrepos = 43; // centre row
-    mouseClick(od, 0,
-            Math.round((float) centrepos * od.getSequencesHeight()
-                    / alheight));
+    mouseClick(od, 0, Math
+            .round((float) centrepos * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxX(), 0);
-    assertEquals(od.getBoxY(),
-            Math.round(
-                    (float) rowpos * od.getSequencesHeight() / alheight));
+    assertEquals(od.getBoxY(), Math
+            .round((float) rowpos * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxWidth(), boxWidth);
-    assertEquals(
-            od.getBoxHeight(),
-            boxHeight
-                    + Math.round((float) (lastHiddenRow - firstHiddenRow + 1)
+    assertEquals(od.getBoxHeight(),
+            boxHeight + Math
+                    .round((float) (lastHiddenRow - firstHiddenRow + 1)
                             * od.getSequencesHeight() / alheight));
   }
 
@@ -919,10 +886,8 @@ public class OverviewDimensionsShowHiddenTest
     mouseClick(od, 0,
             Math.round((float) ypos * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxX(), 0);
-    assertEquals(
-            od.getBoxY(),
-            Math.round((float) (firstHidden - viewHeight)
-                    * od.getSequencesHeight() / alheight));
+    assertEquals(od.getBoxY(), Math.round((float) (firstHidden - viewHeight)
+            * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
 
@@ -931,10 +896,8 @@ public class OverviewDimensionsShowHiddenTest
     mouseClick(od, 0,
             Math.round((float) ypos * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxX(), 0);
-    assertEquals(
-            od.getBoxY(),
-            Math.round((firstHidden - viewHeight) * od.getSequencesHeight()
-                    / alheight));
+    assertEquals(od.getBoxY(), Math.round((firstHidden - viewHeight)
+            * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
   }
@@ -1078,7 +1041,7 @@ public class OverviewDimensionsShowHiddenTest
     // normally
     od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
   }
-  
+
   /*
    * Test that the box is positioned with the centre at xpos, ypos
    * and with the original width and height
@@ -1100,7 +1063,7 @@ public class OverviewDimensionsShowHiddenTest
   {
     SequenceI[] allseqs = al.getSequencesArray();
     SequenceGroup theseSeqs = new SequenceGroup();
-    
+
     for (int i = start; i <= end; i++)
     {
       theseSeqs.addSequence(allseqs[i], false);
@@ -1125,31 +1088,28 @@ public class OverviewDimensionsShowHiddenTest
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(vpranges.getStartRes(), 0);
     assertEquals(vpranges.getStartSeq(), 0);
-  
+
     // hide rows at start and check updated box position is correct
     // changes boxY but not boxheight
     int lastHiddenRow = 30;
     hideSequences(0, lastHiddenRow);
-  
+
     od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
     assertEquals(od.getBoxX(), 0);
-    assertEquals(od.getBoxY(),
-            Math.round((float) (lastHiddenRow + 1)
-                    * od.getSequencesHeight() / alheight));
+    assertEquals(od.getBoxY(), Math.round((float) (lastHiddenRow + 1)
+            * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
-  
+
     // click in hidden rows - same result
     mouseClick(od, 0, 0);
     assertEquals(od.getBoxX(), 0);
     int boxY = od.getBoxY();
-    assertEquals(
-            boxY,
-            Math.round((float) (lastHiddenRow + 1)
-                    * od.getSequencesHeight() / alheight));
+    assertEquals(boxY, Math.round((float) (lastHiddenRow + 1)
+            * od.getSequencesHeight() / alheight));
     assertEquals(od.getBoxWidth(), boxWidth);
     assertEquals(od.getBoxHeight(), boxHeight);
-  
+
     // click below hidden rows
     // vertical move of overview box is suppressed in wrapped mode
     mouseClick(od, 0, 150);