Skip to content

Commit 0c35101

Browse files
committed
update Java version
1 parent 76e85e0 commit 0c35101

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

api/com.upokecenter.cbor.CBORObject.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,7 @@ Converts this object to a byte array in JavaScript object Notation (JSON)
15761576
object is converted to JSON with <code>ToJSONString</code>, then the JSON is
15771577
converted back to CBOR with this method, the new CBOR object will not
15781578
necessarily be the same as the old CBOR object, especially if the old CBOR
1579-
object uses data types not available in JSON, such as integers in map
1579+
object uses data types not supported in JSON, such as integers in map
15801580
keys.</p>
15811581

15821582
**Parameters:**
@@ -1614,7 +1614,7 @@ Converts this object to a byte array in JavaScript object Notation (JSON)
16141614
</p> <p>Note that if a CBOR object is converted to JSON with <code>
16151615
ToJSONString</code>, then the JSON is converted back to CBOR with this method, the
16161616
new CBOR object will not necessarily be the same as the old CBOR object,
1617-
especially if the old CBOR object uses data types not available in JSON,
1617+
especially if the old CBOR object uses data types not supported in JSON,
16181618
such as integers in map keys.</p>
16191619

16201620
**Parameters:**
@@ -1646,7 +1646,7 @@ Converts this object to a byte array in JavaScript object Notation (JSON)
16461646
object is converted to JSON with <code>ToJSONString</code>, then the JSON is
16471647
converted back to CBOR with this method, the new CBOR object will not
16481648
necessarily be the same as the old CBOR object, especially if the old CBOR
1649-
object uses data types not available in JSON, such as integers in map
1649+
object uses data types not supported in JSON, such as integers in map
16501650
keys.</p>
16511651

16521652
**Parameters:**
@@ -1674,7 +1674,7 @@ Converts this object to a byte array in JavaScript object Notation (JSON)
16741674
</p> <p>Note that if a CBOR object is converted to JSON with <code>
16751675
ToJSONString</code>, then the JSON is converted back to CBOR with this method, the
16761676
new CBOR object will not necessarily be the same as the old CBOR object,
1677-
especially if the old CBOR object uses data types not available in JSON,
1677+
especially if the old CBOR object uses data types not supported in JSON,
16781678
such as integers in map keys.</p>
16791679

16801680
**Parameters:**
@@ -2876,7 +2876,7 @@ Generates a CBORObject from an arbitrary object. See the overload of this
28762876
com.upokecenter.cbor.CBORObject.FromObject(System.Byte[])</code>.</li><li>In
28772877
the.NET version, a nullable is converted to <code>CBORObject.Null</code> if the
28782878
nullable's value is <code>null</code> , or converted according to the nullable's
2879-
underlying type, if that type is allowed for this method.</li><li>In the
2879+
underlying type, if that type is supported by this method.</li><li>In the
28802880
Java version, a number of type <code>BigInteger</code> or <code>BigDecimal</code> is
28812881
converted to the corresponding CBOR number.</li><li>A number of type <code>
28822882
EDecimal</code> , <code>EFloat</code> , <code>EInteger</code> , and <code>ERational</code> in the
@@ -3492,7 +3492,7 @@ Generates a CBOR object from a data stream in JavaScript object Notation
34923492
is thrown.</p> <p>Note that if a CBOR object is converted to JSON with
34933493
<code>ToJSONBytes</code>, then the JSON is converted back to CBOR with this
34943494
method, the new CBOR object will not necessarily be the same as the old CBOR
3495-
object, especially if the old CBOR object uses data types not available in
3495+
object, especially if the old CBOR object uses data types not supported in
34963496
JSON, such as integers in map keys.</p>
34973497

34983498
**Parameters:**
@@ -3527,7 +3527,7 @@ Generates a CBOR object from a data stream in JavaScript object Notation
35273527
</p> <p>Note that if a CBOR object is converted to JSON with <code>
35283528
ToJSONBytes</code>, then the JSON is converted back to CBOR with this method, the
35293529
new CBOR object will not necessarily be the same as the old CBOR object,
3530-
especially if the old CBOR object uses data types not available in JSON,
3530+
especially if the old CBOR object uses data types not supported in JSON,
35313531
such as integers in map keys.</p>
35323532

35333533
**Parameters:**
@@ -3566,7 +3566,7 @@ Generates a CBOR object from a data stream in JavaScript object Notation
35663566
is thrown.</p> <p>Note that if a CBOR object is converted to JSON with
35673567
<code>ToJSONBytes</code>, then the JSON is converted back to CBOR with this
35683568
method, the new CBOR object will not necessarily be the same as the old CBOR
3569-
object, especially if the old CBOR object uses data types not available in
3569+
object, especially if the old CBOR object uses data types not supported in
35703570
JSON, such as integers in map keys.</p>
35713571

