HjsonWriter will always emit root braces

Author: laktak

src/main/org/hjson/HjsonOptions.java

@@ -26,27 +26,29 @@
  */
 public class HjsonOptions {
 
-  private boolean emitRootBraces;
   private IHjsonDsfProvider[] dsf;
 
   public HjsonOptions() {
-    emitRootBraces = true; // default
     dsf=new IHjsonDsfProvider[0];
   }
 
   /**
    * Detects whether root braces should be emitted.
    *
+   * @deprecated will always return true.
    * @return <code>true</code> if this feature is enabled.
    */
-  public boolean getEmitRootBraces() { return emitRootBraces; }
+  @Deprecated
+  public boolean getEmitRootBraces() { return true; }
 
   /**
    * Sets whether root braces should be emitted.
    *
+   * @deprecated root braces are always emitted.
    * @param value value
    */
-  public void setEmitRootBraces(boolean value) { emitRootBraces=value; }
+  @Deprecated
+  public void setEmitRootBraces(boolean value) { }
 
   /**
    * Returns the DSF providers.

src/main/org/hjson/HjsonWriter.java

@@ -28,17 +28,14 @@
 
 class HjsonWriter {
 
-  private boolean emitRootBraces;
   private IHjsonDsfProvider[] dsfProviders;
 
   static Pattern needsEscapeName=Pattern.compile("[,\\{\\[\\}\\]\\s:#\"]|//|/\\*|'''");
 
   public HjsonWriter(HjsonOptions options) {
     if (options!=null) {
-      emitRootBraces=options.getEmitRootBraces();
       dsfProviders=options.getDsfProviders();
     } else {
-      emitRootBraces=true;
       dsfProviders=new IHjsonDsfProvider[0];
     }
   }
@@ -48,7 +45,7 @@ void nl(Writer tw, int level) throws IOException {
     for (int i=0; i<level; i++) tw.write("  ");
   }
 
-  public void save(JsonValue value, Writer tw, int level, String separator, boolean noIndent, boolean isRootObject) throws IOException {
+  public void save(JsonValue value, Writer tw, int level, String separator, boolean noIndent) throws IOException {
     if (value==null) {
       tw.write(separator);
       tw.write("null");
@@ -67,23 +64,18 @@ public void save(JsonValue value, Writer tw, int level, String separator, boolea
     switch (value.getType()) {
       case OBJECT:
         JsonObject obj=value.asObject();
-        boolean showBraces=!isRootObject || emitRootBraces;
         if (!noIndent) { if (obj.size()>0) nl(tw, level); else tw.write(separator); }
-        if (showBraces) tw.write('{');
-        else level--; // reduce level for root
+        tw.write('{');
 
-        boolean skipFirst=!showBraces;
         for (JsonObject.Member pair : obj) {
-          if (!skipFirst) nl(tw, level+1); else skipFirst=false;
+          nl(tw, level+1);
           tw.write(escapeName(pair.getName()));
           tw.write(":");
-          save(pair.getValue(), tw, level+1, " ", false, false);
+          save(pair.getValue(), tw, level+1, " ", false);
         }
 
-        if (showBraces) {
-          if (obj.size()>0) nl(tw, level);
-          tw.write('}');
-        }
+        if (obj.size()>0) nl(tw, level);
+        tw.write('}');
         break;
       case ARRAY:
         JsonArray arr=value.asArray();
@@ -92,7 +84,7 @@ public void save(JsonValue value, Writer tw, int level, String separator, boolea
         tw.write('[');
         for (int i=0; i<n; i++) {
           nl(tw, level+1);
-          save(arr.get(i), tw, level+1, "", true, false);
+          save(arr.get(i), tw, level+1, "", true);
         }
         if (n>0) nl(tw, level);
         tw.write(']');

src/main/org/hjson/JsonValue.java

@@ -501,7 +501,7 @@ public void writeTo(Writer writer, Stringify format) throws IOException {
     switch (format) {
       case PLAIN: new JsonWriter(false).save(this, buffer, 0); break;
       case FORMATTED: new JsonWriter(true).save(this, buffer, 0); break;
-      case HJSON: new HjsonWriter(null).save(this, buffer, 0, "", true, true); break;
+      case HJSON: new HjsonWriter(null).save(this, buffer, 0, "", true); break;
     }
     buffer.flush();
   }
@@ -519,7 +519,7 @@ public void writeTo(Writer writer, Stringify format) throws IOException {
   public void writeTo(Writer writer, HjsonOptions options) throws IOException {
     if (options==null) throw new NullPointerException("options is null");
     WritingBuffer buffer=new WritingBuffer(writer, 128);
-    new HjsonWriter(options).save(this, buffer, 0, "", true, true);
+    new HjsonWriter(options).save(this, buffer, 0, "", true);
     buffer.flush();
   }