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>.