--- a/jdk/src/java.base/share/classes/java/text/CalendarBuilder.java Wed Aug 27 11:33:45 2014 +0800
+++ b/jdk/src/java.base/share/classes/java/text/CalendarBuilder.java Wed Aug 27 22:08:19 2014 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
package java.text;
import java.util.Calendar;
+import java.util.StringJoiner;
import static java.util.GregorianCalendar.*;
/**
@@ -146,19 +147,13 @@
}
public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("CalendarBuilder:[");
+ StringJoiner sj = new StringJoiner(",", "CalendarBuilder:[", "]");
for (int i = 0; i < field.length; i++) {
if (isSet(i)) {
- sb.append(i).append('=').append(field[MAX_FIELD + i]).append(',');
+ sj.add(i + "=" + field[MAX_FIELD + i]);
}
}
- int lastIndex = sb.length() - 1;
- if (sb.charAt(lastIndex) == ',') {
- sb.setLength(lastIndex);
- }
- sb.append(']');
- return sb.toString();
+ return sj.toString();
}
static int toISODayOfWeek(int calendarDayOfWeek) {