Skip to content

Commit 367a7ad

Browse files
committed
update Java version
1 parent 410a8de commit 367a7ad

File tree

11 files changed

+4722
-4647
lines changed

11 files changed

+4722
-4647
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public boolean CanFitInSingle(Object obj) {
5656
if (intItem == Long.MIN_VALUE) {
5757
return true;
5858
}
59-
intItem = Math.abs(intItem);
59+
intItem = (intItem< 0) ? -intItem : intItem;
6060
while (intItem >= (1L << 24) && (intItem & 1) == 0) {
6161
intItem >>= 1;
6262
}
@@ -68,7 +68,7 @@ public boolean CanFitInDouble(Object obj) {
6868
if (intItem == Long.MIN_VALUE) {
6969
return true;
7070
}
71-
intItem = Math.abs(intItem);
71+
intItem = (intItem < 0) ? -intItem : intItem;
7272
while (intItem >= (1L << 53) && (intItem & 1) == 0) {
7373
intItem >>= 1;
7474
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ static void WriteJSONToInternal(
442442
}
443443
writer.WriteString(
444444
CBORObject.TrimDotZero(
445-
Float.toString((float)f)));
445+
CBORUtilities.SingleToString(f)));
446446
return;
447447
}
448448
case CBORObject.CBORObjectTypeDouble: {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static CBORObject ConvertToBigNum(CBORObject o, boolean negative) {
4646
}
4747
if (negative) {
4848
x = -x;
49-
x -= 1L;
49+
--x;
5050
}
5151
return FromObjectAndInnerTags(x, o);
5252
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public CBORObject ToCBORObject(java.net.URI uri) {
3131
if (uri == null) {
3232
throw new NullPointerException("uri");
3333
}
34-
return CBORObject.FromObjectAndTag(uri.toString(), (int)32);
34+
String uriString = uri.toString();
35+
return CBORObject.FromObjectAndTag(uriString, (int)32);
3536
}
3637
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,9 @@ private static String normalizePath(String path) {
506506
// is "/.."; remove last segment,
507507
// append "/" and return
508508
int index2 = builder.length() - 1;
509+
String builderString = builder.toString();
509510
while (index2 >= 0) {
510-
if (builder.charAt(index2) == '/') {
511+
if (builderString.charAt(index2) == '/') {
511512
break;
512513
}
513514
--index2;
@@ -523,8 +524,9 @@ private static String normalizePath(String path) {
523524
path.charAt(index + 2) == '.' && path.charAt(index + 3) == '/') {
524525
// begins with "/../"; remove last segment
525526
int index2 = builder.length() - 1;
527+
String builderString = builder.toString();
526528
while (index2 >= 0) {
527-
if (builder.charAt(index2) == '/') {
529+
if (builderString.charAt(index2) == '/') {
528530
break;
529531
}
530532
--index2;

0 commit comments

Comments
 (0)