[java-libglom] Rename FieldFormatting to Formatting.

[Murray Cumming <murrayc src gnome org>]

commit c833e6b941a126e025ebcf952442a0bb2252248c
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Mar 29 11:00:50 2012 +0200

    Rename FieldFormatting to Formatting.
    
    * src/glom.i:
    * src/test/java/org/glom/libglom/tests/DocumentTest.java
    (DocumentTest): Because this changed in libglom.

 ChangeLog                                          |    8 ++++++++
 Makefile.am                                        |    2 +-
 configure.ac                                       |    2 +-
 src/glom.i                                         |   10 +++++-----
 .../java/org/glom/libglom/tests/DocumentTest.java  |    2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 079c3ff..eb4ec21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-29  Murray Cumming  <murrayc murrayc com>
+
+	Rename FieldFormatting to Formatting.
+
+	* src/glom.i:
+	* src/test/java/org/glom/libglom/tests/DocumentTest.java
+	(DocumentTest): Because this changed in libglom.
+
 1.21.7:
 
 2012-03-12  Murray Cumming  <murrayc murrayc com>
diff --git a/Makefile.am b/Makefile.am
index 59fd41f..dfe7cea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ generated_java_sources = src/main/java/org/glom/libglom/BakeryDocument.java \
                          src/main/java/org/glom/libglom/CustomTitle.java \
                          src/main/java/org/glom/libglom/DoubleVector.java \
                          src/main/java/org/glom/libglom/Document.java \
-                         src/main/java/org/glom/libglom/FieldFormatting.java \
+                         src/main/java/org/glom/libglom/Formatting.java \
                          src/main/java/org/glom/libglom/Field.java \
                          src/main/java/org/glom/libglom/FieldVector.java \
                          src/main/java/org/glom/libglom/FoundSet.java \
diff --git a/configure.ac b/configure.ac
index 3b42b40..846804b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ PKG_PROG_PKG_CONFIG
 # gmodule-export-2.0 adds -Wl,--export-dynamic to the linker flags
 # so that libglade can get at the custom widget creation functions.
 PKG_CHECK_MODULES([LIBGLOM],
-                  [glom-1.22 >= 1.21.7])
+                  [glom-1.22 >= 1.21.8])
 
 LIBGLOM_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir glom-1.22`
 AC_SUBST([LIBGLOM_INCLUDE_DIR])
diff --git a/src/glom.i b/src/glom.i
index e7944e5..a79c0eb 100644
--- a/src/glom.i
+++ b/src/glom.i
@@ -97,7 +97,7 @@ using namespace Glom;
 %include "glib_ustring.i"
 // This enables Glib::ustring reference parameters using the StringBuffer class
 // to transfer the string. This feature needs to be turned on for specific
-// variables with an %apply command. See Glom::FieldFormatting below for an
+// variables with an %apply command. See Glom::Formatting below for an
 // example. We can't use a generic %apply command like:
 //   %apply Glib::ustring& SBUF { Glib::ustring& };
 // because it will pick up 'const Glib::ustring&' as well 'Glib::ustring&'
@@ -159,18 +159,18 @@ using namespace Glom;
 %rename(_alt_foreground_color_for_negatives) Glom::NumericFormat::m_alt_foreground_color_for_negatives;
 %include <libglom/data_structure/numeric_format.h>
 
-// Wrap ChoiceValue, used by FieldFormatting:
+// Wrap ChoiceValue, used by Formatting:
 %include <libglom/data_structure/choicevalue.h>
 
 /*
  * Ignore method overloads that differ only by constness of the parameters,
  * because Java doesn't have const, so it would just generate a duplicate method.
  */
-%ignore Glom::FieldFormatting::get_choices_related(sharedptr<const Relationship>& relationship, sharedptr<const LayoutItem_Field>& field, sharedptr<const LayoutGroup>& extra_layout, type_list_sort_fields& sort_fields, bool& show_all) const;
+%ignore Glom::Formatting::get_choices_related(sharedptr<const Relationship>& relationship, sharedptr<const LayoutItem_Field>& field, sharedptr<const LayoutGroup>& extra_layout, type_list_sort_fields& sort_fields, bool& show_all) const;
 
 // the %rename makes the getter and setter look better
-%rename(_numeric_format) Glom::FieldFormatting::m_numeric_format;
-%include <libglom/data_structure/layout/fieldformatting.h>
+%rename(_numeric_format) Glom::Formatting::m_numeric_format;
+%include <libglom/data_structure/layout/formatting.h>
 
 
 /*
diff --git a/src/test/java/org/glom/libglom/tests/DocumentTest.java b/src/test/java/org/glom/libglom/tests/DocumentTest.java
index 0a79349..a3c6809 100644
--- a/src/test/java/org/glom/libglom/tests/DocumentTest.java
+++ b/src/test/java/org/glom/libglom/tests/DocumentTest.java
@@ -167,7 +167,7 @@ public class DocumentTest {
 
 	/*
 	 * This tests if getting values from a NumericFormat object is working. This test was failing with a JVM crash when
-	 * using the glom_sharedptr macro with Glom::UsesRelationship and Glom::FieldFormatting.
+	 * using the glom_sharedptr macro with Glom::UsesRelationship and Glom::Formatting.
 	 */
 	@Test
 	public void testGetNumericFormat() {