From 061a05484ccda133e2e77b19454238fb0ba8f11d Mon Sep 17 00:00:00 2001
From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 10 Jul 2015 06:15:47 +0100
Subject: [PATCH] JAL-1807 explicit imports (jalview.renderer)

---
 src/jalview/renderer/AnnotationRenderer.java          |    9 ++++++---
 src/jalview/renderer/seqfeatures/FeatureRenderer.java |   11 ++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java
index 3359678..ca02c29 100644
--- a/src/jalview/renderer/AnnotationRenderer.java
+++ b/src/jalview/renderer/AnnotationRenderer.java
@@ -28,7 +28,10 @@ import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.Annotation;
 import jalview.datamodel.ColumnSelection;
 import jalview.schemes.ColourSchemeI;
+import jalview.schemes.NucleotideColourScheme;
 import jalview.schemes.ResidueProperties;
+import jalview.schemes.ZappoColourScheme;
+import jalview.util.Platform;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -132,7 +135,7 @@ public class AnnotationRenderer
 
   private FontMetrics fm;
 
-  private final boolean MAC = jalview.util.Platform.isAMac();
+  private final boolean MAC = Platform.isAMac();
 
   boolean av_renderHistogram = true, av_renderProfile = true,
           av_normaliseProfile = false;
@@ -298,8 +301,8 @@ public class AnnotationRenderer
     {
       // Set the default colour for sequence logo if the alignnent has no
       // colourscheme set
-      profcolour = av.getAlignment().isNucleotide() ? new jalview.schemes.NucleotideColourScheme()
-              : new jalview.schemes.ZappoColourScheme();
+      profcolour = av.getAlignment().isNucleotide() ? new NucleotideColourScheme()
+              : new ZappoColourScheme();
     }
     columnSelection = av.getColumnSelection();
     hconsensus = av.getSequenceConsensusHash();
diff --git a/src/jalview/renderer/seqfeatures/FeatureRenderer.java b/src/jalview/renderer/seqfeatures/FeatureRenderer.java
index 7eda2f7..beb4cb4 100644
--- a/src/jalview/renderer/seqfeatures/FeatureRenderer.java
+++ b/src/jalview/renderer/seqfeatures/FeatureRenderer.java
@@ -2,6 +2,8 @@ package jalview.renderer.seqfeatures;
 
 import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
+import jalview.util.Comparison;
+import jalview.viewmodel.seqfeatures.FeatureRendererModel;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
@@ -10,8 +12,7 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 
-public class FeatureRenderer extends
-        jalview.viewmodel.seqfeatures.FeatureRendererModel
+public class FeatureRenderer extends FeatureRendererModel
 {
 
   FontMetrics fm;
@@ -58,7 +59,7 @@ public class FeatureRenderer extends
       {
         s = seq.getCharAt(i);
 
-        if (jalview.util.Comparison.isGap(s))
+        if (Comparison.isGap(s))
         {
           continue;
         }
@@ -123,7 +124,7 @@ public class FeatureRenderer extends
       {
         s = seq.getCharAt(i);
 
-        if (jalview.util.Comparison.isGap(s))
+        if (Comparison.isGap(s))
         {
           continue;
         }
@@ -192,7 +193,7 @@ public class FeatureRenderer extends
       return initialCol;
     }
 
-    if (jalview.util.Comparison.isGap(lastSeq.getCharAt(column)))
+    if (Comparison.isGap(lastSeq.getCharAt(column)))
     {
       return Color.white.getRGB();
     }
-- 
1.7.10.2