Author: kmorin Date: 2013-03-15 12:13:13 +0100 (Fri, 15 Mar 2013) New Revision: 632 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/632 Log: debug initially blue text in computed or not fields Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-15 10:59:47 UTC (rev 631) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-15 11:13:13 UTC (rev 632) @@ -75,16 +75,18 @@ TuttiComputedOrNotData bean = (TuttiComputedOrNotData) evt.getOldValue(); if (bean != null) { - bean.removePropertyChangeListener(l); + bean.removePropertyChangeListener(TuttiComputedOrNotData.PROPERTY_COMPUTED_DATA, l); } bean = (TuttiComputedOrNotData) evt.getNewValue(); if (bean != null) { - bean.addPropertyChangeListener(l); + bean.addPropertyChangeListener(TuttiComputedOrNotData.PROPERTY_COMPUTED_DATA, l); } } }); + editor.addPropertyChangeListener(TuttiComputedOrNotDataEditor.PROPERTY_MODEL, l); + editor.getTextField().addFocusListener(new FocusListener() { public void focusGained(FocusEvent e) { @@ -108,6 +110,7 @@ decimalNumber = (Integer) evt.getNewValue(); } }); + decimalNumber = ((TuttiComputedOrNotDataEditor) editor).getDecimalNumber(); super.init(); @@ -116,8 +119,8 @@ protected void setComputedTextIfNullModel() { TuttiComputedOrNotData bean = (TuttiComputedOrNotData) editor.getBean(); + JTextField tf = editor.getTextField(); if (bean != null && editor.getModel() == null) { - JTextField tf = editor.getTextField(); tf.setFont(TuttiUI.TEXTFIELD_COMPUTED_FONT); tf.setForeground(((TuttiComputedOrNotDataEditor) editor).getComputedDataColor()); @@ -131,6 +134,10 @@ modelText = JAXXUtil.getStringValue(computedData); } tf.setText(modelText); + + } else { + tf.setFont(TuttiUI.TEXTFIELD_NORMAL_FONT); + tf.setForeground(Color.BLACK); } }