jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/StringSelection.java
--- a/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/StringSelection.java Sat Jun 17 11:50:55 2017 -0700
+++ b/jdk/src/java.datatransfer/share/classes/java/awt/datatransfer/StringSelection.java Sun Jun 18 17:33:47 2017 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -25,23 +25,21 @@
package java.awt.datatransfer;
-import java.io.*;
-
+import java.io.IOException;
+import java.io.StringReader;
/**
- * A <code>Transferable</code> which implements the capability required
- * to transfer a <code>String</code>.
+ * A {@code Transferable} which implements the capability required to transfer a
+ * {@code String}.
+ * <p>
+ * This {@code Transferable} properly supports {@code DataFlavor.stringFlavor}
+ * and all equivalent flavors. Support for {@code DataFlavor.plainTextFlavor}
+ * and all equivalent flavors is <b>deprecated</b>. No other {@code DataFlavor}s
+ * are supported.
*
- * This <code>Transferable</code> properly supports
- * <code>DataFlavor.stringFlavor</code>
- * and all equivalent flavors. Support for
- * <code>DataFlavor.plainTextFlavor</code>
- * and all equivalent flavors is <b>deprecated</b>. No other
- * <code>DataFlavor</code>s are supported.
- *
+ * @see DataFlavor#stringFlavor
+ * @see DataFlavor#plainTextFlavor
* @since 1.1
- * @see java.awt.datatransfer.DataFlavor#stringFlavor
- * @see java.awt.datatransfer.DataFlavor#plainTextFlavor
*/
public class StringSelection implements Transferable, ClipboardOwner {
@@ -57,23 +55,23 @@
private String data;
/**
- * Creates a <code>Transferable</code> capable of transferring
- * the specified <code>String</code>.
- * @param data the string to be transferred
+ * Creates a {@code Transferable} capable of transferring the specified
+ * {@code String}.
+ *
+ * @param data the string to be transferred
*/
public StringSelection(String data) {
this.data = data;
}
/**
- * Returns an array of flavors in which this <code>Transferable</code>
- * can provide the data. <code>DataFlavor.stringFlavor</code>
- * is properly supported.
- * Support for <code>DataFlavor.plainTextFlavor</code> is
- * <b>deprecated</b>.
+ * Returns an array of flavors in which this {@code Transferable} can
+ * provide the data. {@code DataFlavor.stringFlavor} is properly supported.
+ * Support for {@code DataFlavor.plainTextFlavor} is <b>deprecated</b>.
*
- * @return an array of length two, whose elements are <code>DataFlavor.
- * stringFlavor</code> and <code>DataFlavor.plainTextFlavor</code>
+ * @return an array of length two, whose elements are
+ * {@code DataFlavor.stringFlavor} and
+ * {@code DataFlavor.plainTextFlavor}
*/
public DataFlavor[] getTransferDataFlavors() {
// returning flavors itself would allow client code to modify
@@ -83,14 +81,14 @@
/**
* Returns whether the requested flavor is supported by this
- * <code>Transferable</code>.
+ * {@code Transferable}.
*
- * @param flavor the requested flavor for the data
- * @return true if <code>flavor</code> is equal to
- * <code>DataFlavor.stringFlavor</code> or
- * <code>DataFlavor.plainTextFlavor</code>; false if <code>flavor</code>
- * is not one of the above flavors
- * @throws NullPointerException if flavor is <code>null</code>
+ * @param flavor the requested flavor for the data
+ * @return {@code true} if {@code flavor} is equal to
+ * {@code DataFlavor.stringFlavor} or
+ * {@code DataFlavor.plainTextFlavor}; {@code false} if
+ * {@code flavor} is not one of the above flavors
+ * @throws NullPointerException if {@code flavor} is {@code null}
*/
public boolean isDataFlavorSupported(DataFlavor flavor) {
// JCK Test StringSelection0003: if 'flavor' is null, throw NPE
@@ -103,27 +101,27 @@
}
/**
- * Returns the <code>Transferable</code>'s data in the requested
- * <code>DataFlavor</code> if possible. If the desired flavor is
- * <code>DataFlavor.stringFlavor</code>, or an equivalent flavor,
- * the <code>String</code> representing the selection is
- * returned. If the desired flavor is
- * <code>DataFlavor.plainTextFlavor</code>,
- * or an equivalent flavor, a <code>Reader</code> is returned.
+ * Returns the {@code Transferable}'s data in the requested
+ * {@code DataFlavor} if possible. If the desired flavor is
+ * {@code DataFlavor.stringFlavor}, or an equivalent flavor, the
+ * {@code String} representing the selection is returned. If the desired
+ * flavor is {@code DataFlavor.plainTextFlavor}, or an equivalent flavor, a
+ * {@code Reader} is returned.
+ * <br>
* <b>Note:</b> The behavior of this method for
- * <code>DataFlavor.plainTextFlavor</code>
- * and equivalent <code>DataFlavor</code>s is inconsistent with the
- * definition of <code>DataFlavor.plainTextFlavor</code>.
+ * {@code DataFlavor.plainTextFlavor}
+ * and equivalent {@code DataFlavor}s is inconsistent with the definition of
+ * {@code DataFlavor.plainTextFlavor}.
*
- * @param flavor the requested flavor for the data
+ * @param flavor the requested flavor for the data
* @return the data in the requested flavor, as outlined above
- * @throws UnsupportedFlavorException if the requested data flavor is
- * not equivalent to either <code>DataFlavor.stringFlavor</code>
- * or <code>DataFlavor.plainTextFlavor</code>
+ * @throws UnsupportedFlavorException if the requested data flavor is not
+ * equivalent to either {@code DataFlavor.stringFlavor} or
+ * {@code DataFlavor.plainTextFlavor}
* @throws IOException if an IOException occurs while retrieving the data.
* By default, StringSelection never throws this exception, but a
* subclass may.
- * @throws NullPointerException if flavor is <code>null</code>
+ * @throws NullPointerException if {@code flavor} is {@code null}
* @see java.io.Reader
*/
public Object getTransferData(DataFlavor flavor)