1 files changed, 79 insertions, 89 deletions

diff --git a/src/jcgp/gui/settings/parameters/GUIDoubleParameter.java b/src/jcgp/gui/settings/parameters/GUIDoubleParameter.java
index 4a8e0e1..87e7b69 100644
--- a/src/jcgp/gui/settings/parameters/GUIDoubleParameter.java
+++ b/src/jcgp/gui/settings/parameters/GUIDoubleParameter.java
@@ -4,115 +4,105 @@ import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.event.EventHandler;
 import javafx.geometry.Pos;
+import javafx.scene.control.Control;
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.Priority;
-import javafx.scene.text.Text;
-import jcgp.backend.resources.parameters.DoubleParameter;
+import jcgp.backend.resources.parameters.Parameter;
 import jcgp.backend.resources.parameters.ParameterStatus;
+import jcgp.gui.GUI;
 import jcgp.gui.settings.SettingsPane;
 
-public class GUIDoubleParameter extends GUIParameter {
+/**
+ * This extension of GUIParameter uses a TextField to display
+ * the value of a DoubleParameter. It cannot be constructed
+ * directly - instead, use GUIParameter.create().
+ * <br><br>
+ * See {@link GUIParameter} for more information.
+ * 
+ * @author Eduardo Pedroni
+ */
+public class GUIDoubleParameter extends GUIParameter<Number> {
+
+	private TextField textField;
 	
-	private double originalValue;
+	/**
+	 * This default-visibility constructor is intended for use
+	 * by the factory method only.
+	 * 
+	 */
+	GUIDoubleParameter(Parameter<Number> parameter, SettingsPane sp) {
+		super(parameter, sp);
+	}
 	
-	GUIDoubleParameter(final DoubleParameter parameter, final SettingsPane sp) {
-		super();
-		
-		this.parameter = parameter;
-		
-		originalValue = parameter.get();
-		
-		name = new Text(parameter.getName());
-		valueControl = new TextField(String.valueOf(parameter.get()));
-		valueControl.setStyle(VALID_PARAMETER_STYLE);
-		
-		((TextField) valueControl).setAlignment(Pos.CENTER_RIGHT);
-		
-		setHgrow(valueControl, Priority.ALWAYS);
-		setHgrow(name, Priority.ALWAYS);
-		
-		name.wrappingWidthProperty().bind(widthProperty().divide(2));
-		
-		((TextField) valueControl).setDisable(parameter.isMonitor());
+	@Override
+	protected Control makeControl() {
+		textField = new TextField(String.valueOf(parameter.get()));
+		textField.setStyle(VALID_PARAMETER_STYLE);
+		textField.setAlignment(Pos.CENTER_RIGHT);
 		
-		// bind if monitor, else set changelistener
-		if (parameter.isMonitor()) {
-			makeLightBinding();
-		} else {
-			valueControl.addEventFilter(KeyEvent.KEY_TYPED, new EventHandler<KeyEvent>() {
-				@Override
-				public void handle( KeyEvent t ) {
-					char ch = t.getCharacter().toCharArray()[t.getCharacter().toCharArray().length - 1];
-					if (!((ch >= '0' && ch <= '9') || (ch == '.' && !((TextField) valueControl).getText().contains(".")))) {
-						t.consume();
-					}
-				}
-			});
-			((TextField) valueControl).textProperty().addListener(new ChangeListener<String>() {
-				@Override
-				public void changed(
-						ObservableValue<? extends String> observable,
-						String oldValue, String newValue) {
-					if (!newValue.isEmpty()) {
-						parameter.set(Double.parseDouble(newValue));
-						setValidityStyle();
-						sp.revalidateParameters();
-					}
+		return textField;
+	}
 
+	@Override
+	protected void setControlListeners(final SettingsPane sp) {
+		/* filter keypresses and ignore anything that is not a number
+		 * and any decimal point beyond the first ones */
+		textField.addEventFilter(KeyEvent.KEY_TYPED, new EventHandler<KeyEvent>() {
+			@Override
+			public void handle( KeyEvent t ) {
+				char ch = t.getCharacter().toCharArray()[t.getCharacter().toCharArray().length - 1];
+				if (!((ch >= '0' && ch <= '9') || (ch == '.' && !textField.getText().contains(".")))) {
+					t.consume();
 				}
-			});
-			valueControl.focusedProperty().addListener(new ChangeListener<Boolean>() {
-				@Override
-				public void changed(
-						ObservableValue<? extends Boolean> observable,
-						Boolean oldValue, Boolean newValue) {
-					if (!newValue && ((TextField) valueControl).getText().isEmpty()) {
-						((TextField) valueControl).setText(String.valueOf(parameter.get()));
-					}
+			}
+		});
+		/* pass the TextField value back to the parameter whenever it gets
+		 * modified, provided it is not empty and the experiment isn't running */
+		textField.textProperty().addListener(new ChangeListener<String>() {
+			@Override
+			public void changed(
+					ObservableValue<? extends String> observable,
+					String oldValue, String newValue) {
+				if (!newValue.isEmpty() && !GUI.isWorking()) {
+					parameter.set(Double.parseDouble(newValue));
+					sp.revalidateParameters();
 				}
-			});
-		}
-		
-		
-		getChildren().addAll(name, valueControl);
-	}
 
-	@Override
-	public void refreshValue() {
-		((TextField) valueControl).setText(String.valueOf(((DoubleParameter) parameter).get()));
-	}
-	
-	@Override
-	public boolean requiresReset() {
-		return (parameter.isCritical() && ((DoubleParameter) parameter).get() != originalValue)
-				|| parameter.getStatus() == ParameterStatus.WARNING_RESET;
-	}
-	
-	@Override
-	public void applyValue() {
-		originalValue = ((DoubleParameter) parameter).get();
+			}
+		});
+		/* if the TextField loses focus and is empty, set it to the current
+		 * value of the parameter */
+		textField.focusedProperty().addListener(new ChangeListener<Boolean>() {
+			@Override
+			public void changed(
+					ObservableValue<? extends Boolean> observable,
+					Boolean oldValue, Boolean newValue) {
+				if (!newValue && textField.getText().isEmpty()) {
+					textField.setText(String.valueOf(parameter.get()));
+				}
+			}
+		});
 	}
 
 	@Override
-	public void validate() {
-		((DoubleParameter) parameter).validate(((DoubleParameter) parameter).get());
-		setValidityStyle();
-	}
-	
-	private void setValidityStyle() {
+	protected void setValidityStyle() {
+		// update the Control's style and tooltip based on the status of the parameter
 		if (parameter.getStatus() == ParameterStatus.INVALID) {
-			valueControl.setStyle(BASE_TEXT_STYLE + INVALID_PARAMETER_STYLE);
-			valueControl.setTooltip(tooltip);
+			textField.setStyle(BASE_TEXT_STYLE + INVALID_PARAMETER_STYLE);
+			textField.setTooltip(tooltip);
 			tooltip.setText(parameter.getStatus().getDetails());
 		} else if (parameter.getStatus() == ParameterStatus.WARNING || parameter.getStatus() ==  ParameterStatus.WARNING_RESET) {
-			valueControl.setStyle(BASE_TEXT_STYLE + WARNING_PARAMETER_STYLE);
-			valueControl.setTooltip(tooltip);
+			textField.setStyle(BASE_TEXT_STYLE + WARNING_PARAMETER_STYLE);
+			textField.setTooltip(tooltip);
 			tooltip.setText(parameter.getStatus().getDetails());
 		} else {
-			valueControl.setStyle(BASE_TEXT_STYLE + VALID_PARAMETER_STYLE);
-			valueControl.setTooltip(null);
+			textField.setStyle(BASE_TEXT_STYLE + VALID_PARAMETER_STYLE);
+			textField.setTooltip(null);
 		}
 	}
-
+	
+	@Override
+	public void refreshValue() {
+		textField.setText(String.valueOf((parameter).get()));
+	}
 }