JAL-1807 explicit imports (jalview.viewmodel)

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index 899e8a7..315447e 100644 (file)
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -54,6 +54,7 @@ import jalview.viewmodel.styles.ViewStyle;
 import jalview.workers.AlignCalcManager;
 import jalview.workers.ComplementConsensusThread;
 import jalview.workers.ConsensusThread;
+import jalview.workers.ConservationThread;
 import jalview.workers.StrucConsensusThread;
 
 import java.awt.Color;
@@ -770,9 +771,9 @@ public abstract class AlignmentViewport implements AlignViewportI,
       return;
     }
     if (calculator
-            .getRegisteredWorkersOfClass(jalview.workers.ConservationThread.class) == null)
+.getRegisteredWorkersOfClass(ConservationThread.class) == null)
     {
-      calculator.registerWorker(new jalview.workers.ConservationThread(
+      calculator.registerWorker(new ConservationThread(
               this, ap));
     }
   }
@@ -1490,16 +1491,15 @@ public abstract class AlignmentViewport implements AlignViewportI,
 
 
   @Override
-  public jalview.datamodel.AlignmentView getAlignmentView(
-          boolean selectedOnly)
+  public AlignmentView getAlignmentView(boolean selectedOnly)
   {
     return getAlignmentView(selectedOnly, false);
   }
 
 
   @Override
-  public jalview.datamodel.AlignmentView getAlignmentView(
-          boolean selectedOnly, boolean markGroups)
+  public AlignmentView getAlignmentView(boolean selectedOnly,
+          boolean markGroups)
   {
     return new AlignmentView(alignment, colSel, selectionGroup,
             colSel != null && colSel.hasHiddenColumns(), selectedOnly,

diff --git a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
index e7cec1e..63faab9 100644 (file)
--- a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
+++ b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
@@ -7,6 +7,8 @@ import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
 import jalview.renderer.seqfeatures.FeatureRenderer;
 import jalview.schemes.GraduatedColor;
+import jalview.schemes.UserColourScheme;
+import jalview.util.QuickSort;
 import jalview.viewmodel.AlignmentViewport;
 
 import java.awt.Color;
@@ -506,7 +508,7 @@ public abstract class FeatureRendererModel implements
     }
     if (iSize > 1 && sort)
     {
-      jalview.util.QuickSort.sortFloat(sortOrder, newf);
+      QuickSort.sortFloat(sortOrder, newf);
     }
     sortOrder = null;
     System.arraycopy(newf, 0, renderOrder, opos, newf.length);
@@ -526,7 +528,7 @@ public abstract class FeatureRendererModel implements
     Object fc = featureColours.get(featureType);
     if (fc == null)
     {
-      jalview.schemes.UserColourScheme ucs = new jalview.schemes.UserColourScheme();
+      UserColourScheme ucs = new UserColourScheme();
       Color col = ucs.createColourFromName(featureType);
       featureColours.put(featureType, fc = col);
     }

diff --git a/src/jalview/viewmodel/seqfeatures/FeatureRendererSettings.java b/src/jalview/viewmodel/seqfeatures/FeatureRendererSettings.java
index 6e85b83..46dfc55 100644 (file)
--- a/src/jalview/viewmodel/seqfeatures/FeatureRendererSettings.java
+++ b/src/jalview/viewmodel/seqfeatures/FeatureRendererSettings.java
@@ -37,8 +37,7 @@ public class FeatureRendererSettings implements Cloneable
    * 
    * @param fr
    */
-  public FeatureRendererSettings(
-          jalview.viewmodel.seqfeatures.FeatureRendererModel fr)
+  public FeatureRendererSettings(FeatureRendererModel fr)
   {
     renderOrder = null;
     featureGroups = new ConcurrentHashMap();