This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[PATCH] java.awt
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Wed, 12 Feb 2003 11:48:41 +0100
- Subject: [PATCH] java.awt
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
This patch fixes some glitches in java.awt. Please review and comment.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+SiaJWSOgCCdjSDsRAtphAJ9EFoQo0mKcU18b+gNeWq58nc2bPACeJE8k
T7wnuubJykxPgu0QpG0kTrI=
=nnbJ
-----END PGP SIGNATURE-----
--- /home/mkoch/src/gcc-cvs/libjava/ChangeLog 2003-02-12 11:16:32.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/ChangeLog 2003-02-12 11:40:25.000000000 +0100
@@ -1,5 +1,22 @@
2003-02-12 Michael Koch <konqueror@gmx.de>
+ * java/awt/GridBagConstraints.java
+ (FIRST_LINE_ENT, FIRST_LINE_START, LAST_LINE_END, LAST_LINE_START,
+ LINE_END, LINE_START, PAGE_END, PAGE_START): New constants.
+ * java/awt/KeyboardFocusManager.java
+ (setGlobalCurrentFocusCycleRoot): Must be public.
+ * java/awt/MenuComponent.java
+ (MenuComponent): Must be public.
+ * java/awt/Polygon.java
+ (Polygon): Initialize npoints too.
+ * java/awt/Toolkit.java:
+ Added some empty lines to make documentation more readable.
+ (getFontPeer): Added @deprecated.
+ (getColorModel): Added exception documentation.
+ (getProperty): Fixed documentation.
+
+2003-02-12 Michael Koch <konqueror@gmx.de>
+
* java/nio/channels/Channels.java: New file.
* Makefile.am
(ordinary_java_source_files): Added java/nio/channels/Channels.java.
--- /home/mkoch/src/gcc-cvs/libjava/java/awt/GridBagConstraints.java 2003-01-08 16:49:46.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/awt/GridBagConstraints.java 2003-02-12 10:44:58.000000000 +0100
@@ -80,6 +80,52 @@
/** Occupy all remaining cells. */
public static final int REMAINDER = 0;
+ /**
+ * Position to where the first text line would end. Equals to NORTHEAST for
+ * horizontal left-to-right orientations.
+ */
+ public static final int FIRST_LINE_END = 24;
+
+ /**
+ * Position to where the first text line would start. Equals to NORTHWEST for
+ * horizontal left-to-right orientations.
+ */
+ public static final int FIRST_LINE_START = 23;
+
+ /**
+ * Position to where the last text line would end. Equals to SOUTHEAST for
+ * horizontal left-to-right orientations.
+ */
+ public static final int LAST_LINE_END = 26;
+
+ /**
+ * Position to where the last text line would start. Equals to SOUTHWEST for
+ * horizontal left-to-right orientations.
+ */
+ public static final int LAST_LINE_START = 25;
+
+ /**
+ * Position to where a text line would end. Equals to EAST for
+ * left-to-right orientations.
+ */
+ public static final int LINE_END = 22;
+
+ /**
+ * Position to where a text line would start. Equals to WEST for
+ * left-to-right orientations.
+ */
+ public static final int LINE_START = 21;
+
+ /**
+ * Position to where a page ends. Equals SOUTH for horizontal orientations.
+ */
+ public static final int PAGE_END = 20;
+
+ /**
+ * Position to where a page starts. Equals NORTH for horizontal orientations.
+ */
+ public static final int PAGE_START = 19;
+
public int anchor;
public int fill;
public int gridheight;
--- /home/mkoch/src/gcc-cvs/libjava/java/awt/KeyboardFocusManager.java 2003-01-08 16:49:46.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/awt/KeyboardFocusManager.java 2003-02-12 08:32:34.000000000 +0100
@@ -386,7 +386,7 @@
return focusCycleRoot;
}
- protected void setGlobalCurrentFocusCycleRoot(Container cycleRoot)
+ public void setGlobalCurrentFocusCycleRoot(Container cycleRoot)
{
firePropertyChange("currentFocusCycleRoot", focusCycleRoot, cycleRoot);
focusCycleRoot = cycleRoot;
--- /home/mkoch/src/gcc-cvs/libjava/java/awt/MenuComponent.java 2003-01-02 12:38:12.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/awt/MenuComponent.java 2003-02-12 10:11:56.000000000 +0100
@@ -94,8 +94,10 @@
* Default constructor for subclasses.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
+ *
+ * @specnote public since JDK 1.4
*/
-protected
+public
MenuComponent()
{
if (GraphicsEnvironment.isHeadless())
--- /home/mkoch/src/gcc-cvs/libjava/java/awt/Polygon.java 2003-01-08 16:49:46.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/awt/Polygon.java 2003-02-12 08:33:09.000000000 +0100
@@ -120,6 +120,7 @@
// Leave room for growth.
xpoints = new int[4];
ypoints = new int[4];
+ npoints = 4;
}
/**
--- /home/mkoch/src/gcc-cvs/libjava/java/awt/Toolkit.java 2003-02-01 14:28:06.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/awt/Toolkit.java 2003-02-12 08:34:06.000000000 +0100
@@ -134,6 +134,7 @@
* Creates a peer object for the specified <code>TextField</code>.
*
* @param target The <code>TextField</code> to create the peer for.
+ *
* @return The peer for the specified <code>TextField</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -144,6 +145,7 @@
* Creates a peer object for the specified <code>Label</code>.
*
* @param target The <code>Label</code> to create the peer for.
+ *
* @return The peer for the specified <code>Label</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -154,6 +156,7 @@
* Creates a peer object for the specified <code>List</code>.
*
* @param target The <code>List</code> to create the peer for.
+ *
* @return The peer for the specified <code>List</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -164,6 +167,7 @@
* Creates a peer object for the specified <code>Checkbox</code>.
*
* @param target The <code>Checkbox</code> to create the peer for.
+ *
* @return The peer for the specified <code>Checkbox</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -174,6 +178,7 @@
* Creates a peer object for the specified <code>Scrollbar</code>.
*
* @param target The <code>Scrollbar</code> to create the peer for.
+ *
* @return The peer for the specified <code>Scrollbar</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -184,6 +189,7 @@
* Creates a peer object for the specified <code>ScrollPane</code>.
*
* @param target The <code>ScrollPane</code> to create the peer for.
+ *
* @return The peer for the specified <code>ScrollPane</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -194,6 +200,7 @@
* Creates a peer object for the specified <code>TextArea</code>.
*
* @param target The <code>TextArea</code> to create the peer for.
+ *
* @return The peer for the specified <code>TextArea</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -204,6 +211,7 @@
* Creates a peer object for the specified <code>Choice</code>.
*
* @param target The <code>Choice</code> to create the peer for.
+ *
* @return The peer for the specified <code>Choice</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -214,6 +222,7 @@
* Creates a peer object for the specified <code>Frame</code>.
*
* @param target The <code>Frame</code> to create the peer for.
+ *
* @return The peer for the specified <code>Frame</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -224,6 +233,7 @@
* Creates a peer object for the specified <code>Canvas</code>.
*
* @param target The <code>Canvas</code> to create the peer for.
+ *
* @return The peer for the specified <code>Canvas</code> object.
*/
protected abstract CanvasPeer createCanvas(Canvas target);
@@ -232,6 +242,7 @@
* Creates a peer object for the specified <code>Panel</code>.
*
* @param target The <code>Panel</code> to create the peer for.
+ *
* @return The peer for the specified <code>Panel</code> object.
*/
protected abstract PanelPeer createPanel(Panel target);
@@ -240,6 +251,7 @@
* Creates a peer object for the specified <code>Window</code>.
*
* @param target The <code>Window</code> to create the peer for.
+ *
* @return The peer for the specified <code>Window</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -250,6 +262,7 @@
* Creates a peer object for the specified <code>Dialog</code>.
*
* @param target The dialog to create the peer for
+ *
* @return The peer for the specified font name.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -260,6 +273,7 @@
* Creates a peer object for the specified <code>MenuBar</code>.
*
* @param target The <code>MenuBar</code> to create the peer for.
+ *
* @return The peer for the specified <code>MenuBar</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -270,6 +284,7 @@
* Creates a peer object for the specified <code>Menu</code>.
*
* @param target The <code>Menu</code> to create the peer for.
+ *
* @return The peer for the specified <code>Menu</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -300,6 +315,7 @@
* Creates a peer object for the specified <code>FileDialog</code>.
*
* @param target The <code>FileDialog</code> to create the peer for.
+ *
* @return The peer for the specified <code>FileDialog</code> object.
*
* @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -326,6 +342,7 @@
* XXX: FIXME
*
* @param target The <code>Component</code> to create the peer for.
+ *
* @return The peer for the specified <code>Component</code> object.
*/
protected LightweightPeer createComponent(Component target)
@@ -338,7 +355,10 @@
*
* @param name The font to create the peer for.
* @param style The font style to create the peer for.
+ *
* @return The peer for the specified font name.
+ *
+ * @deprecated
*/
protected abstract FontPeer getFontPeer(String name, int style);
@@ -416,6 +436,8 @@
* Returns the color model of the screen.
*
* @return The color model of the screen.
+ *
+ * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
*/
public abstract ColorModel getColorModel();
@@ -430,6 +452,7 @@
* Return the font metrics for the specified font
*
* @param name The name of the font to return metrics for.
+ *
* @return The requested font metrics.
*/
public abstract FontMetrics getFontMetrics(Font name);
@@ -700,7 +723,7 @@
* default value if the property does not exist.
*
* @param key The name of the property to retrieve.
- * @param defThe default value of the property.
+ * @param def The default value of the property.
*/
public static String getProperty(String key, String def)
{