JAL-1793 update spike to latest
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 9 Feb 2018 15:35:34 +0000 (15:35 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 9 Feb 2018 15:35:34 +0000 (15:35 +0000)
lib/groovy-all-2.4.6-indy.jar [deleted file]
src/jalview/gui/FeatureTypeSettings.java

diff --git a/lib/groovy-all-2.4.6-indy.jar b/lib/groovy-all-2.4.6-indy.jar
deleted file mode 100644 (file)
index 5f3d51c..0000000
Binary files a/lib/groovy-all-2.4.6-indy.jar and /dev/null differ
index 5480f5d..6eb583c 100644 (file)
@@ -1408,10 +1408,7 @@ public class FeatureTypeSettings extends JalviewDialog
      * disable pattern field for condition 'Present / NotPresent'
      */
     Condition selectedCondition = (Condition) condCombo.getSelectedItem();
-    if (!selectedCondition.needsAPattern())
-    {
-      patternField.setEnabled(false);
-    }
+    patternField.setEnabled(selectedCondition.needsAPattern());
 
     /*
      * if a numeric condition is selected, show the value range
@@ -1653,6 +1650,7 @@ public class FeatureTypeSettings extends JalviewDialog
 
     if (pattern.length() == 0 && cond.needsAPattern())
     {
+      valueField.setEnabled(true); // ensure pattern field is enabled!
       return false;
     }