X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FOptsAndParamsPage.java;h=ba575ae5abcd1152201808f7976bd82c90f838d9;hb=2e57729baa0bc97fc03ab1fb8eb4dbc1a12f3d9a;hp=acd8445c03d0befe1006bbcfb24c4e6915edf874;hpb=a3d80544cd19436e1ee4abbcfa9befcc926784bf;p=jalview.git

diff --git a/src/jalview/gui/OptsAndParamsPage.java b/src/jalview/gui/OptsAndParamsPage.java
index acd8445..ba575ae 100644
--- a/src/jalview/gui/OptsAndParamsPage.java
+++ b/src/jalview/gui/OptsAndParamsPage.java
@@ -20,13 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.util.MessageManager;
-import jalview.ws.params.ArgumentI;
-import jalview.ws.params.OptionI;
-import jalview.ws.params.ParameterI;
-import jalview.ws.params.ValueConstrainI;
-import jalview.ws.params.ValueConstrainI.ValueType;
-
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -35,6 +28,8 @@ import java.awt.GridLayout;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
@@ -59,6 +54,12 @@ import javax.swing.border.TitledBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import jalview.util.MessageManager;
+import jalview.ws.params.ArgumentI;
+import jalview.ws.params.OptionI;
+import jalview.ws.params.ParameterI;
+import jalview.ws.params.ValueConstrainI;
+import jalview.ws.params.ValueConstrainI.ValueType;
 import net.miginfocom.swing.MigLayout;
 
 /**
@@ -288,7 +289,7 @@ public class OptsAndParamsPage
 
     boolean integ = false;
 
-    Object lastVal;
+    String lastVal;
 
     ParameterI parameter;
 
@@ -300,11 +301,6 @@ public class OptsAndParamsPage
 
     Slider slider = null;
 
-    /*
-     * true minimum corresponding to 0 (minimum) of the slider
-     */
-    int sliderZeroValue;
-
     JTextArea string = new JTextArea();
 
     ValueConstrainI validator = null;
@@ -484,9 +480,10 @@ public class OptsAndParamsPage
      * 
      * @return
      */
-    private Object getCurrentValue()
+    private String getCurrentValue()
     {
-      return choice ? choicebox.getSelectedItem() : valueField.getText();
+      return choice ? (String) choicebox.getSelectedItem()
+              : valueField.getText();
     }
 
     @Override
@@ -625,6 +622,15 @@ public class OptsAndParamsPage
             {
             }
           });
+          valueField.addFocusListener(new FocusAdapter() {
+
+            @Override
+            public void focusLost(FocusEvent e)
+            {
+              actionPerformed(null);
+            }
+            
+          });
           valueField.setPreferredSize(new Dimension(60, 25));
           slider = makeSlider(parm.getValidValue());
           slider.addChangeListener(this);