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

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

Revision: 158
          http://practicalxml.svn.sourceforge.net/practicalxml/?rev=158&view=rev
Author:   kdgregory
Date:     2009-09-24 17:05:17 +0000 (Thu, 24 Sep 2009)

Log Message:
-----------
xml -> json: add option to wrap output in parens

Modified Paths:
--------------
    branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonConverter.java
    branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonOptions.java
    branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/json/TestXml2JsonConverter.java

Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonConverter.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonConverter.java	2009-09-24 16:58:59 UTC (rev 157)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonConverter.java	2009-09-24 17:05:17 UTC (rev 158)
@@ -63,7 +63,15 @@
      */
     public StringBuilder convert(Element elem, StringBuilder buf)
     {
-        return append(buf, elem);
+        if (_options.contains(Xml2JsonOptions.WRAP_WITH_PARENS))
+        {
+            buf.append("(");
+            append(buf, elem);
+            buf.append(")");
+        }
+        else
+            append(buf, elem);
+        return buf;
     }
 
 

Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonOptions.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonOptions.java	2009-09-24 16:58:59 UTC (rev 157)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonOptions.java	2009-09-24 17:05:17 UTC (rev 158)
@@ -26,5 +26,13 @@
      *  if you expect to use the result anywhere but in a browser. It is
      *  not required by <code>eval()</code>, nor for explicit scripting.
      */
-    QUOTE_FIELD_NAMES
+    QUOTE_FIELD_NAMES,
+
+    /**
+     *  If enabled, the entire string is wrapped by parentheses. This is
+     *  needed for strings that will be passed to <code>eval()</code>.
+     *  Note that the resulting string is not acceptable to {@link
+     *  Json2XmlConverter}.
+     */
+    WRAP_WITH_PARENS
 }

Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/json/TestXml2JsonConverter.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/json/TestXml2JsonConverter.java	2009-09-24 16:58:59 UTC (rev 157)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/json/TestXml2JsonConverter.java	2009-09-24 17:05:17 UTC (rev 158)
@@ -144,6 +144,16 @@
     }
 
 
+    public void testWrapWithParens() throws Exception
+    {
+        convertAndAssert(
+                "({foo: \"bar\"})",
+                element("data",
+                    element("foo", text("bar"))),
+                Xml2JsonOptions.WRAP_WITH_PARENS);
+    }
+
+
     public void testStringEscaping() throws Exception
     {
         convertAndAssert(


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