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 6f9b277d68df5e2ff03b6aa59d932d5f019ed145 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:10:44 2015 +0200 Add displayZeroWhenNull property in signed API (refs #3677) --- .../gis/signed/SignedDdCoordinateEditor.jaxx | 1 + .../signed/SignedDdCoordinateEditorHandler.java | 24 ++++++++++++++++++++++ .../gis/signed/SignedDmdCoordinateEditor.jaxx | 1 + .../signed/SignedDmdCoordinateEditorHandler.java | 24 ++++++++++++++++++++++ .../gis/signed/SignedDmsCoordinateEditor.jaxx | 1 + .../signed/SignedDmsCoordinateEditorHandler.java | 24 ++++++++++++++++++++++ 6 files changed, 75 insertions(+) diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx index 74662b7..b644cb9 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx @@ -45,6 +45,7 @@ public void setBean(Serializable bean) { model.setBean(bean); } public void setPropertySign(String property ) { model.setPropertySign(property); } public void setPropertyDegree(String property ) { model.setPropertyDegree(property); } public void setPropertyDecimal(String property ) { model.setPropertyDecimal(property); } +public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { handler.setDisplayZeroWhenNull(displayZeroWhenNull); } public void setValue(DdCoordinate value) { handler.setValue(value, true); } ]]> </script> 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 f111713..ff78e45 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 @@ -174,6 +174,30 @@ public class SignedDdCoordinateEditorHandler implements UIHandler<SignedDdCoordi new ModelPropertyChangeListener(model, decimalMutator)); } + public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { + + signedConverter.setDisplayZeroWhenNull(displayZeroWhenNull); + unsignedConverter.setDisplayZeroWhenNull(displayZeroWhenNull); + if (log.isDebugEnabled()) { + log.debug("setDisplayZeroWhenNull: " + displayZeroWhenNull); + } + 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); + } + } + + } + public void setValue(DdCoordinate value, boolean pushToModel) { if (valueModelIsAdjusting) { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx index 8fd058a..57c668d 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx @@ -46,6 +46,7 @@ public void setPropertySign(String property ) { model.setPropertySign(property); public void setPropertyDegree(String property ) { model.setPropertyDegree(property); } public void setPropertyMinute(String property ) { model.setPropertyMinute(property); } public void setPropertyDecimal(String property ) { model.setPropertyDecimal(property); } +public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { handler.setDisplayZeroWhenNull(displayZeroWhenNull); } public void setValue(DmdCoordinate value) { handler.setValue(value, true); } ]]> </script> 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 9208f0c..109fe43 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 @@ -185,6 +185,30 @@ public class SignedDmdCoordinateEditorHandler implements UIHandler<SignedDmdCoor new ModelPropertyChangeListener(model, decimalMutator)); } + public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { + + signedConverter.setDisplayZeroWhenNull(displayZeroWhenNull); + unsignedConverter.setDisplayZeroWhenNull(displayZeroWhenNull); + if (log.isDebugEnabled()) { + log.debug("setDisplayZeroWhenNull: " + displayZeroWhenNull); + } + 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); + } + } + + } + public void setValue(DmdCoordinate value, boolean pushToModel) { if (valueModelIsAdjusting) { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx index 4f2a13c..ada9319 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx @@ -46,6 +46,7 @@ public void setPropertySign(String property ) { model.setPropertySign(property); public void setPropertyDegree(String property ) { model.setPropertyDegree(property); } public void setPropertyMinute(String property ) { model.setPropertyMinute(property); } public void setPropertySecond(String property ) { model.setPropertySecond(property); } +public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { handler.setDisplayZeroWhenNull(displayZeroWhenNull); } public void setValue(DmsCoordinate value) { handler.setValue(value, true); } ]]> </script> 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 7f420ef..264c748 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 @@ -185,6 +185,30 @@ public class SignedDmsCoordinateEditorHandler implements UIHandler<SignedDmsCoor new ModelPropertyChangeListener(model, secondMutator)); } + public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { + + signedConverter.setDisplayZeroWhenNull(displayZeroWhenNull); + unsignedConverter.setDisplayZeroWhenNull(displayZeroWhenNull); + if (log.isDebugEnabled()) { + log.debug("setDisplayZeroWhenNull: " + displayZeroWhenNull); + } + 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); + } + } + + } + public void setValue(DmsCoordinate value, boolean pushToModel) { if (valueModelIsAdjusting) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.