Return-Path: 
 <commits-return-7060-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: (qmail 45575 invoked from network); 21 Jun 2009 17:47:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 21 Jun 2009 17:47:17 -0000
Received: (qmail 85931 invoked by uid 500); 21 Jun 2009 17:47:28 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 85825 invoked by uid 500); 21 Jun 2009 17:47:27 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 85816 invoked by uid 99); 21 Jun 2009 17:47:27 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Jun 2009 17:47:27 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Jun 2009 17:47:17 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6BAAD23888D3; Sun, 21 Jun 2009 17:46:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r787057 - in /commons/proper/configuration/trunk:
 src/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java
 src/test/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java
 xdocs/changes.xml
Date: Sun, 21 Jun 2009 17:46:57 -0000
To: commits@commons.apache.org
From: ebourg@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090621174657.6BAAD23888D3@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ebourg
Date: Sun Jun 21 17:46:56 2009
New Revision: 787057

URL: http://svn.apache.org/viewvc?rev=787057&view=rev
Log:
Removed the trimming of empty dictionaries for consistency with XMLPropertyListConfiguration

Modified:
    commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java
    commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java
    commons/proper/configuration/trunk/xdocs/changes.xml

Modified: commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java?rev=787057&r1=787056&r2=787057&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java Sun Jun 21 17:46:56 2009
@@ -45,7 +45,7 @@
  * References:
  * <ul>
  *   <li><a
- * href="http://developer.apple.com/documentation/Cocoa/Conceptual/PropertyLists/Articles/OldStylePListsConcept.html">
+ * href="http://developer.apple.com/documentation/Cocoa/Conceptual/PropertyLists/OldStylePlists/OldStylePLists.html">
  * Apple Documentation - Old-Style ASCII Property Lists</a></li>
  *   <li><a
  * href="http://www.gnustep.org/resources/documentation/Developer/Base/Reference/NSPropertyList.html">
@@ -252,18 +252,7 @@
             out.print(padding + quoteString(node.getName()) + " = ");
         }
 
-        // get all non trivial nodes
         List children = new ArrayList(node.getChildren());
-        Iterator it = children.iterator();
-        while (it.hasNext())
-        {
-            Node child = (Node) it.next();
-            if (child.getValue() == null && (child.getChildren() == null || child.getChildren().isEmpty()))
-            {
-                it.remove();
-            }
-        }
-
         if (!children.isEmpty())
         {
             // skip a line, except for the root dictionary
@@ -275,7 +264,7 @@
             out.println(padding + "{");
 
             // display the children
-            it = children.iterator();
+            Iterator it = children.iterator();
             while (it.hasNext())
             {
                 Node child = (Node) it.next();
@@ -304,6 +293,17 @@
                 out.println();
             }
         }
+        else if (node.getValue() == null)
+        {
+            out.println();
+            out.print(padding + "{ };");
+            
+            // line feed if the dictionary is not in an array
+            if (node.getParentNode() != null)
+            {
+                out.println();
+            }
+        }
         else
         {
             // display the leaf value

Modified: commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java?rev=787057&r1=787056&r2=787057&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java Sun Jun 21 17:46:56 2009
@@ -252,6 +252,29 @@
         }
     }
 
+    public void testSaveEmptyDictionary() throws Exception
+    {
+        File savedFile = new File("target/testsave.plist");
+
+        // remove the file previously saved if necessary
+        if (savedFile.exists())
+        {
+            assertTrue(savedFile.delete());
+        }
+        
+        // save the configuration
+        String filename = savedFile.getAbsolutePath();
+        config.save(filename);
+
+        assertTrue("The saved file doesn't exist", savedFile.exists());
+
+        // read the configuration and compare the properties
+        PropertyListConfiguration checkConfig = new PropertyListConfiguration(new File(filename));
+
+        assertFalse(config.getRootNode().getChildren("empty-dictionary").isEmpty());
+        assertFalse(checkConfig.getRootNode().getChildren("empty-dictionary").isEmpty());
+    }
+
     public void testQuoteString()
     {
         assertEquals("null string", null, config.quoteString(null));

Modified: commons/proper/configuration/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/xdocs/changes.xml?rev=787057&r1=787056&r2=787057&view=diff
==============================================================================
--- commons/proper/configuration/trunk/xdocs/changes.xml (original)
+++ commons/proper/configuration/trunk/xdocs/changes.xml Sun Jun 21 17:46:56 2009
@@ -24,8 +24,7 @@
   <body>
     <release version="1.7" date="in SVN" description="">
       <action dev="ebourg" type="fix" issue="CONFIGURATION-362">
-        Empty dictionary elements in an XML PropertyList are now preserved and no longer
-        turned into a string when the configuration is saved.
+        Empty dictionaries in a PropertyList configuration are now preserved when the configuration is saved.
       </action>
       <action dev="oheger" type="fix" issue="CONFIGURATION-385">
         DatabaseConfiguration now generates correct events for the clear() and