aboutsummaryrefslogtreecommitdiff
path: root/libjava/classpath/javax/swing/JToolBar.java
diff options
context:
space:
mode:
authorMark Wielaard <mark@gcc.gnu.org>2006-05-18 17:29:21 +0000
committerMark Wielaard <mark@gcc.gnu.org>2006-05-18 17:29:21 +0000
commit4f9533c7722fa07511a94d005227961f4a4dec23 (patch)
tree9f9c470de62ee62fba1331a396450d728d2b1fad /libjava/classpath/javax/swing/JToolBar.java
parenteaec4980e139903ae9b274d1abcf3a13946603a8 (diff)
downloadgcc-4f9533c7722fa07511a94d005227961f4a4dec23.zip
gcc-4f9533c7722fa07511a94d005227961f4a4dec23.tar.gz
gcc-4f9533c7722fa07511a94d005227961f4a4dec23.tar.bz2
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
Diffstat (limited to 'libjava/classpath/javax/swing/JToolBar.java')
-rw-r--r--libjava/classpath/javax/swing/JToolBar.java35
1 files changed, 18 insertions, 17 deletions
diff --git a/libjava/classpath/javax/swing/JToolBar.java b/libjava/classpath/javax/swing/JToolBar.java
index a508ee6..b576b4f 100644
--- a/libjava/classpath/javax/swing/JToolBar.java
+++ b/libjava/classpath/javax/swing/JToolBar.java
@@ -50,7 +50,6 @@ import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleStateSet;
-import javax.swing.JButton;
import javax.swing.plaf.ToolBarUI;
/**
@@ -66,17 +65,15 @@ import javax.swing.plaf.ToolBarUI;
public class JToolBar extends JComponent implements SwingConstants, Accessible
{
/**
- * AccessibleJToolBar
+ * Provides the accessibility features for the <code>JToolBar</code>
+ * component.
*/
- // FIXME: This inner class is a complete stub and must be implemented
- // properly.
protected class AccessibleJToolBar extends AccessibleJComponent
{
- /** DOCUMENT ME! */
private static final long serialVersionUID = -5516888265903814215L;
/**
- * Constructor AccessibleJToolBar
+ * Creates a new <code>AccessibleJToolBar</code> instance.
*/
protected AccessibleJToolBar()
{
@@ -84,19 +81,23 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
}
/**
- * getAccessibleStateSet
+ * Returns a set containing the current state of the {@link JToolBar}
+ * component. The current implementation simply calls the superclass.
*
- * @return AccessibleStateSet
+ * @return The accessible state set.
*/
public AccessibleStateSet getAccessibleStateSet()
{
- return null; // TODO
+ // running tests against the reference implementation, I was unable
+ // to find any state information that is set specifically by the
+ // tool bar...
+ return super.getAccessibleStateSet();
}
/**
- * getAccessibleRole
+ * Returns the accessible role for the <code>JToolBar</code> component.
*
- * @return AccessibleRole
+ * @return {@link AccessibleRole#TOOL_BAR}.
*/
public AccessibleRole getAccessibleRole()
{
@@ -426,8 +427,9 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
setOrientation(orientation);
setLayout(new DefaultToolBarLayout());
revalidate();
+ setOpaque(true);
updateUI();
- } // JToolBar()
+ }
/**
* This method adds a new JButton that performs the given Action to the
@@ -481,9 +483,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
public void updateUI()
{
setUI((ToolBarUI) UIManager.getUI(this));
- revalidate();
- repaint();
- } // updateUI()
+ }
/**
* This method returns the String identifier for the UI class to the used
@@ -767,9 +767,10 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
} // paramString()
/**
- * getAccessibleContext
+ * Returns the object that provides accessibility features for this
+ * <code>JToolBar</code> component.
*
- * @return AccessibleContext
+ * @return The accessible context (an instance of {@link AccessibleJToolBar}).
*/
public AccessibleContext getAccessibleContext()
{