Merge branch 'improvement/JAL-4250_secondary_structure_annotation_antialias' into...

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

diff --git a/src/jalview/schemes/CovariationColourScheme.java b/src/jalview/schemes/CovariationColourScheme.java
index 5f8f4c1..4884283 100644 (file)
--- a/src/jalview/schemes/CovariationColourScheme.java
+++ b/src/jalview/schemes/CovariationColourScheme.java
@@ -20,10 +20,14 @@
  */
 package jalview.schemes;
 
+import jalview.api.AlignViewportI;
 import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AnnotatedCollectionI;
+import jalview.util.ColorUtils;
 
 import java.awt.Color;
 import java.util.Hashtable;
+import java.util.Map;
 
 /**
  * Became RNAHelicesColour.java. Placeholder for true covariation color scheme
@@ -33,15 +37,26 @@ import java.util.Hashtable;
  */
 public class CovariationColourScheme extends ResidueColourScheme
 {
-  public Hashtable helixcolorhash = new Hashtable();
+  public Map<String, Color> helixcolorhash = new Hashtable<>();
 
-  public Hashtable positionsToHelix = new Hashtable();
+  public Map<Integer, String> positionsToHelix = new Hashtable<>();
 
   int numHelix = 0;
 
   public AlignmentAnnotation annotation;
 
   /**
+   * Returns a new instance of this colour scheme with which the given data may
+   * be coloured
+   */
+  @Override
+  public ColourSchemeI getInstance(AlignViewportI view,
+          AnnotatedCollectionI coll)
+  {
+    return new CovariationColourScheme(coll.getAlignmentAnnotation()[0]);
+  }
+
+  /**
    * Creates a new CovariationColourScheme object.
    */
   public CovariationColourScheme(AlignmentAnnotation annotation)
@@ -50,9 +65,9 @@ public class CovariationColourScheme extends ResidueColourScheme
 
     for (int x = 0; x < this.annotation._rnasecstr.length; x++)
     {
-      // System.out.println(this.annotation._rnasecstr[x] + " Begin" +
+      // jalview.bin.Console.outPrintln(this.annotation._rnasecstr[x] + " Begin" +
       // this.annotation._rnasecstr[x].getBegin());
-      // System.out.println(this.annotation._rnasecstr[x].getFeatureGroup());
+      // jalview.bin.Console.outPrintln(this.annotation._rnasecstr[x].getFeatureGroup());
       // pairs.put(this.annotation._rnasecstr[x].getBegin(),
       // this.annotation._rnasecstr[x].getEnd());
 
@@ -61,18 +76,19 @@ public class CovariationColourScheme extends ResidueColourScheme
       positionsToHelix.put(this.annotation._rnasecstr[x].getEnd(),
               this.annotation._rnasecstr[x].getFeatureGroup());
 
-      if (Integer.parseInt(this.annotation._rnasecstr[x].getFeatureGroup()) > numHelix)
+      if (Integer.parseInt(
+              this.annotation._rnasecstr[x].getFeatureGroup()) > numHelix)
       {
-        numHelix = Integer.parseInt(this.annotation._rnasecstr[x]
-                .getFeatureGroup());
+        numHelix = Integer
+                .parseInt(this.annotation._rnasecstr[x].getFeatureGroup());
       }
 
     }
 
     for (int j = 0; j <= numHelix; j++)
     {
-      helixcolorhash.put(Integer.toString(j),
-              jalview.util.ColorUtils.generateRandomColor(Color.white));
+      helixcolorhash.put(String.valueOf(j),
+              ColorUtils.generateRandomColor(Color.white));
     }
 
   }
@@ -88,7 +104,7 @@ public class CovariationColourScheme extends ResidueColourScheme
   @Override
   public Color findColour(char c)
   {
-    // System.out.println("called"); log.debug
+    // jalview.bin.Console.outPrintln("called"); log.debug
     // Generate a random pastel color
 
     return ResidueProperties.purinepyrimidine[ResidueProperties.purinepyrimidineIndex[c]];// jalview.util.ColorUtils.generateRandomColor(Color.white);
@@ -108,16 +124,16 @@ public class CovariationColourScheme extends ResidueColourScheme
   {
     Color currentColour = Color.white;
     String currentHelix = null;
-    // System.out.println(c + " " + j);
-    currentHelix = (String) positionsToHelix.get(j);
-    // System.out.println(positionsToHelix.get(j));
+    // jalview.bin.Console.outPrintln(c + " " + j);
+    currentHelix = positionsToHelix.get(j);
+    // jalview.bin.Console.outPrintln(positionsToHelix.get(j));
 
     if (currentHelix != null)
     {
-      currentColour = (Color) helixcolorhash.get(currentHelix);
+      currentColour = helixcolorhash.get(currentHelix);
     }
 
-    // System.out.println(c + " " + j + " helix " + currentHelix + " " +
+    // jalview.bin.Console.outPrintln(c + " " + j + " helix " + currentHelix + " " +
     // currentColour);
     return currentColour;
   }
@@ -133,4 +149,10 @@ public class CovariationColourScheme extends ResidueColourScheme
   {
     return "Covariation";
   }
+
+  @Override
+  public boolean isSimple()
+  {
+    return false;
+  }
 }