From 3698213505b9a06c30abb54e4e7afb1ae782b691 Mon Sep 17 00:00:00 2001 From: mkoch Date: Thu, 13 Feb 2003 07:02:12 +0000 Subject: [PATCH] 2003-02-13 Michael Koch * 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/Toolkit.java: Added some empty lines to make documentation more readable. (getFontPeer): Added @deprecated. (getColorModel): Added exception documentation. (getProperty): Fixed documentation. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62822 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 15 ++++++++++ libjava/java/awt/GridBagConstraints.java | 46 ++++++++++++++++++++++++++++++ libjava/java/awt/KeyboardFocusManager.java | 2 +- libjava/java/awt/MenuComponent.java | 2 +- libjava/java/awt/Toolkit.java | 29 ++++++++++++++++++- 5 files changed, 91 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index fa7eae412be..3f31061468f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,18 @@ +2003-02-13 Michael Koch + + * 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/Toolkit.java: + Added some empty lines to make documentation more readable. + (getFontPeer): Added @deprecated. + (getColorModel): Added exception documentation. + (getProperty): Fixed documentation. + 2003-02-12 Jeff Sturm * configure.host (alpha*-*): Default to -mieee. diff --git a/libjava/java/awt/GridBagConstraints.java b/libjava/java/awt/GridBagConstraints.java index 57356ad8ef7..651cfdc1999 100644 --- a/libjava/java/awt/GridBagConstraints.java +++ b/libjava/java/awt/GridBagConstraints.java @@ -80,6 +80,52 @@ public class GridBagConstraints implements Cloneable, Serializable /** 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; diff --git a/libjava/java/awt/KeyboardFocusManager.java b/libjava/java/awt/KeyboardFocusManager.java index 2680894b8df..867316ba843 100644 --- a/libjava/java/awt/KeyboardFocusManager.java +++ b/libjava/java/awt/KeyboardFocusManager.java @@ -386,7 +386,7 @@ public abstract class KeyboardFocusManager return focusCycleRoot; } - protected void setGlobalCurrentFocusCycleRoot(Container cycleRoot) + public void setGlobalCurrentFocusCycleRoot(Container cycleRoot) { firePropertyChange("currentFocusCycleRoot", focusCycleRoot, cycleRoot); focusCycleRoot = cycleRoot; diff --git a/libjava/java/awt/MenuComponent.java b/libjava/java/awt/MenuComponent.java index 548aa77937a..09c25c9d1af 100644 --- a/libjava/java/awt/MenuComponent.java +++ b/libjava/java/awt/MenuComponent.java @@ -95,7 +95,7 @@ private static transient Toolkit toolkit = Toolkit.getDefaultToolkit(); * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ -protected +public MenuComponent() { if (GraphicsEnvironment.isHeadless()) diff --git a/libjava/java/awt/Toolkit.java b/libjava/java/awt/Toolkit.java index 225ef5b0edb..7fc3ac0e164 100644 --- a/libjava/java/awt/Toolkit.java +++ b/libjava/java/awt/Toolkit.java @@ -134,6 +134,7 @@ public abstract class Toolkit * Creates a peer object for the specified TextField. * * @param target The TextField to create the peer for. + * * @return The peer for the specified TextField object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -144,6 +145,7 @@ public abstract class Toolkit * Creates a peer object for the specified Label. * * @param target The Label to create the peer for. + * * @return The peer for the specified Label object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -154,6 +156,7 @@ public abstract class Toolkit * Creates a peer object for the specified List. * * @param target The List to create the peer for. + * * @return The peer for the specified List object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -164,6 +167,7 @@ public abstract class Toolkit * Creates a peer object for the specified Checkbox. * * @param target The Checkbox to create the peer for. + * * @return The peer for the specified Checkbox object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -174,6 +178,7 @@ public abstract class Toolkit * Creates a peer object for the specified Scrollbar. * * @param target The Scrollbar to create the peer for. + * * @return The peer for the specified Scrollbar object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -184,6 +189,7 @@ public abstract class Toolkit * Creates a peer object for the specified ScrollPane. * * @param target The ScrollPane to create the peer for. + * * @return The peer for the specified ScrollPane object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -194,6 +200,7 @@ public abstract class Toolkit * Creates a peer object for the specified TextArea. * * @param target The TextArea to create the peer for. + * * @return The peer for the specified TextArea object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -204,6 +211,7 @@ public abstract class Toolkit * Creates a peer object for the specified Choice. * * @param target The Choice to create the peer for. + * * @return The peer for the specified Choice object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -214,6 +222,7 @@ public abstract class Toolkit * Creates a peer object for the specified Frame. * * @param target The Frame to create the peer for. + * * @return The peer for the specified Frame object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -224,6 +233,7 @@ public abstract class Toolkit * Creates a peer object for the specified Canvas. * * @param target The Canvas to create the peer for. + * * @return The peer for the specified Canvas object. */ protected abstract CanvasPeer createCanvas(Canvas target); @@ -232,6 +242,7 @@ public abstract class Toolkit * Creates a peer object for the specified Panel. * * @param target The Panel to create the peer for. + * * @return The peer for the specified Panel object. */ protected abstract PanelPeer createPanel(Panel target); @@ -240,6 +251,7 @@ public abstract class Toolkit * Creates a peer object for the specified Window. * * @param target The Window to create the peer for. + * * @return The peer for the specified Window object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -250,6 +262,7 @@ public abstract class Toolkit * Creates a peer object for the specified Dialog. * * @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 @@ public abstract class Toolkit * Creates a peer object for the specified MenuBar. * * @param target The MenuBar to create the peer for. + * * @return The peer for the specified MenuBar object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -270,6 +284,7 @@ public abstract class Toolkit * Creates a peer object for the specified Menu. * * @param target The Menu to create the peer for. + * * @return The peer for the specified Menu object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -280,6 +295,7 @@ public abstract class Toolkit * Creates a peer object for the specified PopupMenu. * * @param target The PopupMenu to create the peer for. + * * @return The peer for the specified PopupMenu object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -290,6 +306,7 @@ public abstract class Toolkit * Creates a peer object for the specified MenuItem. * * @param target The MenuItem to create the peer for. + * * @return The peer for the specified MenuItem object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -300,6 +317,7 @@ public abstract class Toolkit * Creates a peer object for the specified FileDialog. * * @param target The FileDialog to create the peer for. + * * @return The peer for the specified FileDialog object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -310,6 +328,7 @@ public abstract class Toolkit * Creates a peer object for the specified CheckboxMenuItem. * * @param target The CheckboxMenuItem to create the peer for. + * * @return The peer for the specified CheckboxMenuItem object. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. @@ -326,6 +345,7 @@ public abstract class Toolkit * XXX: FIXME * * @param target The Component to create the peer for. + * * @return The peer for the specified Component object. */ protected LightweightPeer createComponent(Component target) @@ -338,7 +358,10 @@ public abstract class Toolkit * * @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 +439,8 @@ public abstract class Toolkit * 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 +455,7 @@ public abstract class Toolkit * 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); @@ -647,6 +673,7 @@ public abstract class Toolkit * component. * * @param component The component to fetch the native container for. + * * @return The native container object for this component. */ protected static Container getNativeContainer(Component component) @@ -700,7 +727,7 @@ public abstract class Toolkit * 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) { -- 2.11.0