Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consider escaped double quote case in picture prefix #849

Merged
merged 7 commits into from
May 7, 2024
Merged

Consider escaped double quote case in picture prefix #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4cc7c5
Consider escaped double quote case in picture prefix
tomas-sexenian Apr 15, 2024
739a82c
Remove unnecessary if statement
tomas-sexenian Apr 15, 2024
47638bb
Add unit test
tomas-sexenian Apr 16, 2024
fdaeb47
Merge branch 'master' into EscapedQuoteInPicture
tomas-sexenian Apr 16, 2024
b6ea20e
Remove extra white space between prefix and number
tomas-sexenian Apr 23, 2024
5d3260b
Merge branch 'master' into EscapedQuoteInPicture
tomas-sexenian Apr 23, 2024
af6482a
Merge branch 'master' into EscapedQuoteInPicture
tomas-sexenian May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions common/src/main/java/com/genexus/LocalUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,6 +1562,8 @@ else if (a=='.' && !dotRemove)
else if (a=='\\')
{
i++;
if (picture.charAt(i--) == '"')
pictureWithoutSymbols.append('"');
}
}
return pictureWithoutSymbols.toString();
Expand Down Expand Up @@ -1742,6 +1744,8 @@ else if (value.signum() == -1 && !originalPicture.startsWith("+"))
if (originalPicture.startsWith("\\"))
{
negativeSign = -2;
if (preffix.equals("\"") && originalPicture.startsWith("\\\\"))
negativeSign--;
return originalPicture.charAt(1) + addPictureSuffix(suffix, originalPicture, addPicturePreffix(preffix, originalPicture, alignRight(formatted, originalPictLength + negativeSign)));
}
return addPictureSuffix(suffix, originalPicture, addPicturePreffix(preffix, originalPicture, alignRight(formatted, originalPictLength + negativeSign)));
Expand Down Expand Up @@ -1897,12 +1901,9 @@ private String removePicturePreffix(String suffix, String picture)

private String addPicturePreffix(String suffix, String originalPicture, String value)
{
if (originalPicture.startsWith(suffix))
{
return suffix + value;
}

return value;
if (originalPicture.startsWith(suffix) || (suffix.equals("\"") && originalPicture.startsWith("\\\\")))
return suffix + value;
return value;
}

private String pictureToNumberFormat(String withoutSuffixPicture)
Expand Down
7 changes: 7 additions & 0 deletions java/src/test/java/com/genexus/TestCommonUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,13 @@ public void testFormat() {
result = ui.getLocalUtil().format(bigDecimalValue, picture);
Assert.assertEquals(expectedResult, result);

decimalValue = 87654321;
picture = "\\\" ZZ,ZZZ,ZZ9";
expectedResult = "\\\" 87,654,321";

result = ui.getLocalUtil().format(decimalValue, picture);
Assert.assertEquals(expectedResult, result);

double doubleValue = 123456.12;
doLocalUtilFormatAssert(ui, doubleValue, new BigDecimal(doubleValue), "ZZZZZZZZZZ9.ZZZZZZ", " 123456.120000");
doLocalUtilFormatAssert(ui, doubleValue, new BigDecimal(doubleValue), "99999999999.999999", "00000123456.120000");
Expand Down
Loading