JAL-2069 spike updated with latest (FeatureTypeSettings)

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

diff --git a/src/jalview/schemes/FeatureColour.java b/src/jalview/schemes/FeatureColour.java
index 71a89b0..aa0b640 100644 (file)
--- a/src/jalview/schemes/FeatureColour.java
+++ b/src/jalview/schemes/FeatureColour.java
@@ -49,7 +49,7 @@ import java.util.StringTokenizer;
  */
 public class FeatureColour implements FeatureColourI
 {
-  static final Color DEFAULT_NO_COLOUR = Color.LIGHT_GRAY;
+  static final Color DEFAULT_NO_COLOUR = null;
 
   private static final String BAR = "|";
 
@@ -93,8 +93,6 @@ public class FeatureColour implements FeatureColourI
 
   private boolean aboveThreshold;
 
-  private boolean thresholdIsMinOrMax;
-
   private boolean isHighToLow;
 
   private boolean autoScaled;
@@ -392,6 +390,15 @@ public class FeatureColour implements FeatureColourI
     updateBounds(min, max);
   }
 
+  /**
+   * Constructor for a graduated colour
+   * 
+   * @param low
+   * @param high
+   * @param noValueColour
+   * @param min
+   * @param max
+   */
   public FeatureColour(Color low, Color high, Color noValueColour,
           float min, float max)
   {
@@ -524,18 +531,6 @@ public class FeatureColour implements FeatureColourI
   }
 
   @Override
-  public boolean isThresholdMinMax()
-  {
-    return thresholdIsMinOrMax;
-  }
-
-  @Override
-  public void setThresholdMinMax(boolean b)
-  {
-    thresholdIsMinOrMax = b;
-  }
-
-  @Override
   public float getThreshold()
   {
     return threshold;
@@ -607,8 +602,7 @@ public class FeatureColour implements FeatureColourI
     /*
      * graduated colour case, optionally with threshold
      * may be based on feature score on an attribute value
-     * Float.NaN is assigned minimum visible score colour
-     * no such attribute is assigned the 'no value' colour
+     * Float.NaN, or no value, is assigned the 'no value' colour
      */
     float scr = feature.getScore();
     if (attributeName != null)