[commit-cp] classpath/javax/swing JCheckBoxMenuItem.java

[Tania Bento]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Changes by:     Tania Bento <tbento>    06/06/14 14:00:39

Modified files:
        javax/swing    : JCheckBoxMenuItem.java 

Log message:
                2006-06-14  Tania Bento  <address@hidden>
        
                * javax/swing/JCheckBoxMenuItem.java
                (JCheckBoxMenuItem): Added check to set the selected state.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JCheckBoxMenuItem.java?cvsroot=classpath&r1=1.16&r2=1.17

Patches:
Index: JCheckBoxMenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JCheckBoxMenuItem.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- JCheckBoxMenuItem.java      14 May 2006 21:00:28 -0000      1.16
+++ JCheckBoxMenuItem.java      14 Jun 2006 14:00:39 -0000      1.17
@@ -1,39 +1,39 @@
 /* JCheckBoxMenuItem.java --
    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 address@hidden JCheckBox}. Just like the <code>JCheckBox</code>, user 
can check
+ * A menu item that displays a checkbox. Its behaviour is very similar to
+ * address@hidden JCheckBox}. Just like the <code>JCheckBox</code>, user can 
check
  * and uncheck this menu item by clicking on it. Also
- * address@hidden AbstractButton#setSelected} and address@hidden #setState} 
can be use used
- * for the same purpose.
- * <code>JCheckBoxMenuItem</code> uses
+ * address@hidden AbstractButton#setSelected} and address@hidden #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];
 
@@ -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,19 +134,20 @@
   }
 
   /**
-   * 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)
   {
     super(text, icon);
     setModel(new JToggleButton.ToggleButtonModel());
     this.state = state;
+    if (state == true)
     this.setVisible(true);
   }
 
@@ -164,8 +165,8 @@
   /**
    * 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,9 +174,8 @@
   }
 
   /**
-   * 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
    */
@@ -185,11 +185,11 @@
   }
 
   /**
-   * This method returns array containing label of this
-   * menu item if it is selected and 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.
+   * @return Array containing label of this menu item if this menu item is
+   *         selected or null otherwise.
    */
   public Object[] getSelectedObjects()
   {
@@ -202,9 +202,8 @@
   }
 
   /**
-    * 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()
   {
@@ -248,7 +247,8 @@
    * 
    * @see JCheckBoxMenuItem#getAccessibleContext()
    */
-  protected class AccessibleJCheckBoxMenuItem extends AccessibleJMenuItem
+  protected class AccessibleJCheckBoxMenuItem
+      extends AccessibleJMenuItem
   {
     private static final long serialVersionUID = 1079958073579370777L;