git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3885 Made the database JComboBox have StringPair entries to allow a display value...
[jalview.git]
/
src
/
jalview
/
gui
/
OptsAndParamsPage.java
diff --git
a/src/jalview/gui/OptsAndParamsPage.java
b/src/jalview/gui/OptsAndParamsPage.java
index
acd8445
..
ba575ae
100644
(file)
--- a/
src/jalview/gui/OptsAndParamsPage.java
+++ b/
src/jalview/gui/OptsAndParamsPage.java
@@
-20,13
+20,6
@@
*/
package jalview.gui;
*/
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;
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.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;
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 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;
/**
import net.miginfocom.swing.MigLayout;
/**
@@
-288,7
+289,7
@@
public class OptsAndParamsPage
boolean integ = false;
boolean integ = false;
- Object lastVal;
+ String lastVal;
ParameterI parameter;
ParameterI parameter;
@@
-300,11
+301,6
@@
public class OptsAndParamsPage
Slider slider = null;
Slider slider = null;
- /*
- * true minimum corresponding to 0 (minimum) of the slider
- */
- int sliderZeroValue;
-
JTextArea string = new JTextArea();
ValueConstrainI validator = null;
JTextArea string = new JTextArea();
ValueConstrainI validator = null;
@@
-484,9
+480,10
@@
public class OptsAndParamsPage
*
* @return
*/
*
* @return
*/
- private Object getCurrentValue()
+ private String getCurrentValue()
{
{
- return choice ? choicebox.getSelectedItem() : valueField.getText();
+ return choice ? (String) choicebox.getSelectedItem()
+ : valueField.getText();
}
@Override
}
@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);
valueField.setPreferredSize(new Dimension(60, 25));
slider = makeSlider(parm.getValidValue());
slider.addChangeListener(this);