[Practicalxml-commits] SF.net SVN: practicalxml:[163] branches/dev-1.1/src

[Auto-Generated S. C. M. <pra...@li...>]

Revision: 163
          http://practicalxml.svn.sourceforge.net/practicalxml/?rev=163&view=rev
Author:   kdgregory
Date:     2009-10-10 18:19:28 +0000 (Sat, 10 Oct 2009)

Log Message:
-----------
Xml2BeanOptions: rename CONVERT_BLANK_AS_NULL to EMPTY_IS_NULL

Modified Paths:
--------------
    branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanConverter.java
    branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanOptions.java
    branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestXml2BeanConverter.java

Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanConverter.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanConverter.java	2009-10-10 18:15:38 UTC (rev 162)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanConverter.java	2009-10-10 18:19:28 UTC (rev 163)
@@ -225,7 +225,7 @@
     {
         String text = DomUtil.getText(elem);
         if (StringUtils.isBlank(text)
-                && _options.contains(Xml2BeanOptions.CONVERT_BLANK_AS_NULL))
+                && _options.contains(Xml2BeanOptions.EMPTY_IS_NULL))
             text = null;
         return text;
     }

Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanOptions.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanOptions.java	2009-10-10 18:15:38 UTC (rev 162)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanOptions.java	2009-10-10 18:19:28 UTC (rev 163)
@@ -27,7 +27,7 @@
      *  as if they were empty elements -- in other words, <code>null</code>.
      *  Note that this flag will interact with <code>REQUIRE_XSI_NIL</code>.
      */
-    CONVERT_BLANK_AS_NULL,
+    EMPTY_IS_NULL,
 
     /**
      *  Expect data (in particular, dates) to be formatted per XML Schema spec.

Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestXml2BeanConverter.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestXml2BeanConverter.java	2009-10-10 18:15:38 UTC (rev 162)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestXml2BeanConverter.java	2009-10-10 18:19:28 UTC (rev 163)
@@ -179,7 +179,7 @@
 
     public void testConvertEmptyStringToNull() throws Exception
     {
-        Xml2BeanConverter driver = new Xml2BeanConverter(Xml2BeanOptions.CONVERT_BLANK_AS_NULL);
+        Xml2BeanConverter driver = new Xml2BeanConverter(Xml2BeanOptions.EMPTY_IS_NULL);
 
         Element src = createTestData(text("   \n\t   "));
         assertNull(driver.convert(src, String.class));
@@ -189,7 +189,7 @@
     public void testConvertEmptyStringToNullAndRequireXsiNull() throws Exception
     {
         Xml2BeanConverter driver = new Xml2BeanConverter(
-                                        Xml2BeanOptions.CONVERT_BLANK_AS_NULL,
+                                        Xml2BeanOptions.EMPTY_IS_NULL,
                                         Xml2BeanOptions.REQUIRE_XSI_NIL);
 
         Element valid = createTestData(text("  \t  "), xsiNil(true));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.