update Java version

Author: peteroupc

api/com.upokecenter.cbor.CBORObject.md

@@ -351,7 +351,8 @@
       java.lang.Object valueOb)`<br>
  Inserts an object at the specified position in this CBOR array.
 * `boolean isFalse()`<br>
- Gets a value indicating whether this value is a CBOR false value.
+ Gets a value indicating whether this value is a CBOR false value, whether
+ tagged or not.
 * `boolean isFinite()`<br>
  Gets a value indicating whether this CBOR object represents a finite number.
 * `boolean IsInfinity()`<br>
@@ -378,7 +379,8 @@
 * `boolean isTagged()`<br>
  Gets a value indicating whether this data item has at least one tag.
 * `boolean isTrue()`<br>
- Gets a value indicating whether this value is a CBOR true value.
+ Gets a value indicating whether this value is a CBOR true value, whether
+ tagged or not.
 * `boolean isUndefined()`<br>
  Gets a value indicating whether this value is a CBOR undefined value.
 * `boolean isZero()`<br>
@@ -637,11 +639,12 @@ Gets the last defined tag for this CBOR data item, or -1 if the item is
 
 ### isFalse
     public final boolean isFalse()
-Gets a value indicating whether this value is a CBOR false value.
+Gets a value indicating whether this value is a CBOR false value, whether
+ tagged or not.
 
 **Returns:**
 
-* <code>true</code> If this value is a CBOR false value; otherwise, <code>
+* <code>true</code> if this value is a CBOR false value; otherwise, <code>
  false</code>.
 
 ### isFinite
@@ -650,7 +653,7 @@ Gets a value indicating whether this CBOR object represents a finite number.
 
 **Returns:**
 
-* <code>true</code> If this CBOR object represents a finite number;
+* <code>true</code> if this CBOR object represents a finite number;
  otherwise, <code>false</code>.
 
 ### isIntegral
@@ -661,7 +664,7 @@ Gets a value indicating whether this object represents an integer number,
 
 **Returns:**
 
-* <code>true</code> If this object represents an integer number, that is, a
+* <code>true</code> if this object represents an integer number, that is, a
  number without a fractional part; otherwise, <code>false</code>.
 
 ### isNull
@@ -670,7 +673,7 @@ Gets a value indicating whether this value is a CBOR null value.
 
 **Returns:**
 
-* <code>true</code> If this value is a CBOR null value; otherwise, <code>
+* <code>true</code> if this value is a CBOR null value; otherwise, <code>
  false</code>.
 
 ### isTagged
@@ -679,16 +682,17 @@ Gets a value indicating whether this data item has at least one tag.
 
 **Returns:**
 
-* <code>true</code> If this data item has at least one tag; otherwise,
+* <code>true</code> if this data item has at least one tag; otherwise,
  <code>false</code>.
 
 ### isTrue
     public final boolean isTrue()
-Gets a value indicating whether this value is a CBOR true value.
+Gets a value indicating whether this value is a CBOR true value, whether
+ tagged or not.
 
 **Returns:**
 
-* <code>true</code> If this value is a CBOR true value; otherwise, <code>
+* <code>true</code> if this value is a CBOR true value; otherwise, <code>
  false</code>.
 
 ### isUndefined
@@ -697,7 +701,7 @@ Gets a value indicating whether this value is a CBOR undefined value.
 
 **Returns:**
 
-* <code>true</code> If this value is a CBOR undefined value; otherwise,
+* <code>true</code> if this value is a CBOR undefined value; otherwise,
  <code>false</code>.
 
 ### isZero
@@ -706,7 +710,7 @@ Gets a value indicating whether this object's value equals 0.
 
 **Returns:**
 
-* <code>true</code> If this object's value equals 0; otherwise, <code>
+* <code>true</code> if this object's value equals 0; otherwise, <code>
  false</code>.
 
 ### getKeys
@@ -727,7 +731,7 @@ Gets a value indicating whether this object is a negative number.
 
 **Returns:**
 
-* <code>true</code> If this object is a negative number; otherwise, <code>
+* <code>true</code> if this object is a negative number; otherwise, <code>
  false</code>.
 
 ### getMostOuterTag
@@ -1176,15 +1180,15 @@ Converts this CBOR object to an object of an arbitrary type. See the
  <code>typeof</code> operator. The following example, written in Java, is a
  way to specify that the return value will be an ArrayList of string
  objects.</p> <pre>Type arrayListString = new ParameterizedType() {
- public Type[] getActualTypeArguments() { // Contains one type
- parameter, string return new Type[] { string.class }; } public Type
- getRawType() { /* Raw type is ArrayList */ return ArrayList.class; }
- public Type getOwnerType() { return null; } };
+ public Type[] getActualTypeArguments() { /* Contains one type
+ parameter, string */ return new Type[] { string.class }; } public
+ Type getRawType() { /* Raw type is ArrayList */ return
+ ArrayList.class; } public Type getOwnerType() { return null; } };
  ArrayList&lt;string&gt; array = (ArrayList&lt;string&gt;)
  cborArray.ToObject(arrayListString);</pre> <p>By comparison, the C#
  version is much shorter.</p> <pre>List&lt;string&gt; array =
  (List&lt;string&gt;)cborArray.ToObject(
- typeof(List&lt;string&gt;));</pre> .
+ typeof(List&lt;string&gt;));</pre>.
 
 **Parameters:**
 
@@ -1372,39 +1376,41 @@ Converts this CBOR object to an object of an arbitrary type. See the
  the given type for eligible setters as follows:</li> <li>(*) In the
 .NET version, eligible setters are the public, nonstatic setters of
  properties with a public, nonstatic getter. Eligible setters also
- include public, nonstatic, non- <code>readonly</code> fields. If a class
-  has two properties and/or fields of the form "X" and "IsX", where
-  "X" is any name, or has multiple properties and/or fields with the
- same name, those properties and fields are ignored.</li> <li>(*) In
- the Java version, eligible setters are public, nonstatic methods
-  starting with "set" followed by a character other than a basic digit
-  or lower-case letter, that is, other than "a" to "z" or "0" to "9",
- that take one parameter. The class containing an eligible setter
- must have a public, nonstatic method with the same name, but
-  starting with "get" or "is" rather than "set", that takes no
- parameters and does not return void. (For example, if a class has
-  "public setValue(string)" and "public getValue()", "setValue" is an
-  eligible setter. However, "setValue()" and "setValue(string, int)"
- are not eligible setters.) In addition, public, nonstatic, nonfinal
- fields are also eligible setters. If a class has two or more
- otherwise eligible setters (methods and/or fields) with the same
- name, but different parameter type, they are not eligible
- setters.</li> <li>Then, the method creates an object of the given
- type and invokes each eligible setter with the corresponding value
- in the CBOR map, if any. Key names in the map are matched to
- eligible setters according to the rules described in the <code>PODOptions</code> documentation. Note that for
- security reasons, certain types are not supported even if they
+ include public, nonstatic, non- <code>static final</code> , non- <code>readonly</code>
+  fields. If a class has two properties and/or fields of the form "X"
+  and "IsX", where "X" is any name, or has multiple properties and/or
+ fields with the same name, those properties and fields are
+ ignored.</li> <li>(*) In the Java version, eligible setters are
+  public, nonstatic methods starting with "set" followed by a
+ character other than a basic digit or lower-case letter, that is,
+  other than "a" to "z" or "0" to "9", that take one parameter. The
+ class containing an eligible setter must have a public, nonstatic
+  method with the same name, but starting with "get" or "is" rather
+  than "set", that takes no parameters and does not return void. (For
+  example, if a class has "public setValue(string)" and "public
+  getValue()", "setValue" is an eligible setter. However, "setValue()"
+  and "setValue(string, int)" are not eligible setters.) In addition,
+ public, nonstatic, nonfinal fields are also eligible setters. If a
+ class has two or more otherwise eligible setters (methods and/or
+ fields) with the same name, but different parameter type, they are
+ not eligible setters.</li> <li>Then, the method creates an object of
+ the given type and invokes each eligible setter with the
+ corresponding value in the CBOR map, if any. Key names in the map
+ are matched to eligible setters according to the rules described in
+ the <code>PODOptions</code> documentation. Note that
+ for security reasons, certain types are not supported even if they
  contain eligible setters. For the Java version, the object creation
  may fail in the case of a nested nonstatic class.</li> </ul><p>
  </p><p>Java offers no easy way to express a generic type, at least none
  as easy as C#'s <code>typeof</code> operator. The following example,
  written in Java, is a way to specify that the return value will be
  an ArrayList of string objects.</p> <pre>Type arrayListString = new
- ParameterizedType() { public Type[] getActualTypeArguments() { //
- Contains one type parameter, string return new Type[] { string.class
- }; } public Type getRawType() { /* Raw type is ArrayList */ return
- ArrayList.class; } public Type getOwnerType() { return null; } };
- ArrayList&lt;string&gt; array = (ArrayList&lt;string&gt;)
+ ParameterizedType() { public Type[] getActualTypeArguments() { /*
+ Contains one type parameter, string */ return new Type[] {
+ string.class }; } public Type getRawType() { /* Raw type is
+ ArrayList */ return ArrayList.class; } public Type getOwnerType() {
+ return null; } }; ArrayList&lt;string&gt; array =
+ (ArrayList&lt;string&gt;)
  cborArray.ToObject(arrayListString);</pre> <p>By comparison, the C#
  version is much shorter.</p> <pre>List&lt;string&gt; array =
  (List&lt;string&gt;)cborArray.ToObject(
@@ -1833,20 +1839,20 @@ Generates a CBORObject from an arbitrary object. See the overload of this
  In the .NET version, eligible getters are the public, nonstatic
  getters of read/write properties (and also those of read-only
  properties in the case of a compiler-generated type). Eligible
- getters also include public, nonstatic, non- <code>readonly</code> fields.
-  If a class has two properties and/or fields of the form "X" and
-  "IsX", where "X" is any name, or has multiple properties and/or
- fields with the same name, those properties and fields are
- ignored.</li> <li>(*) In the Java version, eligible getters are
-  public, nonstatic methods starting with "get" or "is" (either word
- followed by a character other than a basic digit or lower-case
-  letter, that is, other than "a" to "z" or "0" to "9"), that take no
- parameters and do not return void, except that methods named
-  "getClass" are not eligible getters. In addition, public, nonstatic,
- nonfinal fields are also eligible getters. If a class has two
-  otherwise eligible getters (methods and/or fields) of the form "isX"
-  and "getX", where "X" is the same in both, or two such getters with
- the same name but different return type, they are not eligible
+ getters also include public, nonstatic, non- <code>static final</code> , non-
+ <code>readonly</code> fields. If a class has two properties and/or fields
+  of the form "X" and "IsX", where "X" is any name, or has multiple
+ properties and/or fields with the same name, those properties and
+ fields are ignored.</li> <li>(*) In the Java version, eligible
+  getters are public, nonstatic methods starting with "get" or "is"
+ (either word followed by a character other than a basic digit or
+  lower-case letter, that is, other than "a" to "z" or "0" to "9"),
+ that take no parameters and do not return void, except that methods
+  named "getClass" are not eligible getters. In addition, public,
+ nonstatic, nonfinal fields are also eligible getters. If a class has
+ two otherwise eligible getters (methods and/or fields) of the form
+  "isX" and "getX", where "X" is the same in both, or two such getters
+ with the same name but different return type, they are not eligible
  getters.</li> <li>Then, the method returns a CBOR map with each
  eligible getter's name or property name as each key, and with the
  corresponding value returned by that getter as that key's value.

src/main/java/com/upokecenter/cbor/CBORCanonical.java

@@ -128,22 +128,22 @@ public int compare(CBORObject a, CBORObject b) {
     }
 
     private static boolean IsArrayOrMap(CBORObject a) {
-       return a.getType() == CBORType.Array || a.getType() == CBORType.Map;
+      return a.getType() == CBORType.Array || a.getType() == CBORType.Map;
     }
 
     public static byte[] CtapCanonicalEncode(CBORObject a) {
       return CtapCanonicalEncode(a, 0);
     }
 
     private static boolean ByteArraysEqual(byte[] bytesA, byte[] bytesB) {
-if (bytesA == bytesB) {
-  return true;
-}
-if (bytesA == null || bytesB == null) {
-  return false;
-}
-if (bytesA.length == bytesB.length) {
-  for (int j = 0; j < bytesA.length; ++j) {
+      if (bytesA == bytesB) {
+        return true;
+      }
+      if (bytesA == null || bytesB == null) {
+        return false;
+      }
+      if (bytesA.length == bytesB.length) {
+        for (int j = 0; j < bytesA.length; ++j) {
           if (bytesA[j] != bytesB[j]) {
             return false;
           }