JAL-3253 jalview.bin.Instance streamlining

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

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 877f375..0123384 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -21,11 +21,7 @@
 package jalview.schemes;
 
 import jalview.api.AlignViewportI;
-import jalview.bin.Instance;
 import jalview.datamodel.AnnotatedCollectionI;
-import jalview.util.ColorUtils;
-
-import java.awt.Color;
 
 /**
  * ColourSchemeProperty binds names to hardwired colourschemes and tries to deal
@@ -42,6 +38,11 @@ import java.awt.Color;
 public class ColourSchemeProperty
 {
 
+  private ColourSchemeProperty()
+  {
+    // requires static call to getColourScheme(...).
+  }
+
   /**
    * Returns a colour scheme for the given name, with which the given data may
    * be coloured. The name is not case-sensitive, and may be one of
@@ -110,41 +111,6 @@ public class ColourSchemeProperty
     return ucs;
   }
 
-  public static void initRnaHelicesShading(int n)
-  {
-    int i = 0;
-    Instance j = Instance.getInstance();
-
-    if (j.rnaHelices == null)
-    {
-      j.rnaHelices = new Color[n + 1];
-    }
-    else if (j.rnaHelices != null && j.rnaHelices.length <= n)
-    {
-      Color[] t = new Color[n + 1];
-      System.arraycopy(j.rnaHelices, 0, t, 0, j.rnaHelices.length);
-      i = j.rnaHelices.length;
-      j.rnaHelices = t;
-    }
-    else
-    {
-      return;
-    }
-    // Generate random colors and store
-    for (; i <= n; i++)
-    {
-      j.rnaHelices[i] = ColorUtils.generateRandomColor(Color.white);
-    }
-  }
-
-  /**
-   * delete the existing cached RNA helices colours
-   */
-  public static void resetRnaHelicesShading()
-  {
-    Instance.getInstance().rnaHelices = null;
-  }
-
   /**
    * Returns the name of the colour scheme (or "None" if it is null)
    *