35723572
**Parameters:**
@@ -3611,7 +3611,7 @@ Generates a CBOR object from a data stream in JavaScript object Notation
36113611
</p> <p>Note that if a CBOR object is converted to JSON with <code>
36123612
ToJSONBytes</code>, then the JSON is converted back to CBOR with this method, the
36133613
new CBOR object will not necessarily be the same as the old CBOR object,
3614-
especially if the old CBOR object uses data types not available in JSON,
3614+
especially if the old CBOR object uses data types not supported in JSON,
36153615
such as integers in map keys.</p>
36163616

36173617
**Parameters:**
@@ -5129,7 +5129,7 @@ Sets the value of a CBORObject of type Array at the specified index to the
51295129
can be used to write out certain keys of a CBOR map in a given order to a
51305130
JSON string, or to write out a CBOR object as part of a JSON text
51315131
sequence.</p> <p><b>Warning:</b> In general, if this CBOR object contains
5132-
integer map keys or uses other features not available in JSON, and the
5132+
integer map keys or uses other features not supported in JSON, and the
51335133
application converts this CBOR object to JSON and back to CBOR, the
51345134
application <i>should not</i> expect the new CBOR object to be exactly the
51355135
same as the original. This is because the conversion in many cases may have
@@ -5181,7 +5181,7 @@ Sets the value of a CBORObject of type Array at the specified index to the
51815181
other than true and false will be converted to null. (This doesn't include
51825182
floating-point numbers.)</li><li>Infinity and not-a-number will be converted
51835183
to null.</li></ul> <p><b>Warning:</b> In general, if this CBOR object
5184-
contains integer map keys or uses other features not available in JSON, and
5184+
contains integer map keys or uses other features not supported in JSON, and
51855185
the application converts this CBOR object to JSON and back to CBOR, the
51865186
application <i>should not</i> expect the new CBOR object to be exactly the
51875187
same as the original. This is because the conversion in many cases may have

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ public static CBORObject DecodeFromBytes(
10121012
* object is converted to JSON with {@code ToJSONString}, then the JSON is
10131013
* converted back to CBOR with this method, the new CBOR object will not
10141014
* necessarily be the same as the old CBOR object, especially if the old CBOR
1015-
* object uses data types not available in JSON, such as integers in map
1015+
* object uses data types not supported in JSON, such as integers in map
10161016
* keys.</p>
10171017
* @param str A text string in JSON format. The entire string must contain a
10181018
* single JSON object and not multiple objects. The string may not begin with a
@@ -1041,7 +1041,7 @@ public static CBORObject FromJSONString(String str, int offset, int count) {
10411041
* </p> <p>Note that if a CBOR object is converted to JSON with {@code
10421042
* ToJSONString}, then the JSON is converted back to CBOR with this method, the
10431043
* new CBOR object will not necessarily be the same as the old CBOR object,
1044-
* especially if the old CBOR object uses data types not available in JSON,
1044+
* especially if the old CBOR object uses data types not supported in JSON,
10451045
* such as integers in map keys.</p>
10461046
* @param str A text string in JSON format. The entire string must contain a
10471047
* single JSON object and not multiple objects. The string may not begin with a
@@ -1071,7 +1071,7 @@ public static CBORObject FromJSONString(
10711071
* object is converted to JSON with {@code ToJSONString}, then the JSON is
10721072
* converted back to CBOR with this method, the new CBOR object will not
10731073
* necessarily be the same as the old CBOR object, especially if the old CBOR
1074-
* object uses data types not available in JSON, such as integers in map
1074+
* object uses data types not supported in JSON, such as integers in map
10751075
* keys.</p>
10761076
* @param str A text string in JSON format. The entire string must contain a
10771077
* single JSON object and not multiple objects. The string may not begin with a
@@ -1090,7 +1090,7 @@ public static CBORObject FromJSONString(String str) {
10901090
* </p> <p>Note that if a CBOR object is converted to JSON with {@code
10911091
* ToJSONString}, then the JSON is converted back to CBOR with this method, the
10921092
* new CBOR object will not necessarily be the same as the old CBOR object,
1093-
* especially if the old CBOR object uses data types not available in JSON,
1093+
* especially if the old CBOR object uses data types not supported in JSON,
10941094
* such as integers in map keys.</p>
10951095
* @param str The parameter {@code str} is a text string.
10961096
* @param offset An index, starting at 0, showing where the desired portion of
@@ -2443,7 +2443,7 @@ public static CBORObject FromObject(
24432443
* com.upokecenter.cbor.CBORObject.FromObject(System.Byte[])}.</li><li>In
24442444
* the.NET version, a nullable is converted to {@code CBORObject.Null} if the
24452445
* nullable's value is {@code null} , or converted according to the nullable's
2446-
* underlying type, if that type is allowed for this method.</li><li>In the
2446+
* underlying type, if that type is supported by this method.</li><li>In the
24472447
* Java version, a number of type {@code BigInteger} or {@code BigDecimal} is
24482448
* converted to the corresponding CBOR number.</li><li>A number of type {@code
24492449
* EDecimal} , {@code EFloat} , {@code EInteger} , and {@code ERational} in the
@@ -3237,7 +3237,7 @@ public static CBORObject ReadJSON(
32373237
* is thrown.</p> <p>Note that if a CBOR object is converted to JSON with
32383238
* {@code ToJSONBytes}, then the JSON is converted back to CBOR with this
32393239
* method, the new CBOR object will not necessarily be the same as the old CBOR
3240-
* object, especially if the old CBOR object uses data types not available in
3240+
* object, especially if the old CBOR object uses data types not supported in
32413241
* JSON, such as integers in map keys.</p>
32423242
* @param bytes A byte array in JSON format. The entire byte array must contain
32433243
* a single JSON object and not multiple objects. The byte array may begin with
@@ -3264,7 +3264,7 @@ public static CBORObject FromJSONBytes(byte[] bytes) {
32643264
* </p> <p>Note that if a CBOR object is converted to JSON with {@code
32653265
* ToJSONBytes}, then the JSON is converted back to CBOR with this method, the
32663266
* new CBOR object will not necessarily be the same as the old CBOR object,
3267-
* especially if the old CBOR object uses data types not available in JSON,
3267+
* especially if the old CBOR object uses data types not supported in JSON,
32683268
* such as integers in map keys.</p>
32693269
* @param bytes A byte array in JSON format. The entire byte array must contain
32703270
* a single JSON object and not multiple objects. The byte array may begin with
@@ -3305,7 +3305,7 @@ public static CBORObject FromJSONBytes(
33053305
* is thrown.</p> <p>Note that if a CBOR object is converted to JSON with
33063306
* {@code ToJSONBytes}, then the JSON is converted back to CBOR with this
33073307
* method, the new CBOR object will not necessarily be the same as the old CBOR
3308-
* object, especially if the old CBOR object uses data types not available in
3308+
* object, especially if the old CBOR object uses data types not supported in
33093309
* JSON, such as integers in map keys.</p>
33103310
* @param bytes A byte array, the specified portion of which is in JSON format.
33113311
* The specified portion of the byte array must contain a single JSON object
@@ -3339,7 +3339,7 @@ public static CBORObject FromJSONBytes(byte[] bytes, int offset, int
33393339
* </p> <p>Note that if a CBOR object is converted to JSON with {@code
33403340
* ToJSONBytes}, then the JSON is converted back to CBOR with this method, the
33413341
* new CBOR object will not necessarily be the same as the old CBOR object,
3342-
* especially if the old CBOR object uses data types not available in JSON,
3342+
* especially if the old CBOR object uses data types not supported in JSON,
33433343
* such as integers in map keys.</p>
33443344
* @param bytes A byte array, the specified portion of which is in JSON format.
33453345
* The specified portion of the byte array must contain a single JSON object
@@ -5493,7 +5493,7 @@ public CBORObject Set(int key, CBORObject mapValue) {
54935493
* can be used to write out certain keys of a CBOR map in a given order to a
54945494
* JSON string, or to write out a CBOR object as part of a JSON text
54955495
* sequence.</p> <p><b>Warning:</b> In general, if this CBOR object contains
5496-
* integer map keys or uses other features not available in JSON, and the
5496+
* integer map keys or uses other features not supported in JSON, and the
54975497
* application converts this CBOR object to JSON and back to CBOR, the
54985498
* application <i>should not</i> expect the new CBOR object to be exactly the
54995499
* same as the original. This is because the conversion in many cases may have
@@ -5543,7 +5543,7 @@ public String ToJSONString() {
55435543
* other than true and false will be converted to null. (This doesn't include
55445544
* floating-point numbers.)</li><li>Infinity and not-a-number will be converted
55455545
* to null.</li></ul> <p><b>Warning:</b> In general, if this CBOR object
5546-
* contains integer map keys or uses other features not available in JSON, and
5546+
* contains integer map keys or uses other features not supported in JSON, and
55475547
* the application converts this CBOR object to JSON and back to CBOR, the
55485548
* application <i>should not</i> expect the new CBOR object to be exactly the
55495549
* same as the original. This is because the conversion in many cases may have
@@ -6629,7 +6629,7 @@ private static boolean CBORMapEquals(
66296629
return false;
66306630
}
66316631
if (kvp.getValue() == null) {
6632-
// Null (as opposed to CBORObject.Null) values not available in CBOR maps.
6632+
// Null (as opposed to CBORObject.Null) values not supported in CBOR maps.
66336633
throw new IllegalStateException();
66346634
}
66356635
if (!kvp.getValue().equals(valueB)) {

0 commit comments

Comments
 (0)