branch support/2.x updated (da06f94 -> 333683b)
This is an automated email from the git hooks/post-receive script. New change to branch support/2.x in repository jaxx. See http://git.nuiton.org/jaxx.git from da06f94 on jaxx 2.x, jdk still stay in level 6 + reset 2.x version new 1691d5e Add the property in the converter to display zero when null values (refs #3677) new 7ae9ea0 Add displayZeroWhenNull property in absolute API (refs #3677) new 6f9b277 Add displayZeroWhenNull property in signed API (refs #3677) new 133f5e4 make the changes of property displayZeroWhenNull javabean (refs #3677) new 6566c85 add to demo (refs #3677) new a06ad34 Be able to display zero in coordinate componant editors for null values (fixes #3677) Merge branch 'feature/3677' into support/2.x new 333683b jaxx-compiler tests are using jdk7 api The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 333683b19bf8eff986b9723da8e986e31e885a65 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:32:58 2015 +0200 jaxx-compiler tests are using jdk7 api commit a06ad3469029ddf7de169601d9131aa794dd60c8 Merge: da06f94 6566c85 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:32:13 2015 +0200 Be able to display zero in coordinate componant editors for null values (fixes #3677) Merge branch 'feature/3677' into support/2.x commit 6566c85c54f9b56475d91f60e6ef968fb2971921 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:32:06 2015 +0200 add to demo (refs #3677) 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) 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) commit 7ae9ea0de6f6a20f19fe58809f33c1a6dc1c0614 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:10:30 2015 +0200 Add displayZeroWhenNull property in absolute API (refs #3677) commit 1691d5e5e6e1f48852c900a049dbb7dd58a4ec29 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:09:56 2015 +0200 Add the property in the converter to display zero when null values (refs #3677) Summary of changes: jaxx-compiler/pom.xml | 11 +++++ .../jaxx/widgets/gis/CoordinatesEditorDemo.css | 6 +++ .../jaxx/widgets/gis/CoordinatesEditorDemo.jaxx | 1 + .../main/resources/i18n/jaxx-demo_en_GB.properties | 1 + .../main/resources/i18n/jaxx-demo_es_ES.properties | 1 + .../main/resources/i18n/jaxx-demo_fr_FR.properties | 1 + .../jaxx/widgets/gis/DdCoordinateConverter.java | 15 ++++--- .../jaxx/widgets/gis/DmdCoordinateConverter.java | 18 +++++--- .../jaxx/widgets/gis/DmsCoordinateConverter.java | 18 +++++--- .../gis/absolute/AbsoluteDdCoordinateEditor.jaxx | 1 + .../AbsoluteDdCoordinateEditorHandler.java | 27 ++++++++++++ .../gis/absolute/AbsoluteDmdCoordinateEditor.jaxx | 1 + .../AbsoluteDmdCoordinateEditorHandler.java | 27 ++++++++++++ .../gis/absolute/AbsoluteDmsCoordinateEditor.jaxx | 1 + .../AbsoluteDmsCoordinateEditorHandler.java | 29 ++++++++++++- .../widgets/gis/absolute/CoordinatesEditor.css | 6 +++ .../widgets/gis/absolute/CoordinatesEditor.jaxx | 2 + .../gis/absolute/CoordinatesEditorModel.java | 48 ++++++++++++++++++++++ .../gis/signed/SignedDdCoordinateEditor.jaxx | 1 + .../signed/SignedDdCoordinateEditorHandler.java | 28 +++++++++++++ .../gis/signed/SignedDmdCoordinateEditor.jaxx | 1 + .../signed/SignedDmdCoordinateEditorHandler.java | 28 +++++++++++++ .../gis/signed/SignedDmsCoordinateEditor.jaxx | 1 + .../signed/SignedDmsCoordinateEditorHandler.java | 28 +++++++++++++ 24 files changed, 283 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 1691d5e5e6e1f48852c900a049dbb7dd58a4ec29 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:09:56 2015 +0200 Add the property in the converter to display zero when null values (refs #3677) --- .../nuiton/jaxx/widgets/gis/DdCoordinateConverter.java | 15 ++++++++++----- .../jaxx/widgets/gis/DmdCoordinateConverter.java | 18 ++++++++++++------ .../jaxx/widgets/gis/DmsCoordinateConverter.java | 18 ++++++++++++------ 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverter.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverter.java index e6c8e5e..6dae49f 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverter.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverter.java @@ -42,6 +42,8 @@ public class DdCoordinateConverter implements NuitonConverter<DdCoordinate> { protected boolean forLongitude; + protected String nullValue = ""; + public void setUseSign(boolean useSign) { this.useSign = useSign; } @@ -50,6 +52,10 @@ public class DdCoordinateConverter implements NuitonConverter<DdCoordinate> { this.forLongitude = forLongitude; } + public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { + this.nullValue = displayZeroWhenNull ? "0" : ""; + } + @Override public <T> T convert(Class<T> aClass, Object value) { @@ -67,8 +73,8 @@ public class DdCoordinateConverter implements NuitonConverter<DdCoordinate> { result = String.format( DdCoordinate.COORDINATE_STRING_PATTERN, useSign ? "-" : "", - StringUtils.leftPad("", forLongitude ? 3 : 2, ' '), - StringUtils.leftPad("", 3, ' ')); + StringUtils.leftPad(nullValue, forLongitude ? 3 : 2, ' '), + StringUtils.leftPad(nullValue, 3, ' ')); } } else { @@ -112,13 +118,13 @@ public class DdCoordinateConverter implements NuitonConverter<DdCoordinate> { String signStr = sign ? "-" : ""; Integer degree = coordinate.getDegree(); - String degreeStr = degree == null ? "" : degree.toString(); + String degreeStr = degree == null ? nullValue : degree.toString(); Integer decimal = coordinate.getDecimal(); String decimalStr; if (decimal == null) { - decimalStr = ""; + decimalStr = nullValue; } else { decimalStr = StringUtils.leftPad(decimal.toString(), 3, '0'); @@ -131,7 +137,6 @@ public class DdCoordinateConverter implements NuitonConverter<DdCoordinate> { DdCoordinate.COORDINATE_STRING_PATTERN, signStr, StringUtils.leftPad(degreeStr, forLongitude ? 3 : 2, ' '), -// decimalStr); StringUtils.rightPad(decimalStr, 3, ' ')); } } diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java index 350c0de..9f2619b 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java @@ -42,6 +42,8 @@ public class DmdCoordinateConverter implements NuitonConverter<DmdCoordinate> { protected boolean forLongitude; + protected String nullValue = ""; + public void setUseSign(boolean useSign) { this.useSign = useSign; } @@ -50,6 +52,10 @@ public class DmdCoordinateConverter implements NuitonConverter<DmdCoordinate> { this.forLongitude = forLongitude; } + public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { + this.nullValue = displayZeroWhenNull ? "0" : ""; + } + @Override public <T> T convert(Class<T> aClass, Object value) { @@ -67,9 +73,9 @@ public class DmdCoordinateConverter implements NuitonConverter<DmdCoordinate> { result = String.format( DmdCoordinate.COORDINATE_STRING_PATTERN, useSign ? "-" : "", - StringUtils.leftPad("", forLongitude ? 3 : 2, ' '), - StringUtils.leftPad("", 2, ' '), - StringUtils.leftPad("", 2, ' ')); + StringUtils.leftPad(nullValue, forLongitude ? 3 : 2, ' '), + StringUtils.leftPad(nullValue, 2, ' '), + StringUtils.leftPad(nullValue, 2, ' ')); } } else { @@ -110,13 +116,13 @@ public class DmdCoordinateConverter implements NuitonConverter<DmdCoordinate> { String signStr = sign ? "-" : ""; Integer degree = coordinate.getDegree(); - String degreeStr = degree == null ? "" : degree.toString(); + String degreeStr = degree == null ? nullValue : degree.toString(); Integer minute = coordinate.getMinute(); - String minuteStr = minute == null ? "" : minute.toString(); + String minuteStr = minute == null ? nullValue : minute.toString(); Integer decimal = coordinate.getDecimal(); - String decimalStr = decimal == null ? "" : decimal.toString(); + String decimalStr = decimal == null ? nullValue : decimal.toString(); result = String.format( DmdCoordinate.COORDINATE_STRING_PATTERN, diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java index dacfa8d..da643ef 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java @@ -42,6 +42,8 @@ public class DmsCoordinateConverter implements NuitonConverter<DmsCoordinate> { protected boolean forLongitude; + protected String nullValue = ""; + public void setUseSign(boolean useSign) { this.useSign = useSign; } @@ -50,6 +52,10 @@ public class DmsCoordinateConverter implements NuitonConverter<DmsCoordinate> { this.forLongitude = forLongitude; } + public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { + this.nullValue = displayZeroWhenNull ? "0" : ""; + } + @Override public <T> T convert(Class<T> aClass, Object value) { @@ -67,9 +73,9 @@ public class DmsCoordinateConverter implements NuitonConverter<DmsCoordinate> { result = String.format( DmsCoordinate.COORDINATE_STRING_PATTERN, useSign ? "-" : "", - StringUtils.leftPad("", forLongitude ? 3 : 2, ' '), - StringUtils.leftPad("", 2, ' '), - StringUtils.leftPad("", 2, ' ')); + StringUtils.leftPad(nullValue, forLongitude ? 3 : 2, ' '), + StringUtils.leftPad(nullValue, 2, ' '), + StringUtils.leftPad(nullValue, 2, ' ')); } } else { @@ -110,13 +116,13 @@ public class DmsCoordinateConverter implements NuitonConverter<DmsCoordinate> { String signStr = sign ? "-" : ""; Integer degree = coordinate.getDegree(); - String degreeStr = degree == null ? "" : degree.toString(); + String degreeStr = degree == null ? nullValue : degree.toString(); Integer minute = coordinate.getMinute(); - String minuteStr = minute == null ? "" : minute.toString(); + String minuteStr = minute == null ? nullValue : minute.toString(); Integer second = coordinate.getSecond(); - String secondStr = second == null ? "" : second.toString(); + String secondStr = second == null ? nullValue : second.toString(); result = String.format( DmsCoordinate.COORDINATE_STRING_PATTERN, -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 7ae9ea0de6f6a20f19fe58809f33c1a6dc1c0614 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:10:30 2015 +0200 Add displayZeroWhenNull property in absolute API (refs #3677) --- .../gis/absolute/AbsoluteDdCoordinateEditor.jaxx | 1 + .../AbsoluteDdCoordinateEditorHandler.java | 23 +++++++++++ .../gis/absolute/AbsoluteDmdCoordinateEditor.jaxx | 1 + .../AbsoluteDmdCoordinateEditorHandler.java | 23 +++++++++++ .../gis/absolute/AbsoluteDmsCoordinateEditor.jaxx | 1 + .../AbsoluteDmsCoordinateEditorHandler.java | 25 +++++++++++- .../widgets/gis/absolute/CoordinatesEditor.jaxx | 2 + .../gis/absolute/CoordinatesEditorHandler.java | 9 +++++ .../gis/absolute/CoordinatesEditorModel.java | 45 ++++++++++++++++++++++ 9 files changed, 129 insertions(+), 1 deletion(-) diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx index 4aecc74..73fa859 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx @@ -44,6 +44,7 @@ public void init(boolean longitudeEditor) { handler.init(longitudeEditor); } public void setBean(Serializable bean) { model.setBean(bean); } 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/absolute/AbsoluteDdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java index 8765bb7..b81d396 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 @@ -139,6 +139,29 @@ public class AbsoluteDdCoordinateEditorHandler implements UIHandler<AbsoluteDdCo new ModelPropertyChangeListener(model, decimalMutator)); } + public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { + + coordinateConverter.setDisplayZeroWhenNull(displayZeroWhenNull); + if (log.isDebugEnabled()) { + log.debug("setDisplayZeroWhenNull: " + displayZeroWhenNull); + } + 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); + } + } + + } + public void setValue(DdCoordinate value, boolean pushToModel) { if (valueModelIsAdjusting) { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx index fa08e7e..bf950b8 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx @@ -45,6 +45,7 @@ public void setBean(Serializable bean) { model.setBean(bean); } 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/absolute/AbsoluteDmdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java index 250c64d..1d1774c 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 @@ -152,6 +152,29 @@ public class AbsoluteDmdCoordinateEditorHandler implements UIHandler<AbsoluteDmd new ModelPropertyChangeListener(model, decimalMutator)); } + public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { + + coordinateConverter.setDisplayZeroWhenNull(displayZeroWhenNull); + if (log.isDebugEnabled()) { + log.debug("setDisplayZeroWhenNull: " + displayZeroWhenNull); + } + 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); + } + } + + } + public void setValue(DmdCoordinate value, boolean pushToModel) { if (valueModelIsAdjusting) { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx index 7029e56..3ca5b5d 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx @@ -45,6 +45,7 @@ public void setBean(Serializable bean) { model.setBean(bean); } 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/absolute/AbsoluteDmsCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java index 991d4be..a9e2ade 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 @@ -28,8 +28,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.gis.DmsCoordinate; import org.nuiton.jaxx.widgets.gis.DmsCoordinateConverter; -import org.nuiton.jaxx.widgets.jformattedtextfield.JFormattedTextFieldNavigationManager; import org.nuiton.jaxx.widgets.gis.MaskFormatterFromConverter; +import org.nuiton.jaxx.widgets.jformattedtextfield.JFormattedTextFieldNavigationManager; import org.nuiton.util.beans.BeanUtil; import javax.swing.JFormattedTextField; @@ -150,6 +150,29 @@ public class AbsoluteDmsCoordinateEditorHandler implements UIHandler<AbsoluteDms new ModelPropertyChangeListener(model, secondMutator)); } + public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { + + coordinateConverter.setDisplayZeroWhenNull(displayZeroWhenNull); + if (log.isDebugEnabled()) { + 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); + } + } + + } + public void setValue(DmsCoordinate value, boolean pushToModel) { if (valueModelIsAdjusting) { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx index 3b83ddc..95600a7 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx @@ -36,8 +36,10 @@ public void setPropertyLongitude(String property) { model.setPropertyLongitude(p public void setQuadrant(Integer quadrant) { model.setQuadrant(quadrant); } public void setLatitude(Float latitude) { model.setLatitude(latitude); } public void setLongitude(Float longitude) { model.setLongitude(longitude); } +public void setLatitudeAndLongitude(Float latitude, Float longitude) { model.setLatitudeAndLongitude(latitude, longitude); } public void setFormat(CoordinateFormat format) { model.setFormat(format); } public void setShowResetButton(boolean showResetButton) { model.setShowResetButton(showResetButton); } +public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { model.setDisplayZeroWhenNull(displayZeroWhenNull); } ]]> </script> 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 f4dbc3c..701f742 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,6 +108,15 @@ 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 bec23fa..8bea54d 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 @@ -72,6 +72,11 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { protected boolean showResetButton; + /** + * Display a zero on each coordinate componant when it is null. + */ + protected boolean displayZeroWhenNull; + private boolean valueIsAdjusting; public CoordinatesEditorModel() { @@ -169,6 +174,14 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { this.propertyQuadrant = propertyQuadrant; } + public boolean isDisplayZeroWhenNull() { + return displayZeroWhenNull; + } + + public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { + this.displayZeroWhenNull = displayZeroWhenNull; + } + public boolean isShowResetButton() { return showResetButton; } @@ -187,6 +200,38 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { return longitudeModel; } + public void setLatitudeAndLongitude(Float latitude, Float longitude) { + + valueIsAdjusting = true; + Integer newQuadrant = CoordinateHelper.getQuadrant(longitude, latitude); + boolean quadrantChanged = newQuadrant != null; + + try { + + if (quadrantChanged) { + + // only change not nul quadrant + this.quadrant = newQuadrant; + + } + + this.latitudeModel.setValue(latitude); + this.longitudeModel.setValue(longitude); + + } finally { + + valueIsAdjusting = false; + + fireLatitude(); + fireLongitude(); + if (quadrantChanged) { + fireQuadrant(); + } + + } + + } + public Float getLatitude() { Float latitude; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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>.
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>.
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 6566c85c54f9b56475d91f60e6ef968fb2971921 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:32:06 2015 +0200 add to demo (refs #3677) --- .../jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css | 6 ++++++ .../jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx | 1 + jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties | 1 + jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties | 1 + jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties | 1 + 5 files changed, 10 insertions(+) diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css index 8eba577..7458889 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css @@ -34,6 +34,11 @@ selected: true; } +#displayZeroWhenNull { + text: "jaxxdemo.coordinate.displayZeroWhenNull"; + selected: true; +} + #editor { showResetButton: {showReset.isSelected()}; propertyLatitude:latitude; @@ -44,6 +49,7 @@ longitude:{model.getLongitude()}; quadrant:{model.getQuadrant()}; enabled:{enableButton.isSelected()}; + displayZeroWhenNull:{displayZeroWhenNull.isSelected()}; } #result { diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx index 5acda97..5fa3d0d 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx @@ -33,6 +33,7 @@ <JPanel id='config' layout='{new GridLayout(0,1)}'> <JCheckBox id='showReset'/> <JCheckBox id='enableButton'/> + <JCheckBox id='displayZeroWhenNull'/> </JPanel> </cell> </row> diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties index 8aea671..eedf2f2 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties @@ -241,6 +241,7 @@ jaxxdemo.config.ui.locale=Language used in application jaxxdemo.config.ui.logLevel=Log level jaxxdemo.config.ui.logPatternLayout=Log pattern jaxxdemo.context.helpPage.notFound= +jaxxdemo.coordinate.displayZeroWhenNull=Display zero instead of empty string for null values jaxxdemo.coordinate.enable=Enable / Disable jaxxdemo.coordinate.latitude=Latitude jaxxdemo.coordinate.latitudeDd=Latitude (format DD) diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties index d0108b1..c909bd2 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties @@ -243,6 +243,7 @@ jaxxdemo.config.ui.locale=La langue utilisée par l'application jaxxdemo.config.ui.logLevel=Level de log jaxxdemo.config.ui.logPatternLayout=Pattern des log jaxxdemo.context.helpPage.notFound= +jaxxdemo.coordinate.displayZeroWhenNull= jaxxdemo.coordinate.enable= jaxxdemo.coordinate.latitude= jaxxdemo.coordinate.latitudeDd= diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties index 7310e5c..609ec79 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties @@ -241,6 +241,7 @@ jaxxdemo.config.ui.locale=La langue utilisée par l'application jaxxdemo.config.ui.logLevel=Level de log jaxxdemo.config.ui.logPatternLayout=Pattern des log jaxxdemo.context.helpPage.notFound= +jaxxdemo.coordinate.displayZeroWhenNull=Mettre des zéro pour les valeurs nulles jaxxdemo.coordinate.enable=Activer / Désactiver jaxxdemo.coordinate.latitude=Latitude jaxxdemo.coordinate.latitudeDd=Latitude (au format DD) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 a06ad3469029ddf7de169601d9131aa794dd60c8 Merge: da06f94 6566c85 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:32:13 2015 +0200 Be able to display zero in coordinate componant editors for null values (fixes #3677) Merge branch 'feature/3677' into support/2.x .../jaxx/widgets/gis/CoordinatesEditorDemo.css | 6 +++ .../jaxx/widgets/gis/CoordinatesEditorDemo.jaxx | 1 + .../main/resources/i18n/jaxx-demo_en_GB.properties | 1 + .../main/resources/i18n/jaxx-demo_es_ES.properties | 1 + .../main/resources/i18n/jaxx-demo_fr_FR.properties | 1 + .../jaxx/widgets/gis/DdCoordinateConverter.java | 15 ++++--- .../jaxx/widgets/gis/DmdCoordinateConverter.java | 18 +++++--- .../jaxx/widgets/gis/DmsCoordinateConverter.java | 18 +++++--- .../gis/absolute/AbsoluteDdCoordinateEditor.jaxx | 1 + .../AbsoluteDdCoordinateEditorHandler.java | 27 ++++++++++++ .../gis/absolute/AbsoluteDmdCoordinateEditor.jaxx | 1 + .../AbsoluteDmdCoordinateEditorHandler.java | 27 ++++++++++++ .../gis/absolute/AbsoluteDmsCoordinateEditor.jaxx | 1 + .../AbsoluteDmsCoordinateEditorHandler.java | 29 ++++++++++++- .../widgets/gis/absolute/CoordinatesEditor.css | 6 +++ .../widgets/gis/absolute/CoordinatesEditor.jaxx | 2 + .../gis/absolute/CoordinatesEditorModel.java | 48 ++++++++++++++++++++++ .../gis/signed/SignedDdCoordinateEditor.jaxx | 1 + .../signed/SignedDdCoordinateEditorHandler.java | 28 +++++++++++++ .../gis/signed/SignedDmdCoordinateEditor.jaxx | 1 + .../signed/SignedDmdCoordinateEditorHandler.java | 28 +++++++++++++ .../gis/signed/SignedDmsCoordinateEditor.jaxx | 1 + .../signed/SignedDmsCoordinateEditorHandler.java | 28 +++++++++++++ 23 files changed, 272 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 333683b19bf8eff986b9723da8e986e31e885a65 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:32:58 2015 +0200 jaxx-compiler tests are using jdk7 api --- jaxx-compiler/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index c5d6c57..9e3677f 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -39,6 +39,17 @@ <name>JAXX :: Compiler</name> <description>JAXX Compiler api</description> + <properties> + <!-- Java version --> + <javaVersion>1.7</javaVersion> + <!--TODO remove this when idea won't ask to change jdk level at each pom modification--> + <maven.compiler.source>${javaVersion}</maven.compiler.source> + <!--TODO remove this when idea won't ask to change jdk level at each pom modification--> + <maven.compiler.target>${javaVersion}</maven.compiler.target> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> + </properties> + <dependencies> <!-- sibling dependencies --> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm