From a2b87953495d3137c0b608053f9c67db3f695619 Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Wed, 30 Nov 2011 14:38:56 +0100 Subject: [PATCH] Update for java-libglom API change. The getters and setters on FieldFormatting and NumericFormat were changed to remove the 'M'. * src/main/java/org/glom/web/server/ConfiguredDocument.java: --- ChangeLog | 9 +++++++++ src/main/java/org/glom/web/server/ConfiguredDocument.java | 12 ++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2489d7f..0ecf0e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-11-30 Ben Konrath + + Update for java-libglom API change. + + The getters and setters on FieldFormatting and NumericFormat were + changed to remove the 'M'. + + * src/main/java/org/glom/web/server/ConfiguredDocument.java: + 2011-11-29 Ben Konrath Only allow RelatedListTables in Portals. diff --git a/src/main/java/org/glom/web/server/ConfiguredDocument.java b/src/main/java/org/glom/web/server/ConfiguredDocument.java index 4015ba7..7487a7f 100644 --- a/src/main/java/org/glom/web/server/ConfiguredDocument.java +++ b/src/main/java/org/glom/web/server/ConfiguredDocument.java @@ -554,11 +554,11 @@ final class ConfiguredDocument { private GlomNumericFormat convertNumbericFormat(NumericFormat libglomNumericFormat) { GlomNumericFormat gnf = new GlomNumericFormat(); - gnf.setUseAltForegroundColourForNegatives(libglomNumericFormat.getM_alt_foreground_color_for_negatives()); - gnf.setCurrencyCode(libglomNumericFormat.getM_currency_symbol()); - gnf.setDecimalPlaces(Utils.safeLongToInt(libglomNumericFormat.getM_decimal_places())); - gnf.setDecimalPlacesRestricted(libglomNumericFormat.getM_decimal_places_restricted()); - gnf.setUseThousandsSeparator(libglomNumericFormat.getM_use_thousands_separator()); + gnf.setUseAltForegroundColourForNegatives(libglomNumericFormat.get_alt_foreground_color_for_negatives()); + gnf.setCurrencyCode(libglomNumericFormat.get_currency_symbol()); + gnf.setDecimalPlaces(Utils.safeLongToInt(libglomNumericFormat.get_decimal_places())); + gnf.setDecimalPlacesRestricted(libglomNumericFormat.get_decimal_places_restricted()); + gnf.setUseThousandsSeparator(libglomNumericFormat.get_use_thousands_separator()); return gnf; } @@ -612,7 +612,7 @@ final class ConfiguredDocument { // create a GlomNumericFormat DTO for numeric values if (libglomLayoutItemField.get_glom_type() == org.glom.libglom.Field.glom_field_type.TYPE_NUMERIC) { - formatting.setGlomNumericFormat(convertNumbericFormat(glomFormatting.getM_numeric_format())); + formatting.setGlomNumericFormat(convertNumbericFormat(glomFormatting.get_numeric_format())); } layoutItemField.setFormatting(formatting); } -- 2.1.4