This is an automated email from the git hooks/post-receive script. New commit to branch support/2.x in repository jaxx. See http://git.nuiton.org/jaxx.git commit 133f5e4e903642c41e88e6912e329ba2f4c1066d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:31:48 2015 +0200 make the changes of property displayZeroWhenNull javabean (refs #3677) --- .../AbsoluteDdCoordinateEditorHandler.java | 22 ++++++++++++-------- .../AbsoluteDmdCoordinateEditorHandler.java | 22 ++++++++++++-------- .../AbsoluteDmsCoordinateEditorHandler.java | 24 +++++++++++++--------- .../widgets/gis/absolute/CoordinatesEditor.css | 6 ++++++ .../gis/absolute/CoordinatesEditorHandler.java | 9 -------- .../gis/absolute/CoordinatesEditorModel.java | 3 +++ .../signed/SignedDdCoordinateEditorHandler.java | 22 ++++++++++++-------- .../signed/SignedDmdCoordinateEditorHandler.java | 22 ++++++++++++-------- .../signed/SignedDmsCoordinateEditorHandler.java | 22 ++++++++++++-------- 9 files changed, 88 insertions(+), 64 deletions(-) diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java index b81d396..d33c146 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java @@ -148,16 +148,20 @@ public class AbsoluteDdCoordinateEditorHandler implements UIHandler<AbsoluteDdCo AbsoluteDdCoordinateEditorModel model = ui.getModel(); JFormattedTextField editor = ui.getEditor(); JFormattedTextField.AbstractFormatter formatter = editor.getFormatter(); - try { - String newStringValue = formatter.valueToString(model); - if (log.isDebugEnabled()) { - log.debug("updating string value: " + newStringValue); - } - editor.setText(newStringValue); - } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Could not parse new string value", e); + if (formatter != null) { + + try { + String newStringValue = formatter.valueToString(model); + if (log.isDebugEnabled()) { + log.debug("updating string value: " + newStringValue); + } + editor.setText(newStringValue); + } catch (ParseException e) { + if (log.isErrorEnabled()) { + log.error("Could not parse new string value", e); + } } + } } diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java index 1d1774c..1af3afe 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java @@ -161,16 +161,20 @@ public class AbsoluteDmdCoordinateEditorHandler implements UIHandler<AbsoluteDmd AbsoluteDmdCoordinateEditorModel model = ui.getModel(); JFormattedTextField editor = ui.getEditor(); JFormattedTextField.AbstractFormatter formatter = editor.getFormatter(); - try { - String newStringValue = formatter.valueToString(model); - if (log.isDebugEnabled()) { - log.debug("updating string value: " + newStringValue); - } - editor.setText(newStringValue); - } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Could not parse new string value", e); + if (formatter != null) { + + try { + String newStringValue = formatter.valueToString(model); + if (log.isDebugEnabled()) { + log.debug("updating string value: " + newStringValue); + } + editor.setText(newStringValue); + } catch (ParseException e) { + if (log.isErrorEnabled()) { + log.error("Could not parse new string value", e); + } } + } } diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java index a9e2ade..8ecf935 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java @@ -154,21 +154,25 @@ public class AbsoluteDmsCoordinateEditorHandler implements UIHandler<AbsoluteDms coordinateConverter.setDisplayZeroWhenNull(displayZeroWhenNull); if (log.isDebugEnabled()) { - log.debug("setDisplayZeroWhenNull: "+displayZeroWhenNull); + log.debug("setDisplayZeroWhenNull: " + displayZeroWhenNull); } AbsoluteDmsCoordinateEditorModel model = ui.getModel(); JFormattedTextField editor = ui.getEditor(); JFormattedTextField.AbstractFormatter formatter = editor.getFormatter(); - try { - String newStringValue = formatter.valueToString(model); - if (log.isDebugEnabled()) { - log.debug("updating string value: "+newStringValue); - } - editor.setText(newStringValue); - } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Could not parse new string value", e); + if (formatter != null) { + + try { + String newStringValue = formatter.valueToString(model); + if (log.isDebugEnabled()) { + log.debug("updating string value: " + newStringValue); + } + editor.setText(newStringValue); + } catch (ParseException e) { + if (log.isErrorEnabled()) { + log.error("Could not parse new string value", e); + } } + } } diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css index 9356616..dcd977b 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css @@ -106,6 +106,7 @@ AbsoluteDmdCoordinateEditor { propertyDegree: ddDegree; propertyDecimal: ddDecimal; bean:{latitudeModel}; + displayZeroWhenNull: {model.isDisplayZeroWhenNull()}; value: {latitudeModel.getDd()}; showResetTip: {t("jaxx.coordinate.action.reset.latitude.tip")}; } @@ -115,6 +116,7 @@ AbsoluteDmdCoordinateEditor { propertyMinute: dmsMinute; propertySecond: dmsSecond; bean:{latitudeModel}; + displayZeroWhenNull: {model.isDisplayZeroWhenNull()}; value: {latitudeModel.getDms()}; showResetTip: {t("jaxx.coordinate.action.reset.latitude.tip")}; } @@ -124,6 +126,7 @@ AbsoluteDmdCoordinateEditor { propertyMinute: dmdMinute; propertyDecimal: dmdDecimal; bean:{latitudeModel}; + displayZeroWhenNull: {model.isDisplayZeroWhenNull()}; value: {latitudeModel.getDmd()}; showResetTip: {t("jaxx.coordinate.action.reset.latitude.tip")}; } @@ -149,6 +152,7 @@ AbsoluteDmdCoordinateEditor { propertyDegree: ddDegree; propertyDecimal: ddDecimal; bean:{longitudeModel}; + displayZeroWhenNull: {model.isDisplayZeroWhenNull()}; value: {longitudeModel.getDd()}; showResetTip: {t("jaxx.coordinate.action.reset.longitude.tip")}; } @@ -158,6 +162,7 @@ AbsoluteDmdCoordinateEditor { propertyMinute: dmsMinute; propertySecond: dmsSecond; bean:{longitudeModel}; + displayZeroWhenNull: {model.isDisplayZeroWhenNull()}; value: {longitudeModel.getDms()}; showResetTip: {t("jaxx.coordinate.action.reset.longitude.tip")}; } @@ -167,6 +172,7 @@ AbsoluteDmdCoordinateEditor { propertyMinute: dmdMinute; propertyDecimal: dmdDecimal; bean:{longitudeModel}; + displayZeroWhenNull: {model.isDisplayZeroWhenNull()}; value: {longitudeModel.getDmd()}; showResetTip: {t("jaxx.coordinate.action.reset.longitude.tip")}; } diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java index 701f742..f4dbc3c 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java @@ -108,15 +108,6 @@ public class CoordinatesEditorHandler implements UIHandler<CoordinatesEditor> { } - boolean displayZeroWhenNull = model.isDisplayZeroWhenNull(); - - ui.getLatitudeDd().setDisplayZeroWhenNull(displayZeroWhenNull); - ui.getLatitudeDms().setDisplayZeroWhenNull(displayZeroWhenNull); - ui.getLatitudeDmd().setDisplayZeroWhenNull(displayZeroWhenNull); - ui.getLongitudeDd().setDisplayZeroWhenNull(displayZeroWhenNull); - ui.getLongitudeDms().setDisplayZeroWhenNull(displayZeroWhenNull); - ui.getLongitudeDmd().setDisplayZeroWhenNull(displayZeroWhenNull); - } public boolean isQuadrantSelected(Integer value, int requiredValue) { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java index 8bea54d..4e1cae2 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java @@ -49,6 +49,7 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { public static final String PROPERTY_FORMAT = "format"; public static final String PROPERTY_SHOW_RESET_BUTTON = "showResetButton"; + public static final String PROPERTY_DISPLAY_ZERO_WHEN_NULL = "displayZeroWhenNull"; protected final AbsoluteCoordinateEditorModel latitudeModel = new AbsoluteCoordinateEditorModel(); @@ -179,7 +180,9 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { } public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { + boolean oldValue = isDisplayZeroWhenNull(); this.displayZeroWhenNull = displayZeroWhenNull; + firePropertyChange(PROPERTY_DISPLAY_ZERO_WHEN_NULL, oldValue, displayZeroWhenNull); } public boolean isShowResetButton() { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java index ff78e45..0442f37 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java @@ -184,16 +184,20 @@ public class SignedDdCoordinateEditorHandler implements UIHandler<SignedDdCoordi SignedDdCoordinateEditorModel model = ui.getModel(); JFormattedTextField editor = ui.getEditor(); JFormattedTextField.AbstractFormatter formatter = editor.getFormatter(); - try { - String newStringValue = formatter.valueToString(model); - if (log.isDebugEnabled()) { - log.debug("updating string value: " + newStringValue); - } - editor.setText(newStringValue); - } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Could not parse new string value", e); + if (formatter != null) { + + try { + String newStringValue = formatter.valueToString(model); + if (log.isDebugEnabled()) { + log.debug("updating string value: " + newStringValue); + } + editor.setText(newStringValue); + } catch (ParseException e) { + if (log.isErrorEnabled()) { + log.error("Could not parse new string value", e); + } } + } } diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java index 109fe43..38a456c 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java @@ -195,16 +195,20 @@ public class SignedDmdCoordinateEditorHandler implements UIHandler<SignedDmdCoor SignedDmdCoordinateEditorModel model = ui.getModel(); JFormattedTextField editor = ui.getEditor(); JFormattedTextField.AbstractFormatter formatter = editor.getFormatter(); - try { - String newStringValue = formatter.valueToString(model); - if (log.isDebugEnabled()) { - log.debug("updating string value: " + newStringValue); - } - editor.setText(newStringValue); - } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Could not parse new string value", e); + if (formatter != null) { + + try { + String newStringValue = formatter.valueToString(model); + if (log.isDebugEnabled()) { + log.debug("updating string value: " + newStringValue); + } + editor.setText(newStringValue); + } catch (ParseException e) { + if (log.isErrorEnabled()) { + log.error("Could not parse new string value", e); + } } + } } diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java index 264c748..859e24c 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java @@ -195,16 +195,20 @@ public class SignedDmsCoordinateEditorHandler implements UIHandler<SignedDmsCoor SignedDmsCoordinateEditorModel model = ui.getModel(); JFormattedTextField editor = ui.getEditor(); JFormattedTextField.AbstractFormatter formatter = editor.getFormatter(); - try { - String newStringValue = formatter.valueToString(model); - if (log.isDebugEnabled()) { - log.debug("updating string value: " + newStringValue); - } - editor.setText(newStringValue); - } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Could not parse new string value", e); + if (formatter != null) { + + try { + String newStringValue = formatter.valueToString(model); + if (log.isDebugEnabled()) { + log.debug("updating string value: " + newStringValue); + } + editor.setText(newStringValue); + } catch (ParseException e) { + if (log.isErrorEnabled()) { + log.error("Could not parse new string value", e); + } } + } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.