From 4f9533c7722fa07511a94d005227961f4a4dec23 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 18 May 2006 17:29:21 +0000 Subject: Imported GNU Classpath 0.90 Imported GNU Classpath 0.90 * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale. * sources.am: Regenerated. * gcj/javaprims.h: Regenerated. * Makefile.in: Regenerated. * gcj/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * testsuite/Makefile.in: Regenerated. * gnu/java/lang/VMInstrumentationImpl.java: New override. * gnu/java/net/local/LocalSocketImpl.java: Likewise. * gnu/classpath/jdwp/VMMethod.java: Likewise. * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest interface. * java/lang/Thread.java: Add UncaughtExceptionHandler. * java/lang/reflect/Method.java: Implements GenericDeclaration and isSynthetic(), * java/lang/reflect/Field.java: Likewise. * java/lang/reflect/Constructor.java * java/lang/Class.java: Implements Type, GenericDeclaration, getSimpleName() and getEnclosing*() methods. * java/lang/Class.h: Add new public methods. * java/lang/Math.java: Add signum(), ulp() and log10(). * java/lang/natMath.cc (log10): New function. * java/security/VMSecureRandom.java: New override. * java/util/logging/Logger.java: Updated to latest classpath version. * java/util/logging/LogManager.java: New override. From-SVN: r113887 --- libjava/classpath/javax/swing/JButton.java | 129 +++++++++++++++++++++++++---- 1 file changed, 111 insertions(+), 18 deletions(-) (limited to 'libjava/classpath/javax/swing/JButton.java') diff --git a/libjava/classpath/javax/swing/JButton.java b/libjava/classpath/javax/swing/JButton.java index ff0ecfc..787adb8 100644 --- a/libjava/classpath/javax/swing/JButton.java +++ b/libjava/classpath/javax/swing/JButton.java @@ -1,5 +1,5 @@ /* JButton.java -- - Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -72,49 +72,82 @@ public class JButton extends AbstractButton } private static final long serialVersionUID = -1907255238954382202L; - boolean def; - boolean is_def; + /** + * Indicates if this button is capable to become the default button. + */ + private boolean defaultCapable; + + /** + * Creates a new button with an empty string for the button text and no + * icon. + */ public JButton() { this(null, null); } + /** + * Creates a new button from the specified action. + * + * @param a the action (null permitted). + * + * @see AbstractButton#setAction(Action) + */ public JButton(Action a) { this(); setAction(a); } + /** + * Creates a new button with the specified icon (and an empty string for + * the button text). + * + * @param icon the icon (null permitted). + */ public JButton(Icon icon) { this(null, icon); } + /** + * Creates a new button with the specified text and no icon. + * + * @param text the button text (null permitted, will be + * substituted by an empty string). + */ public JButton(String text) { this(text, null); } + /** + * Creates a new button with the specified text and icon. + * + * @param text the button text (null permitted, will be + * substituted by an empty string). + * @param icon the icon (null permitted). + */ public JButton(String text, Icon icon) { super(); init(text, icon); setModel(new DefaultButtonModel()); - } - - public Object[] getSelectedObjects() - { - return null; + defaultCapable = true; } protected void configurePropertiesFromAction(Action a) - { - // Factory method which sets the AbstractButton's properties according to - // values from the Action instance. + { super.configurePropertiesFromAction(a); } + /** + * Returns the object that provides accessibility features for this + * JButton component. + * + * @return The accessible context (an instance of {@link AccessibleJButton}). + */ public AccessibleContext getAccessibleContext() { if (accessibleContext == null) @@ -122,6 +155,13 @@ public class JButton extends AbstractButton return accessibleContext; } + /** + * Returns the suffix ("ButtonUI" in this case) used to + * determine the class name for a UI delegate that can provide the look and + * feel for a JButton. + * + * @return "ButtonUI". + */ public String getUIClassID() { // Returns a string that specifies the name of the L&F class that renders @@ -129,28 +169,65 @@ public class JButton extends AbstractButton return "ButtonUI"; } + /** + * Returns true if this button is the default button in + * its JRootPane. The default button gets automatically + * activated when the user presses ENTER (or whatever + * key this is bound to in the current Look and Feel). + * + * @return true if this button is the default button in + * its JRootPane + * + * @see #isDefaultCapable() + * @see #setDefaultCapable(boolean) + * @see JRootPane#getDefaultButton() + * @see JRootPane#setDefaultButton(JButton) + */ public boolean isDefaultButton() { - // Returns whether or not this button is the default button on the - // RootPane. - return is_def; + // The default button is managed by the JRootPane, so the safest way + // to determine this property is to ask the root pane of this button, + // if it exists. + JRootPane rp = SwingUtilities.getRootPane(this); + boolean isDefault = false; + if (rp != null) + isDefault = rp.getDefaultButton() == this; + return isDefault; } + /** + * Returns true if this button can act as the default button. + * This is true by default. + * + * @return true if this button can act as the default button + * + * @see #setDefaultCapable(boolean) + * @see #isDefaultButton() + * @see JRootPane#getDefaultButton() + * @see JRootPane#setDefaultButton(JButton) + */ public boolean isDefaultCapable() { // Returns whether or not this button is capable of being the default // button on the RootPane. - return def; + return defaultCapable; } + /** + * Returns an implementation-dependent string describing the attributes of + * this JButton. + * + * @return A string describing the attributes of this JButton + * (never null). + */ protected String paramString() { String superParam = super.paramString(); // 41 is the maximum number of chars which may be needed. StringBuffer sb = new StringBuffer(41); - sb.append(",defaultButton=").append(is_def); - sb.append(",defaultCapable=").append(def); + sb.append(",defaultButton=").append(isDefaultButton()); + sb.append(",defaultCapable=").append(defaultCapable); return superParam + sb.toString(); } @@ -169,11 +246,27 @@ public class JButton extends AbstractButton super.removeNotify(); } + /** + * Sets the defaultCapable property which indicates if + * this button may become the default button in its JRootPane. + * + * @param defaultCapable true if this button can become the + * default button in its JRootPane, false otherwise + * + * @see #setDefaultCapable(boolean) + * @see #isDefaultButton() + * @see JRootPane#getDefaultButton() + * @see JRootPane#setDefaultButton(JButton) + */ public void setDefaultCapable(boolean defaultCapable) { - def = defaultCapable; + this.defaultCapable = defaultCapable; } + /** + * Sets this button's UI delegate to the default (obtained from the + * {@link UIManager}) for the current look and feel. + */ public void updateUI() { setUI((ButtonUI) UIManager.getUI(this)); -- cgit v1.1