diff --git a/jdk/src/share/classes/java/lang/StringBuffer.java b/jdk/src/share/classes/java/lang/StringBuffer.java index e66dbce9b56..4dee96e6795 100644 --- a/jdk/src/share/classes/java/lang/StringBuffer.java +++ b/jdk/src/share/classes/java/lang/StringBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2012, 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 @@ -39,29 +39,38 @@ package java.lang; * that is consistent with the order of the method calls made by each of * the individual threads involved. *
- * The principal operations on a StringBuffer
are the
- * append
and insert
methods, which are
+ * The principal operations on a {@code StringBuffer} are the
+ * {@code append} and {@code insert} methods, which are
* overloaded so as to accept data of any type. Each effectively
* converts a given datum to a string and then appends or inserts the
* characters of that string to the string buffer. The
- * append
method always adds these characters at the end
- * of the buffer; the insert
method adds the characters at
+ * {@code append} method always adds these characters at the end
+ * of the buffer; the {@code insert} method adds the characters at
* a specified point.
*
- * For example, if z
refers to a string buffer object
- * whose current contents are "start
", then
- * the method call z.append("le")
would cause the string
- * buffer to contain "startle
", whereas
- * z.insert(4, "le")
would alter the string buffer to
- * contain "starlet
".
+ * For example, if {@code z} refers to a string buffer object
+ * whose current contents are {@code "start"}, then
+ * the method call {@code z.append("le")} would cause the string
+ * buffer to contain {@code "startle"}, whereas
+ * {@code z.insert(4, "le")} would alter the string buffer to
+ * contain {@code "starlet"}.
*
- * In general, if sb refers to an instance of a StringBuffer
,
- * then sb.append(x)
has the same effect as
- * sb.insert(sb.length(), x)
.
+ * In general, if sb refers to an instance of a {@code StringBuffer},
+ * then {@code sb.append(x)} has the same effect as
+ * {@code sb.insert(sb.length(), x)}.
*
* Whenever an operation occurs involving a source sequence (such as - * appending or inserting from a source sequence) this class synchronizes + * appending or inserting from a source sequence), this class synchronizes * only on the string buffer performing the operation, not on the source. + * Note that while {@code StringBuffer} is designed to be safe to use + * concurrently from multiple threads, if the constructor or the + * {@code append} or {@code insert} operation is passed a source sequence + * that is shared across threads, the calling code must ensure + * that the operation has a consistent and unchanging view of the source + * sequence for the duration of the operation. + * This could be satisfied by the caller holding a lock during the + * operation's call, by using an immutable source sequence, or by not + * sharing the source sequence across threads. *
* Every string buffer has a capacity. As long as the length of the
* character sequence contained in the string buffer does not exceed
@@ -101,8 +110,8 @@ package java.lang;
* the specified initial capacity.
*
* @param capacity the initial capacity.
- * @exception NegativeArraySizeException if the capacity
- * argument is less than 0
.
+ * @exception NegativeArraySizeException if the {@code capacity}
+ * argument is less than {@code 0}.
*/
public StringBuffer(int capacity) {
super(capacity);
@@ -111,10 +120,10 @@ package java.lang;
/**
* Constructs a string buffer initialized to the contents of the
* specified string. The initial capacity of the string buffer is
- * 16
plus the length of the string argument.
+ * {@code 16} plus the length of the string argument.
*
* @param str the initial contents of the buffer.
- * @exception NullPointerException if str
is null
+ * @exception NullPointerException if {@code str} is {@code null}
*/
public StringBuffer(String str) {
super(str.length() + 16);
@@ -123,16 +132,16 @@ package java.lang;
/**
* Constructs a string buffer that contains the same characters
- * as the specified CharSequence
. The initial capacity of
- * the string buffer is 16
plus the length of the
- * CharSequence
argument.
+ * as the specified {@code CharSequence}. The initial capacity of
+ * the string buffer is {@code 16} plus the length of the
+ * {@code CharSequence} argument.
*
- * If the length of the specified CharSequence
is
+ * If the length of the specified {@code CharSequence} is
* less than or equal to zero, then an empty buffer of capacity
- * 16
is returned.
+ * {@code 16} is returned.
*
* @param seq the sequence to copy.
- * @exception NullPointerException if seq
is null
+ * @exception NullPointerException if {@code seq} is {@code null}
* @since 1.5
*/
public StringBuffer(CharSequence seq) {
@@ -253,10 +262,10 @@ package java.lang;
* the new character sequence is equal to the character at index k
* in the old character sequence, if k is less than n;
* otherwise, it is equal to the character at index k-n in the
- * argument sb
.
+ * argument {@code sb}.
*
- * This method synchronizes on this
(the destination)
- * object but does not synchronize on the source (sb
).
+ * This method synchronizes on {@code this}, the destination
+ * object, but does not synchronize on the source ({@code sb}).
*
* @param sb the StringBuffer to append.
* @return a reference to this object.
@@ -269,23 +278,23 @@ package java.lang;
/**
- * Appends the specified CharSequence
to this
+ * Appends the specified {@code CharSequence} to this
* sequence.
*
- * The characters of the CharSequence
argument are appended,
+ * The characters of the {@code CharSequence} argument are appended,
* in order, increasing the length of this sequence by the length of the
* argument.
*
*
The result of this method is exactly the same as if it were an * invocation of this.append(s, 0, s.length()); * - *
This method synchronizes on this (the destination)
- * object but does not synchronize on the source (s
).
+ *
This method synchronizes on {@code this}, the destination + * object, but does not synchronize on the source ({@code s}). * - *
If s
is null
, then the four characters
- * "null"
are appended.
+ *
If {@code s} is {@code null}, then the four characters
+ * {@code "null"} are appended.
*
- * @param s the CharSequence
to append.
+ * @param s the {@code CharSequence} to append.
* @return a reference to this object.
* @since 1.5
*/