branch develop-2.x updated (26959b9 -> df6abd6)
This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from 26959b9 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new df6abd6 Revert previous fix on DmdConverter (Fixes #4140) The 1 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 df6abd6470ea77b43a940f4c4f0d8e7f3f7cd590 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Jan 20 12:43:32 2017 +0100 Revert previous fix on DmdConverter (Fixes #4140) Summary of changes: .../java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java | 5 +---- 1 file changed, 1 insertion(+), 4 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 develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit df6abd6470ea77b43a940f4c4f0d8e7f3f7cd590 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Jan 20 12:43:32 2017 +0100 Revert previous fix on DmdConverter (Fixes #4140) --- .../java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java | 5 +---- 1 file changed, 1 insertion(+), 4 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 d997208..e17d484 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,9 +102,6 @@ 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); boolean signed = degresStr.contains("-"); @@ -136,7 +133,7 @@ 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.leftPad(minuteStr, 2, nullValue.equals(minuteStr) ? ' ' : fillChar), StringUtils.rightPad(decimalStr, 2, nullValue.equals(decimalStr) ? ' ' : fillChar)); } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm