Index: modules/swing/src/main/java/common/javax/swing/text/Segment.java =================================================================== --- modules/swing/src/main/java/common/javax/swing/text/Segment.java (revision 483031) +++ modules/swing/src/main/java/common/javax/swing/text/Segment.java (working copy) @@ -14,10 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author Alexey A. Ivanov - * @version $Revision$ - */ package javax.swing.text; import java.text.CharacterIterator; @@ -47,6 +43,7 @@ this.isPartial = false; } + @Override public Object clone() { Object clone; @@ -141,8 +138,9 @@ return; } + @Override public String toString() { - return new String(array, offset, count); + return array != null ? new String(array, offset, count) : ""; } private boolean isEmpty() {