From 659efb326d2b75c6b77863540911c41c49acf1f1 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Thu, 13 Feb 2003 19:28:32 +0000 Subject: [PATCH] 2003-02-13 Michael Koch * java/awt/Label.java (Label): Don't implement Serializable directly. (addNotify): Fixed typo in documentation. * java/awt/List.java (List): Don't implement Serializable directly. * java/awt/PopupMenu.java (PopupMenu): Don't implement Serializable directly. * java/awt/ScrollPane.java (ScrollPane): Don't implement Serializable directly. * java/awt/Scrollbar.java (Scrollbar): Don't implement Serializable directly. * java/awt/TextArea.java (preferredSize): Fixed method arguments. * java/awt/TextField.java (TextField): Don't implement Serializable directly. * java/awt/color/ICC_ColorSpace.java (fromCIOXYZ): Documentation added. (getMinValue): Documentation added. (getMaxValue): Documentation added. * java/awt/datatransfer/DataFlavor.java (isMimeTypeEqual): May not be final. (clone): Throws CloneNotSupportedException. (getReaderForText): Don't throws UnsupportedEncodingException. From-SVN: r62863 --- libjava/ChangeLog | 26 +++++++++++++++++++ libjava/java/awt/Label.java | 5 ++-- libjava/java/awt/List.java | 2 +- libjava/java/awt/PopupMenu.java | 2 +- libjava/java/awt/ScrollPane.java | 3 +-- libjava/java/awt/Scrollbar.java | 4 +-- libjava/java/awt/TextArea.java | 2 +- libjava/java/awt/TextField.java | 2 +- libjava/java/awt/color/ICC_ColorSpace.java | 19 ++++++++++++++ libjava/java/awt/datatransfer/DataFlavor.java | 11 +++----- 10 files changed, 57 insertions(+), 19 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f9a463787d4..3f8448c1627 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,29 @@ +2003-02-13 Michael Koch + + * java/awt/Label.java + (Label): Don't implement Serializable directly. + (addNotify): Fixed typo in documentation. + * java/awt/List.java + (List): Don't implement Serializable directly. + * java/awt/PopupMenu.java + (PopupMenu): Don't implement Serializable directly. + * java/awt/ScrollPane.java + (ScrollPane): Don't implement Serializable directly. + * java/awt/Scrollbar.java + (Scrollbar): Don't implement Serializable directly. + * java/awt/TextArea.java + (preferredSize): Fixed method arguments. + * java/awt/TextField.java + (TextField): Don't implement Serializable directly. + * java/awt/color/ICC_ColorSpace.java + (fromCIOXYZ): Documentation added. + (getMinValue): Documentation added. + (getMaxValue): Documentation added. + * java/awt/datatransfer/DataFlavor.java + (isMimeTypeEqual): May not be final. + (clone): Throws CloneNotSupportedException. + (getReaderForText): Don't throws UnsupportedEncodingException. + 2003-02-13 Michael Koch * gnu/java/awt/peer/gtk/GdkGraphics.java diff --git a/libjava/java/awt/Label.java b/libjava/java/awt/Label.java index 4f248c30bb9..47f6733da16 100644 --- a/libjava/java/awt/Label.java +++ b/libjava/java/awt/Label.java @@ -40,7 +40,6 @@ package java.awt; import java.awt.peer.LabelPeer; import java.awt.peer.ComponentPeer; -import java.io.Serializable; import javax.accessibility.Accessible; /** @@ -50,7 +49,7 @@ import javax.accessibility.Accessible; * @author Aaron M. Renn (arenn@urbanophile.com) * @author Tom Tromey */ -public class Label extends Component implements Serializable, Accessible +public class Label extends Component implements Accessible { /* @@ -225,7 +224,7 @@ setText(String text) /*************************************************************************/ /** - * Notifies this lable that it has been added to a container, causing + * Notifies this label that it has been added to a container, causing * the peer to be created. This method is called internally by the AWT * system. */ diff --git a/libjava/java/awt/List.java b/libjava/java/awt/List.java index 561a30d4dab..d182e560014 100644 --- a/libjava/java/awt/List.java +++ b/libjava/java/awt/List.java @@ -54,7 +54,7 @@ import javax.accessibility.Accessible; * @author Aaron M. Renn (arenn@urbanophile.com) */ public class List extends Component - implements ItemSelectable, Serializable, Accessible + implements ItemSelectable, Accessible { /* diff --git a/libjava/java/awt/PopupMenu.java b/libjava/java/awt/PopupMenu.java index d0f1980472b..75e565d3e9b 100644 --- a/libjava/java/awt/PopupMenu.java +++ b/libjava/java/awt/PopupMenu.java @@ -47,7 +47,7 @@ import java.awt.peer.MenuComponentPeer; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class PopupMenu extends Menu implements java.io.Serializable +public class PopupMenu extends Menu { /* diff --git a/libjava/java/awt/ScrollPane.java b/libjava/java/awt/ScrollPane.java index 045600cddf2..9b8b82a9a95 100644 --- a/libjava/java/awt/ScrollPane.java +++ b/libjava/java/awt/ScrollPane.java @@ -41,7 +41,6 @@ package java.awt; import java.awt.peer.ScrollPanePeer; import java.awt.peer.ContainerPeer; import java.awt.peer.ComponentPeer; -import java.io.Serializable; import javax.accessibility.Accessible; /** @@ -50,7 +49,7 @@ import javax.accessibility.Accessible; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class ScrollPane extends Container implements Accessible, Serializable +public class ScrollPane extends Container implements Accessible { /* diff --git a/libjava/java/awt/Scrollbar.java b/libjava/java/awt/Scrollbar.java index 4bdc3166ad9..76daee3f8bf 100644 --- a/libjava/java/awt/Scrollbar.java +++ b/libjava/java/awt/Scrollbar.java @@ -42,7 +42,6 @@ import java.awt.peer.ScrollbarPeer; import java.awt.peer.ComponentPeer; import java.awt.event.AdjustmentListener; import java.awt.event.AdjustmentEvent; -import java.io.Serializable; import javax.accessibility.Accessible; /** @@ -52,8 +51,7 @@ import javax.accessibility.Accessible; * @author Tom Tromey */ public class Scrollbar extends Component implements Accessible, - Adjustable, - Serializable + Adjustable { // FIXME: Serialization readObject/writeObject diff --git a/libjava/java/awt/TextArea.java b/libjava/java/awt/TextArea.java index f164add49a1..f458f9b75e5 100644 --- a/libjava/java/awt/TextArea.java +++ b/libjava/java/awt/TextArea.java @@ -404,7 +404,7 @@ preferredSize() * getPreferredSize(int). */ public Dimension -preferredSize(int columns) +preferredSize(int rows, int columns) { return(getPreferredSize(rows, columns)); } diff --git a/libjava/java/awt/TextField.java b/libjava/java/awt/TextField.java index 0106d77e3ad..335edc6d220 100644 --- a/libjava/java/awt/TextField.java +++ b/libjava/java/awt/TextField.java @@ -49,7 +49,7 @@ import java.awt.peer.ComponentPeer; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class TextField extends TextComponent implements java.io.Serializable +public class TextField extends TextComponent { /* diff --git a/libjava/java/awt/color/ICC_ColorSpace.java b/libjava/java/awt/color/ICC_ColorSpace.java index 2b7016742c9..2ed247f52b0 100644 --- a/libjava/java/awt/color/ICC_ColorSpace.java +++ b/libjava/java/awt/color/ICC_ColorSpace.java @@ -143,6 +143,13 @@ public class ICC_ColorSpace extends ColorSpace throw new UnsupportedOperationException(); } + /** + * Transforms a color value assumed to be in the CS_CIEXYZ conversion color + * space into this ColorSpace. + * + * @exception ArrayIndexOutOfBoundsException If array length is not at + * least 3. + */ public float[] fromCIEXYZ(float[] colorvalue) { // FIXME: Not implemented @@ -150,6 +157,12 @@ public class ICC_ColorSpace extends ColorSpace } /** + * Returns the minimum normalized color component value for the specified + * component. + * + * @exception IllegalArgumentException If component is less than 0 or greater + * than numComponents - 1. + * * @since 1.4 */ public float getMinValue(int idx) @@ -162,6 +175,12 @@ public class ICC_ColorSpace extends ColorSpace } /** + * Returns the maximum normalized color component value for the specified + * component. + * + * @exception IllegalArgumentException If component is less than 0 or greater + * than numComponents - 1. + * * @since 1.4 */ public float getMaxValue(int idx) diff --git a/libjava/java/awt/datatransfer/DataFlavor.java b/libjava/java/awt/datatransfer/DataFlavor.java index e1500a7926c..86d1f53c1d9 100644 --- a/libjava/java/awt/datatransfer/DataFlavor.java +++ b/libjava/java/awt/datatransfer/DataFlavor.java @@ -508,7 +508,7 @@ setHumanPresentableName(String humanPresentableName) * * @exception NullPointerException If mimeType is null. */ -public final boolean +public boolean isMimeTypeEqual(String mimeType) { // FIXME: Need to handle default attributes and parameters @@ -660,8 +660,7 @@ isFlavorJavaFileListType() * the Cloneable interface. Subclasses that override the clone method can also * throw this exception to indicate that an instance cannot be cloned. */ -public Object -clone() +public Object clone () throws CloneNotSupportedException { try { @@ -975,10 +974,8 @@ selectBestTextFlavor(DataFlavor[] availableFlavors) * @exception UnsupportedEncodingException if the "charset" isn't supported * on this platform. */ -public Reader -getReaderForText(Transferable transferable) throws UnsupportedFlavorException, - IOException, - UnsupportedEncodingException +public Reader getReaderForText(Transferable transferable) + throws UnsupportedFlavorException, IOException { if (!transferable.isDataFlavorSupported(this)) throw new UnsupportedFlavorException(this);