svn commit: r1538239 - /jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java

[an...@apache.org]

Author: andy
Date: Sat Nov  2 17:36:51 2013
New Revision: 1538239

URL: http://svn.apache.org/r1538239
Log:
Tune JSON pretty writer

Modified:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java?rev=1538239&r1=1538238&r2=1538239&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java Sat Nov  2 17:36:51 2013
@@ -42,7 +42,7 @@ public class JsonWriter implements JsonV
     public void finishOutput()  {  out.flush()  ; }
     
     private static String ArrayStart        = "[ " ;
-    private static String ArrayFinish       = " ]" ;
+    private static String ArrayFinish       = "]" ;
     private static String ArraySep          = "," ; 
 
     private static String ObjectStart       = "{ " ;
@@ -59,19 +59,19 @@ public class JsonWriter implements JsonV
         out.print(ObjectStart) ;
         out.incIndent() ;
         boolean first = true ; 
-        boolean multiLine = false ;
         
         // Sort keys.
         Set<String> x = jsonObject.keySet() ;
         SortedSet<String> y = new TreeSet<String>(x) ;
         
+        boolean multiLine = x.size() > 1 ;
+
+        
         for ( String k : y )
         {
-            if ( ! first )
-            {
+            if ( ! first ) {
                 out.print(ObjectSep) ;
                 out.println() ;
-                multiLine = true ; 
             }
             first =  false ;
             JSWriter.outputQuotedString(out, k) ;
@@ -82,10 +82,11 @@ public class JsonWriter implements JsonV
         }
         out.decIndent() ;
         if ( multiLine )
-            out.ensureStartOfLine() ;
+            out.println() ;
         else
             out.print(SPC) ;
         out.print(ObjectFinish) ;
+        out.print(SPC) ;
         
     }
 
@@ -110,6 +111,7 @@ public class JsonWriter implements JsonV
             }
             first = false ;
             elt.visit(this) ;
+            out.print(SPC) ;
         }
         out.decIndent() ;
         if ( multiLine )