Hey,
Changed the horizontal alignment from JButton.LEFT to JButton.LEADING.
Could someone please approve this and commit it for me. Thanks.
2006-06-13 Tania Bento <[EMAIL PROTECTED]>
* javax/swing/JMenuItem.java
(init): Changed horizontalAlignment from JButton.LEFT to
JButton.LEADING.
Cheers,
Tania
Index: AbstractButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/AbstractButton.java,v
retrieving revision 1.58
diff -u -r1.58 AbstractButton.java
--- AbstractButton.java 8 May 2006 08:57:57 -0000 1.58
+++ AbstractButton.java 13 Jun 2006 15:44:45 -0000
@@ -866,7 +866,7 @@
borderPainted = true;
contentAreaFilled = true;
focusPainted = true;
- setFocusable(true);
+ setFocusable(false);
setAlignmentX(CENTER_ALIGNMENT);
setAlignmentY(CENTER_ALIGNMENT);
setDisplayedMnemonicIndex(-1);
Index: BoxLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/BoxLayout.java,v
retrieving revision 1.27
diff -u -r1.27 BoxLayout.java
--- BoxLayout.java 6 Dec 2005 21:26:38 -0000 1.27
+++ BoxLayout.java 13 Jun 2006 15:44:45 -0000
@@ -233,10 +233,9 @@
public void layoutContainer(Container parent)
{
synchronized (container.getTreeLock())
- {
+ {
if (container != parent)
throw new AWTError("BoxLayout can't be shared");
-
checkLayout();
Component[] children = container.getComponents();
Insets in = container.getInsets();
Index: JCheckBoxMenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JCheckBoxMenuItem.java,v
retrieving revision 1.16
diff -u -r1.16 JCheckBoxMenuItem.java
--- JCheckBoxMenuItem.java 14 May 2006 21:00:28 -0000 1.16
+++ JCheckBoxMenuItem.java 13 Jun 2006 15:44:45 -0000
@@ -1,39 +1,39 @@
/* JCheckBoxMenuItem.java --
- Copyright (C) 2002, 2004, 2006, Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2006, Free Software Foundation, Inc.
-This file is part of GNU Classpath.
+ This file is part of GNU Classpath.
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
+ GNU Classpath is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ GNU Classpath is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU Classpath; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from
+ or based on this library. If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version. */
package javax.swing;
@@ -43,20 +43,20 @@
import javax.accessibility.AccessibleRole;
/**
- * A menu item that displays a checkbox. Its behaviour is very similar
- * to [EMAIL PROTECTED] JCheckBox}. Just like the <code>JCheckBox</code>, user can check
+ * A menu item that displays a checkbox. Its behaviour is very similar to
+ * [EMAIL PROTECTED] JCheckBox}. Just like the <code>JCheckBox</code>, user can check
* and uncheck this menu item by clicking on it. Also
- * [EMAIL PROTECTED] AbstractButton#setSelected} and [EMAIL PROTECTED] #setState} can be use used
- * for the same purpose.
- * <code>JCheckBoxMenuItem</code> uses
+ * [EMAIL PROTECTED] AbstractButton#setSelected} and [EMAIL PROTECTED] #setState} can be use used for
+ * the same purpose. <code>JCheckBoxMenuItem</code> uses
* <code>ToggleButtonModel</code> to keep track of its selection.
- *
+ *
* @author original author unknown
*/
-public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants,
- Accessible
+public class JCheckBoxMenuItem
+ extends JMenuItem
+ implements SwingConstants, Accessible
{
- private static final long serialVersionUID = -6676402307973384715L;
+ private static final long serialVersionUID = - 6676402307973384715L;
/** name for the UI delegate for this menuItem. */
private static final String uiClassID = "CheckBoxMenuItemUI";
@@ -65,8 +65,8 @@
private boolean state;
/**
- * This array contains text of this menu item if this menu item is in
- * checked state and null it is not.
+ * This array contains text of this menu item if this menu item is in checked
+ * state and null it is not.
*/
private Object[] selectedObjects = new Object[1];
@@ -80,7 +80,7 @@
/**
* Creates a new JCheckBoxMenuItem with given icon
- *
+ *
* @param icon Icon for this menu item
*/
public JCheckBoxMenuItem(Icon icon)
@@ -90,7 +90,7 @@
/**
* Creates a new JCheckBoxMenuItem with given label
- *
+ *
* @param text Label for this menu item
*/
public JCheckBoxMenuItem(String text)
@@ -100,7 +100,7 @@
/**
* Creates a new JCheckBoxMenuItem using given action
- *
+ *
* @param action Action for this menu item.
*/
public JCheckBoxMenuItem(Action action)
@@ -111,7 +111,7 @@
/**
* Creates a new JCheckBoxMenuItem object with given label and icon
- *
+ *
* @param text Label for this menu item
* @param icon Icon for this menu item
*/
@@ -121,12 +121,12 @@
}
/**
- * Creates a new JCheckBoxMenuItem object using specified label and
- * marked as checked if given 'state' is true.
- *
+ * Creates a new JCheckBoxMenuItem object using specified label and marked as
+ * checked if given 'state' is true.
+ *
* @param text Label for this menu item
- * @param state <code>true</code> if this item should be in checked state and
- * <code>false</code> otherwise
+ * @param state <code>true</code> if this item should be in checked state
+ * and <code>false</code> otherwise
*/
public JCheckBoxMenuItem(String text, boolean state)
{
@@ -134,13 +134,13 @@
}
/**
- * Creates a new JCheckBoxMenuItem object with given label, icon,
- * and marked as checked if given 'state' is true.
- *
+ * Creates a new JCheckBoxMenuItem object with given label, icon, and marked
+ * as checked if given 'state' is true.
+ *
* @param text Label for this menu item
* @param icon icon for this menu item
- * @param state <code>true</code> if this item should be in checked state and
- * false otherwise
+ * @param state <code>true</code> if this item should be in checked state
+ * and false otherwise
*/
public JCheckBoxMenuItem(String text, Icon icon, boolean state)
{
@@ -148,12 +148,14 @@
setModel(new JToggleButton.ToggleButtonModel());
this.state = state;
this.setVisible(true);
+ if (state == true)
+ this.setSelected(true);
}
/**
* This method returns a name to identify which look and feel class will be
* the UI delegate for the menuItem.
- *
+ *
* @return The Look and Feel classID. "JCheckBoxMenuItemUI"
*/
public String getUIClassID()
@@ -163,9 +165,9 @@
/**
* Returns checked state for this check box menu item.
- *
- * @return Returns true if this menu item is in checked state
- * and false otherwise.
+ *
+ * @return Returns true if this menu item is in checked state and false
+ * otherwise.
*/
public boolean getState()
{
@@ -173,10 +175,9 @@
}
/**
- * Sets state for this check box menu item. If
- * given 'state' is true, then mark menu item as checked,
- * and uncheck this menu item otherwise.
- *
+ * Sets state for this check box menu item. If given 'state' is true, then
+ * mark menu item as checked, and uncheck this menu item otherwise.
+ *
* @param state new state for this menu item
*/
public synchronized void setState(boolean state)
@@ -185,11 +186,11 @@
}
/**
- * This method returns array containing label of this
- * menu item if it is selected and null otherwise.
- *
- * @return Array containing label of this
- * menu item if this menu item is selected or null otherwise.
+ * This method returns array containing label of this menu item if it is
+ * selected and null otherwise.
+ *
+ * @return Array containing label of this menu item if this menu item is
+ * selected or null otherwise.
*/
public Object[] getSelectedObjects()
{
@@ -202,27 +203,26 @@
}
/**
- * This method overrides JComponent.requestFocus with an empty
- * implementation, since JCheckBoxMenuItems should not
- * receive focus in general.
- */
+ * This method overrides JComponent.requestFocus with an empty implementation,
+ * since JCheckBoxMenuItems should not receive focus in general.
+ */
public void requestFocus()
{
- // Should do nothing here
+ // Should do nothing here
}
/**
- * Returns a string describing the attributes for the
- * <code>JCheckBoxMenuItem</code> component, for use in debugging. The
- * return value is guaranteed to be non-<code>null</code>, but the format
+ * Returns a string describing the attributes for the
+ * <code>JCheckBoxMenuItem</code> component, for use in debugging. The
+ * return value is guaranteed to be non-<code>null</code>, but the format
* of the string may vary between implementations.
- *
- * @return A string describing the attributes of the
- * <code>JCheckBoxMenuItem</code>.
+ *
+ * @return A string describing the attributes of the
+ * <code>JCheckBoxMenuItem</code>.
*/
protected String paramString()
{
- // calling super seems to be sufficient to match the reference
+ // calling super seems to be sufficient to match the reference
// implementation here...
return super.paramString();
}
@@ -230,9 +230,9 @@
/**
* Returns the object that provides accessibility features for this
* <code>JCheckBoxMenuItem</code> component.
- *
- * @return The accessible context (an instance of
- * [EMAIL PROTECTED] AccessibleJCheckBoxMenuItem}).
+ *
+ * @return The accessible context (an instance of
+ * [EMAIL PROTECTED] AccessibleJCheckBoxMenuItem}).
*/
public AccessibleContext getAccessibleContext()
{
@@ -243,12 +243,13 @@
}
/**
- * Provides the accessibility features for the <code>JCheckBoxMenuItem</code>
+ * Provides the accessibility features for the <code>JCheckBoxMenuItem</code>
* component.
*
* @see JCheckBoxMenuItem#getAccessibleContext()
*/
- protected class AccessibleJCheckBoxMenuItem extends AccessibleJMenuItem
+ protected class AccessibleJCheckBoxMenuItem
+ extends AccessibleJMenuItem
{
private static final long serialVersionUID = 1079958073579370777L;
@@ -261,9 +262,9 @@
}
/**
- * Returns the accessible role for the <code>JCheckBoxMenuItem</code>
+ * Returns the accessible role for the <code>JCheckBoxMenuItem</code>
* component.
- *
+ *
* @return [EMAIL PROTECTED] AccessibleRole#CHECK_BOX}.
*/
public AccessibleRole getAccessibleRole()
Index: JMenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenuItem.java,v
retrieving revision 1.31
diff -u -r1.31 JMenuItem.java
--- JMenuItem.java 31 May 2006 12:21:34 -0000 1.31
+++ JMenuItem.java 13 Jun 2006 15:44:45 -0000
@@ -184,7 +184,7 @@
out statement below for now. */
//borderPainted = false;
focusPainted = false;
- horizontalAlignment = JButton.LEFT;
+ horizontalAlignment = JButton.LEADING;
horizontalTextPosition = JButton.TRAILING;
}
