JAL-1807

[jalview.git] / src / jalview / viewmodel / seqfeatures / FeatureRendererModel.java

diff --git a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
index 674f3d1..d3f150b 100644 (file)
--- a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
+++ b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
@@ -5,8 +5,9 @@ import jalview.api.FeaturesDisplayedI;
 import jalview.datamodel.AlignmentI;
 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;
@@ -70,7 +71,7 @@ public abstract class FeatureRendererModel implements
    */
   public void transferSettings(jalview.api.FeatureRenderer _fr)
   {
-    FeatureRenderer fr = (FeatureRenderer) _fr;
+    FeatureRendererModel fr = (FeatureRendererModel) _fr;
     FeatureRendererSettings frs = new FeatureRendererSettings(fr);
     this.renderOrder = frs.renderOrder;
     this.featureGroups = frs.featureGroups;
@@ -506,7 +507,7 @@ public abstract class FeatureRendererModel implements
     }
     if (iSize > 1 && sort)
     {
-      jalview.util.QuickSort.sort(sortOrder, newf);
+      QuickSort.sortFloatObject(sortOrder, newf);
     }
     sortOrder = null;
     System.arraycopy(newf, 0, renderOrder, opos, newf.length);
@@ -526,7 +527,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);
     }