JAL-2491 Renamed comp scrolling flag for consistency; small tweaks

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

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index 4ecf05f..c3458f9 100644 (file)
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -779,7 +779,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
     }
     vpRanges.setViewportStartAndWidth(x, width);
 
-    if (av.getWrapAlignment() || !fastPaint || av.MAC)
+    if (av.getWrapAlignment() || !fastPaint)
     {
       repaint();
     }
@@ -823,7 +823,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
       }
       vpRanges.setViewportStartAndHeight(offy, height);
     }
-    if (av.getWrapAlignment() || !fastPaint || av.MAC)
+    if (av.getWrapAlignment() || !fastPaint)
     {
       repaint();
     }
@@ -1022,9 +1022,9 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
 
   /*
    * Flag set while scrolling to follow complementary cDNA/protein scroll. When
-   * true, suppresses invoking the same method recursively.
+   * false, suppresses invoking the same method recursively.
    */
-  private boolean followingComplementScroll = true;
+  private boolean scrollComplementaryPanel = true;
 
   private void jbInit() throws Exception
   {
@@ -1133,14 +1133,14 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
    * 
    * @param b
    */
-  protected void setFollowingComplementScroll(boolean b)
+  protected void setToScrollComplementPanel(boolean b)
   {
-    this.followingComplementScroll = b;
+    this.scrollComplementaryPanel = b;
   }
 
-  protected boolean isFollowingComplementScroll()
+  protected boolean isSetToScrollComplementPanel()
   {
-    return this.followingComplementScroll;
+    return this.scrollComplementaryPanel;
   }
 
   @Override
@@ -1157,11 +1157,11 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
 
     // now update any complementary alignment (its viewport ranges object
     // is different so does not get automatically updated)
-    if (isFollowingComplementScroll())
+    if (isSetToScrollComplementPanel())
     {
-      setFollowingComplementScroll(false);
+      setToScrollComplementPanel(false);
       av.scrollComplementaryAlignment(getComplementPanel());
-      setFollowingComplementScroll(true);
+      setToScrollComplementPanel(true);
     }
 
   }