This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1fac8746d088b8c7ce4962481701449dffc69c0c Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jun 8 16:49:34 2015 +0200 la valeur du champs calculable doit être vide lors d'un reset (refs #7088) --- .../computable/ComputableDataEditorHandler.java | 27 +++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java index 48f59e1..0d90b1e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java @@ -107,12 +107,37 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { } + /** + * Pour afficher le 0.0 en bleu italique si le moèdle est null. + * On passera à faux lors d'un reset (voir http://forge.codelutin.com/issues/7088) + * + * @since 4.0.2 + */ + boolean displayNullComputedValue = true; + + @Override + public void reset() { + + displayNullComputedValue = false; + + try { + + setTextValue(""); + + } finally { + + displayNullComputedValue = true; + + } + + } + protected void setComputedTextIfNullModel() { ComputableData bean = (ComputableData) ui.getModel().getBean(); JTextField tf = ui.getTextField(); // if (bean != null && ui.getModel() == null) { //FIXME NumberEditor - if (bean != null && bean.getData() == null) { + if (bean != null && bean.getData() == null && displayNullComputedValue) { tf.setFont(TuttiUI.TEXTFIELD_COMPUTED_FONT); tf.setForeground(((ComputableDataEditor) ui).getComputedDataColor()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.