git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

StringSelection.java (getTransferData): Return object of type expected by specified DataFlavor. 

2003-12-08  Fernando Nasser  <fnasser@redhat.com>

        * java/awt/datatransfer/StringSelection.java (getTransferData): Return
        object of type expected by specified DataFlavor.

From-SVN: r74449
This commit is contained in:
Fernando Nasser 2003-12-08 23:56:43 +00:00 committed by Fernando Nasser
parent 453d6cba7e
commit 82650cb7ba
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-08 Fernando Nasser <fnasser@redhat.com>
* java/awt/datatransfer/StringSelection.java (getTransferData): Return
object of type expected by specified DataFlavor.
2003-12-08 Fernando Nasser <fnasser@redhat.com> 2003-12-08 Fernando Nasser <fnasser@redhat.com>
* java/awt/datatransfer/DataFlavor.java (getParameter): Fix off-by-one * java/awt/datatransfer/DataFlavor.java (getParameter): Fix off-by-one

12
libjava/java/awt/datatransfer/StringSelection.java
View File

@ -38,7 +38,7 @@ exception statement from your version. */
package java.awt.datatransfer; package java.awt.datatransfer;
import java.io.StringBufferInputStream; import java.io.StringReader;
import java.io.IOException; import java.io.IOException;
/** /**
@ -140,7 +140,15 @@ getTransferData(DataFlavor flavor) throws UnsupportedFlavorException,
if (!isDataFlavorSupported(flavor)) if (!isDataFlavorSupported(flavor))
throw new UnsupportedFlavorException(flavor); throw new UnsupportedFlavorException(flavor);
return(new StringBufferInputStream(data)); if (DataFlavor.plainTextFlavor == flavor)
/* The behavior of this method for DataFlavor.plainTextFlavor and
equivalent DataFlavors is inconsistent with the definition of
DataFlavor.plainTextFlavor. We choose to do like Sun's implementation
and return a Reader instead of an InputString. */
/* return(new StringBufferInputStream(data)); */
return(new StringReader(data));
else // DataFlavor.stringFlavor
return data;
} }
/*************************************************************************/ /*************************************************************************/