log

douglascrockford · douglascrockford · commit b7a1aee4e161 · 2014-04-21T16:13:10.000-07:00
diff --git a/zip/Compressor.java b/zip/Compressor.java
@@ -38,7 +38,7 @@ of this software and associated documentation files (the "Software"), to deal
  * JSONzip is a compression scheme for JSON text.
  *
  * @author JSON.org
- * @version 2013-04-18
+ * @version 2014-04-21
  */
 
 /**
@@ -110,9 +110,6 @@ public void flush() throws JSONException {
      * @throws IOException
      */
     private void one() throws JSONException {
-        if (probe) {
-            log(1);
-        }
         write(1, 1);
     }
 
@@ -351,7 +348,7 @@ private void writeObject(JSONObject jsonobject) throws JSONException {
         Iterator keys = jsonobject.keys();
         while (keys.hasNext()) {
             if (probe) {
-                log("\n");
+                log();
             }
             Object key = keys.next();
             if (key instanceof String) {
@@ -545,9 +542,6 @@ private void writeValue(Object value) throws JSONException {
      * @throws IOException
      */
     private void zero() throws JSONException {
-        if (probe) {
-            log(0);
-        }
         write(0, 1);
     }
 
diff --git a/zip/Decompressor.java b/zip/Decompressor.java
@@ -35,7 +35,7 @@ of this software and associated documentation files (the "Software"), to deal
  * JSONzip is a compression scheme for JSON text.
  *
  * @author JSON.org
- * @version 2013-04-18
+ * @version 2014-04-21
  */
 
 public class Decompressor extends JSONzip {
@@ -221,7 +221,7 @@ private JSONObject readObject() throws JSONException {
         JSONObject jsonobject = new JSONObject();
         while (true) {
             if (probe) {
-                log("\n");
+                log();
             }
             String name = readName();
             jsonobject.put(name, !bit() ? readString() : readValue());
diff --git a/zip/JSONzip.java b/zip/JSONzip.java
@@ -1,6 +1,5 @@
 package org.json.zip;
 
-
 /*
  Copyright (c) 2013 JSON.org
 
@@ -27,7 +26,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 /**
  * JSONzip is a binary-encoded JSON dialect. It is designed to compress the
- * messages in a session. It is adaptive, so with each message seen, it should
+ * messages in a session in bandwidth constrained applications, such as mobile.
+ *
+ * JSONzip is adaptive, so with each message seen, it should
  * improve its compression. It minimizes JSON's overhead, reducing punctuation
  * to a small number of bits. It uses Huffman encoding to reduce the average
  * size of characters. It uses caches (or Keeps) to keep recently seen strings
@@ -43,7 +44,7 @@ of this software and associated documentation files (the "Software"), to deal
  * ADEQUATELY FOR PRODUCTION USE.
  *
  * @author JSON.org
- * @version 2013-04-18
+ * @version 2014-04-21
  */
 public abstract class JSONzip implements None, PostMortem {
     /**
@@ -230,12 +231,17 @@ static void log(int integer) {
 
     /**
      * Write two integers, separated by ':' to the console.
+     * The second integer is suppressed if it is 1.
      *
      * @param integer
      * @param width
      */
     static void log(int integer, int width) {
-        log(integer + ":" + width + " ");
+        if (width == 1) {
+            log(integer);
+        } else {
+            log(integer + ":" + width + " ");
+        }
     }
 
     /**
