This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 19c07b7571e7072b1af141cc99351a8350858b87 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Mar 8 12:53:21 2017 +0100 fix gis editors (report from 2.x branch) (Closes #1900) --- .../org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 de4cf50..885aedf 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 @@ -102,11 +102,10 @@ public class DmdCoordinateConverter implements NuitonConverter<DmdCoordinate> { Integer degre = degresStr.isEmpty() || "-".equals(degresStr) ? null : Math.abs(Integer.valueOf(degresStr)); Integer minutes = minutesStr.isEmpty() ? null : Integer.valueOf(minutesStr); - if (minutesStr.length() == 1 && minutes != null && minutes > 0) { - minutes *= 10; - } Integer decimal = decimalesStr.isEmpty() ? null : Integer.valueOf(decimalesStr); - + if (decimalesStr.length() == 1 && decimal != null && decimal > 0) { + decimal *= 10; + } boolean signed = degresStr.contains("-"); result = DmdCoordinate.valueOf(signed, degre, @@ -136,8 +135,8 @@ public class DmdCoordinateConverter implements NuitonConverter<DmdCoordinate> { DmdCoordinate.COORDINATE_STRING_PATTERN, signStr, StringUtils.leftPad(degreeStr, forLongitude ? 3 : 2, nullValue.equals(degreeStr) ? ' ' : fillChar), - nullValue.equals(minuteStr) ? StringUtils.rightPad(minuteStr, 2, ' ') : StringUtils.leftPad(minuteStr, 2, fillChar), - StringUtils.rightPad(decimalStr, 2, nullValue.equals(decimalStr) ? ' ' : fillChar)); + StringUtils.leftPad(minuteStr, 2, nullValue.equals(minuteStr) ? ' ' : fillChar), + StringUtils.leftPad(decimalStr, 2, nullValue.equals(decimalStr) ? ' ' : fillChar)); } } return aClass.cast(result); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.