From 53854a05e872e21778212fe49462bc1c157ef7a6 Mon Sep 17 00:00:00 2001
From: kiramt <k.mourao@dundee.ac.uk>
Date: Tue, 10 Oct 2017 14:38:30 +0100
Subject: [PATCH] JAL-2609attemptedmerge tidy

---
 src/jalview/gui/SeqCanvas.java |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 2eb8c4d..36da5fe 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -31,7 +31,7 @@ import jalview.util.Comparison;
 import jalview.viewmodel.ViewportListenerI;
 import jalview.viewmodel.ViewportRanges;
 
-import java.awt.AlphaComposite; // ok
+import java.awt.AlphaComposite;
 import java.awt.BasicStroke;
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -58,7 +58,7 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
 
   final FeatureRenderer fr;
 
-  final SequenceRenderer seqRdr; //ok
+  final SequenceRenderer seqRdr;
 
   BufferedImage img;
 
@@ -103,7 +103,7 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
   {
     this.av = ap.av;
     fr = new FeatureRenderer(ap);
-    seqRdr = new SequenceRenderer(av); //ok
+    seqRdr = new SequenceRenderer(av);
     setLayout(new BorderLayout());
     PaintRefresher.Register(this, av.getSequenceSetId());
     setBackground(Color.white);
@@ -113,7 +113,7 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
 
   public SequenceRenderer getSequenceRenderer()
   {
-    return seqRdr; //ok
+    return seqRdr;
   }
 
   public FeatureRenderer getFeatureRenderer()
@@ -259,7 +259,6 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
     }
   }
 
-  //ok
   /**
    * Does a fast paint of an alignment in response to a scroll. Most of the
    * visible region is simply copied and shifted, and then any newly visible
@@ -280,7 +279,7 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
    */
   public void fastPaint(int horizontal, int vertical)
   {
-    if (fastpainting || gg == null || img == null) //ok
+    if (fastpainting || gg == null || img == null)
     {
       return;
     }
@@ -346,9 +345,7 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
       fastpainting = false;
     }
   }
-  //ok
 
-  //ok
   @Override
   public void paintComponent(Graphics g)
   {
@@ -418,7 +415,6 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
       g.drawImage(lcimg, 0, 0, this);
     }
   }
-//ok
   
   /**
    * Draw an alignment panel for printing
-- 
1.7.10.2