JAL-3253 miscellaneous tidying up before merge to JS-develop

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

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 35be292..5165aea 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -371,7 +371,6 @@ public class SeqCanvas extends JPanel implements ViewportListenerI
   @Override
   public void paintComponent(Graphics g)
   {
-
     if (av.getAlignPanel().getHoldRepaint())
     {
       return;
@@ -505,14 +504,14 @@ public class SeqCanvas extends JPanel implements ViewportListenerI
    * Using the current font, determine fields labelWidthEast and labelWidthWest,
    * and return the number of residues that can fill the remaining width
    * 
-   * @param width
+   * @param w
    *          the width in pixels (possibly including scales)
    * 
    * @return the visible width in residues, after allowing for East or West
    *         scales (if shown)
    * 
    */
-  public int getWrappedCanvasWidth(int width)
+  public int getWrappedCanvasWidth(int w)
   {
     int charWidth = av.getCharWidth();
 
@@ -526,7 +525,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI
 
     labelWidthWest = av.getScaleLeftWrapped() ? labelWidth : 0;
 
-    return (width - labelWidthEast - labelWidthWest) / charWidth;
+    return (w - labelWidthEast - labelWidthWest) / charWidth;
   }
 
   /**