[Practicalxml-commits] SF.net SVN: practicalxml:[178] branches/dev-1.1/src
Brought to you by:
kdgregory
Menu
▾
▴
[Practicalxml-commits] SF.net SVN: practicalxml:[178] branches/dev-1.1/src
|
From: Auto-Generated S. C. M. <pra...@li...> - 2009-11-23 13:55:14
|
Revision: 178
http://practicalxml.svn.sourceforge.net/practicalxml/?rev=178&view=rev
Author: kdgregory
Date: 2009-11-23 13:55:04 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
Bean2XmlOptions: rename INTROSPECT_MAPS to MAP_KEYS_AS_ELEMENT_NAME
Modified Paths:
--------------
branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlAppenders.java
branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlConverter.java
branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlOptions.java
branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlAppenders.java
branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlConverter.java
branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java
Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlAppenders.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlAppenders.java 2009-10-28 18:29:33 UTC (rev 177)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlAppenders.java 2009-11-23 13:55:04 UTC (rev 178)
@@ -200,7 +200,7 @@
public Element appendValue(String name, Class<?> klass, String value)
{
Element child = null;
- if (isOptionSet(Bean2XmlOptions.INTROSPECT_MAPS))
+ if (isOptionSet(Bean2XmlOptions.MAP_KEYS_AS_ELEMENT_NAME))
{
child = super.appendValue(name, klass, value);
}
Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlConverter.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlConverter.java 2009-10-28 18:29:33 UTC (rev 177)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlConverter.java 2009-11-23 13:55:04 UTC (rev 178)
@@ -134,7 +134,7 @@
// I think it's more clear to express the rules this way, rather than
// as an if-condition with nested sub-conditions
boolean addCnvNS = _options.contains(Bean2XmlOptions.USE_INDEX_ATTR);
- addCnvNS |= !_options.contains(Bean2XmlOptions.INTROSPECT_MAPS);
+ addCnvNS |= !_options.contains(Bean2XmlOptions.MAP_KEYS_AS_ELEMENT_NAME);
addCnvNS &= _options.contains(Bean2XmlOptions.USE_TYPE_ATTR);
if (addCnvNS)
{
Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlOptions.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlOptions.java 2009-10-28 18:29:33 UTC (rev 177)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlOptions.java 2009-11-23 13:55:04 UTC (rev 178)
@@ -35,7 +35,7 @@
* is the map key (rather than "data"), and the "key" attribute is omitted.
* If any key is not a valid XML identifier, the converter will throw.
*/
- INTROSPECT_MAPS,
+ MAP_KEYS_AS_ELEMENT_NAME,
/**
* If the value is <code>null</code>, add an element containing a single
Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlAppenders.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlAppenders.java 2009-10-28 18:29:33 UTC (rev 177)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlAppenders.java 2009-11-23 13:55:04 UTC (rev 178)
@@ -275,7 +275,7 @@
{
Element root = DomUtil.newDocument("root");
- Appender appender = new MapAppender(root, useOptions(Bean2XmlOptions.INTROSPECT_MAPS));
+ Appender appender = new MapAppender(root, useOptions(Bean2XmlOptions.MAP_KEYS_AS_ELEMENT_NAME));
Element child0 = appender.appendValue("foo", String.class, "baz");
Element child1 = appender.appendValue("argle", String.class, "wargle");
Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlConverter.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlConverter.java 2009-10-28 18:29:33 UTC (rev 177)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlConverter.java 2009-11-23 13:55:04 UTC (rev 178)
@@ -525,7 +525,7 @@
public void testConvertMapIntrospectWithXsiType() throws Exception
{
- Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.INTROSPECT_MAPS, Bean2XmlOptions.USE_TYPE_ATTR);
+ Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.MAP_KEYS_AS_ELEMENT_NAME, Bean2XmlOptions.USE_TYPE_ATTR);
// TreeMap means that the data will be re-ordered
Map<String,Integer> data = new TreeMap<String,Integer>();
@@ -550,7 +550,7 @@
public void testFailMapIntrospectWithInvalidKey() throws Exception
{
- Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.INTROSPECT_MAPS);
+ Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.MAP_KEYS_AS_ELEMENT_NAME);
Map<String,Integer> data = new TreeMap<String,Integer>();
data.put("%key1%", new Integer(123));
Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java 2009-10-28 18:29:33 UTC (rev 177)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java 2009-11-23 13:55:04 UTC (rev 178)
@@ -274,7 +274,7 @@
data.put("bar", "bargle");
data.put("baz", "bazgle");
- Document dom = BeanConverter.convertToXml(data, "test", Bean2XmlOptions.INTROSPECT_MAPS);
+ Document dom = BeanConverter.convertToXml(data, "test", Bean2XmlOptions.MAP_KEYS_AS_ELEMENT_NAME);
// System.out.println(OutputUtil.compactString(dom));
DomAsserts.assertCount(0, dom, "/test/data");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
