JAL-3253 jalview.bin.Instance streamlining

[jalview.git] / src / jalview / schemes / RNAHelicesColour.java

diff --git a/src/jalview/schemes/RNAHelicesColour.java b/src/jalview/schemes/RNAHelicesColour.java
index c82cd57..c61eeed 100644 (file)
--- a/src/jalview/schemes/RNAHelicesColour.java
+++ b/src/jalview/schemes/RNAHelicesColour.java
@@ -21,7 +21,6 @@
 package jalview.schemes;
 
 import jalview.api.AlignViewportI;
-import jalview.bin.Instance;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.AnnotatedCollectionI;
@@ -71,14 +70,14 @@ public class RNAHelicesColour extends ResidueColourScheme
   {
     super(ResidueProperties.nucleotideIndex);
     this.annotation = annotation;
-    ColourSchemeProperty.resetRnaHelicesShading();
+    ColourSchemes.resetRnaHelicesShading();
     refresh();
   }
 
   public RNAHelicesColour(AnnotatedCollectionI alignment)
   {
     super(ResidueProperties.nucleotideIndex);
-    ColourSchemeProperty.resetRnaHelicesShading();
+    ColourSchemes.resetRnaHelicesShading();
     alignmentChanged(alignment, null);
   }
 
@@ -161,7 +160,7 @@ public class RNAHelicesColour extends ResidueColourScheme
         }
 
       }
-      ColourSchemeProperty.initRnaHelicesShading(numHelix);
+      ColourSchemes.initRnaHelicesShading(numHelix);
     }
   }
 
@@ -201,7 +200,7 @@ public class RNAHelicesColour extends ResidueColourScheme
     currentHelix = positionsToHelix.get(j);
     if (currentHelix != null)
     {
-      currentColour = Instance.getInstance().rnaHelices[Integer
+      currentColour = ColourSchemes.getInstance().rnaHelices[Integer
               .parseInt(currentHelix)];
     }
     return currentColour;