Skip to content

Commit 45a7bcd

Browse files
committed
update Java version
1 parent deaa34a commit 45a7bcd

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

api/com.upokecenter.cbor.CBORObject.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,7 +2541,8 @@ Converts an arbitrary object to a string in JavaScript object Notation
25412541
to a data stream in UTF-8. If the object is convertible to a CBOR
25422542
map, or to a CBOR object that contains CBOR maps, the keys to those
25432543
maps are written out to the JSON string in an undefined order. The
2544-
example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
2544+
example code given in
2545+
<b>PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)</b>
25452546
can be used to write out certain keys of a CBOR map in a given order
25462547
to a JSON string.
25472548

@@ -3669,7 +3670,8 @@ Converts this object to a string in JavaScript object Notation (JSON)
36693670
example, <code>22("Test")</code> is converted to <code>"Test"</code> and
36703671
<code>true</code> is converted to <code>"true"</code>). If, after such
36713672
conversion, two or more map keys are identical, this method throws a
3672-
CBORException. The example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
3673+
CBORException. The example code given in
3674+
<b>PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)</b>
36733675
can be used to write out certain keys of a CBOR map in a given order
36743676
to a JSON string.</p>
36753677

@@ -3753,7 +3755,8 @@ Returns this CBOR object in string form. The format is intended to be
37533755
human-readable, not machine-readable, the format is not intended to
37543756
be parsed, and the format may change at any time. The returned
37553757
string is not necessarily in JavaScript object Notation (JSON); to
3756-
convert CBOR objects to JSON strings, use the <see cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
3758+
convert CBOR objects to JSON strings, use the
3759+
<b>PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)</b>
37573760
method instead.
37583761

37593762
**Overrides:**
@@ -3792,7 +3795,8 @@ Converts this object to a string in JavaScript object Notation (JSON)
37923795
format, as in the ToJSONString method, and writes that string to a
37933796
data stream in UTF-8. If the CBOR object contains CBOR maps, or is a
37943797
CBOR map, the keys to the map are written out to the JSON string in
3795-
an undefined order. The example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
3798+
an undefined order. The example code given in
3799+
<b>PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)</b>
37963800
can be used to write out certain keys of a CBOR map in a given order
37973801
to a JSON string.
37983802

@@ -3813,7 +3817,8 @@ Converts this object to a string in JavaScript object Notation (JSON)
38133817
data stream in UTF-8, using the given JSON options to control the
38143818
encoding process. If the CBOR object contains CBOR maps, or is a
38153819
CBOR map, the keys to the map are written out to the JSON string in
3816-
an undefined order. The example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
3820+
an undefined order. The example code given in
3821+
<b>PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)</b>
38173822
can be used to write out certain keys of a CBOR map in a given order
38183823
to a JSON string.
38193824

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2889,9 +2889,8 @@ public static void Write(
28892889
* to a data stream in UTF-8. If the object is convertible to a CBOR
28902890
* map, or to a CBOR object that contains CBOR maps, the keys to those
28912891
* maps are written out to the JSON string in an undefined order. The
2892-
* example code given in <see
2893-
*
2894-
cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
2892+
* example code given in
2893+
* <b>PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)</b>
28952894
* can be used to write out certain keys of a CBOR map in a given order
28962895
* to a JSON string.
28972896
* @param obj The parameter {@code obj} is an arbitrary object. Can be null.
@@ -4505,9 +4504,8 @@ public CBORObject Set(Object key, Object valueOb) {
45054504
* example, <code>22("Test")</code> is converted to <code>"Test"</code> and
45064505
* <code>true</code> is converted to <code>"true"</code>). If, after such
45074506
* conversion, two or more map keys are identical, this method throws a
4508-
* CBORException. The example code given in <see
4509-
*
4510-
cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
4507+
* CBORException. The example code given in
4508+
* <b>PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)</b>
45114509
* can be used to write out certain keys of a CBOR map in a given order
45124510
* to a JSON string.</p>
45134511
* @return A text string.
@@ -4609,9 +4607,8 @@ public String ToJSONString(JSONOptions options) {
46094607
* human-readable, not machine-readable, the format is not intended to
46104608
* be parsed, and the format may change at any time. The returned
46114609
* string is not necessarily in JavaScript object Notation (JSON); to
4612-
* convert CBOR objects to JSON strings, use the <see
4613-
*
4614-
cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
4610+
* convert CBOR objects to JSON strings, use the
4611+
* <b>PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)</b>
46154612
* method instead.
46164613
* @return A text representation of this object.
46174614
*/
@@ -4790,9 +4787,8 @@ public CBORObject UntagOne() {
47904787
* format, as in the ToJSONString method, and writes that string to a
47914788
* data stream in UTF-8. If the CBOR object contains CBOR maps, or is a
47924789
* CBOR map, the keys to the map are written out to the JSON string in
4793-
* an undefined order. The example code given in <see
4794-
*
4795-
cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
4790+
* an undefined order. The example code given in
4791+
* <b>PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)</b>
47964792
* can be used to write out certain keys of a CBOR map in a given order
47974793
* to a JSON string.
47984794
* @param outputStream A writable data stream.
@@ -4815,9 +4811,8 @@ public void WriteJSONTo(OutputStream outputStream) throws java.io.IOException {
48154811
* data stream in UTF-8, using the given JSON options to control the
48164812
* encoding process. If the CBOR object contains CBOR maps, or is a
48174813
* CBOR map, the keys to the map are written out to the JSON string in
4818-
* an undefined order. The example code given in <see
4819-
*
4820-
cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
4814+
* an undefined order. The example code given in
4815+
* <b>PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)</b>
48214816
* can be used to write out certain keys of a CBOR map in a given order
48224817
* to a JSON string.
48234818
* @param outputStream A writable data stream.

0 commit comments

Comments
 (0)