From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 1 Feb 2017 13:02:56 +0000 (+0000)
Subject: JAL-2371 (slight!) simplification of isApplicableTo()
X-Git-Tag: Release_2_10_3b1~357^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=97f870ff4890ebfadcbb73e6793c83f856948658;hp=4168df76dac70bf7ca9fb598d18783422d565e6d;p=jalview.git

JAL-2371 (slight!) simplification of isApplicableTo()
---

diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java
index 358417b..03fc129 100755
--- a/src/jalview/schemes/ResidueColourScheme.java
+++ b/src/jalview/schemes/ResidueColourScheme.java
@@ -20,9 +20,9 @@
  */
 package jalview.schemes;
 
-import jalview.datamodel.AlignmentI;
 import jalview.datamodel.AnnotatedCollectionI;
 import jalview.datamodel.SequenceCollectionI;
+import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 import jalview.util.Comparison;
 
@@ -146,30 +146,26 @@ public abstract class ResidueColourScheme implements ColourSchemeI
     {
       return true;
     }
-
-    /*
-     * inspect the data context (alignment) for residue type
-     */
-    boolean nucleotide = false;
-    if (ac instanceof AlignmentI)
+    if (ac == null)
     {
-      nucleotide = ((AlignmentI) ac).isNucleotide();
+      return true;
     }
-    else
+    /*
+     * pop-up menu on selection group before group created
+     * (no alignment context)
+     */
+    // TODO: add nucleotide flag to SequenceGroup?
+    if (ac instanceof SequenceGroup && ac.getContext() == null)
     {
-      AnnotatedCollectionI context = ac.getContext();
-      if (context instanceof AlignmentI)
-      {
-        nucleotide = ((AlignmentI) context).isNucleotide();
-      }
-      else
-      {
-        // not sure what's going on, play safe
-        return true;
-      }
+      return true;
     }
 
     /*
+     * inspect the data context (alignment) for residue type
+     */
+    boolean nucleotide = ac.isNucleotide();
+
+    /*
      * does data type match colour scheme type?
      */
     return (nucleotide && isNucleotideSpecific())