[gui][PATCH] Menu Items: fixed style and comments
Olga Rodimina
rodimina@redhat.com
Mon Apr 26 16:30:00 GMT 2004
Hi,
I ran some of the menu item's files in javax/swing through JALOPY to fix
the style and also removed unnecessary comments. I will be committing
these changes to java-gui-branch.
Olga.
-------------- next part --------------
? .snprj
? libjava.proj
? patch
? javax/swing/patch
? javax/swing/plaf/basic/patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2660.2.75
diff -c -p -u -r1.2660.2.75 ChangeLog
--- ChangeLog 23 Apr 2004 21:37:42 -0000 1.2660.2.75
+++ ChangeLog 26 Apr 2004 16:09:56 -0000
@@ -1,3 +1,13 @@
+2004-04-26 Olga Rodimina <rodimina@redhat.com>
+
+ * javax/swing/JCheckBoxMenuItem.java:
+ Fixed style and removed unnecessary comments.
+ * javax/swing/JMenuItem.java: Ditto.
+ * javax/swing/JRadioButtonMenuItem.java: Ditto.
+ * javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java: Ditto.
+ * javax/swing/plaf/basic/BasicMenuItemUI.java: Ditto.
+ * javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: Ditto.
+
2004-04-23 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu_java_awt_peer_gtk_GtkWindowPeer.c: Change FIXME comment to
Index: javax/swing/JCheckBoxMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JCheckBoxMenuItem.java,v
retrieving revision 1.3.8.1
diff -c -p -u -r1.3.8.1 JCheckBoxMenuItem.java
--- javax/swing/JCheckBoxMenuItem.java 2 Apr 2004 20:00:52 -0000 1.3.8.1
+++ javax/swing/JCheckBoxMenuItem.java 26 Apr 2004 16:09:57 -0000
@@ -1,4 +1,4 @@
-/* JCheckBoxMenuItem.java --
+/* JCheckBoxMenuItem.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -45,129 +45,206 @@ import javax.accessibility.AccessibleCon
import javax.accessibility.AccessibleRole;
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants,
Accessible
{
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
private static final String uiClassID = "CheckBoxMenuItemUI";
private boolean state;
private Object[] selectedObjects;
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
- public JCheckBoxMenuItem()
+ /**
+ * Creates a new JCheckBoxMenuItem object.
+ */
+ public JCheckBoxMenuItem ()
{
this(null, null);
- } // JCheckBoxMenuItem()
+ }
- public JCheckBoxMenuItem(Icon icon)
+ /**
+ * Creates a new JCheckBoxMenuItem object.
+ *
+ * @param icon DOCUMENT ME!
+ */
+ public JCheckBoxMenuItem (Icon icon)
{
this(null, icon);
- } // JCheckBoxMenuItem()
+ }
- public JCheckBoxMenuItem(String text)
+ /**
+ * Creates a new JCheckBoxMenuItem object.
+ *
+ * @param text DOCUMENT ME!
+ */
+ public JCheckBoxMenuItem (String text)
{
this(text, null);
- } // JCheckBoxMenuItem()
+ }
- public JCheckBoxMenuItem(Action action)
+ /**
+ * Creates a new JCheckBoxMenuItem object.
+ *
+ * @param action DOCUMENT ME!
+ */
+ public JCheckBoxMenuItem (Action action)
{
this();
- setAction(action);
- } // JCheckBoxMenuItem()
+ setAction (action);
+ }
- public JCheckBoxMenuItem(String text, Icon icon)
+ /**
+ * Creates a new JCheckBoxMenuItem object.
+ *
+ * @param text DOCUMENT ME!
+ * @param icon DOCUMENT ME!
+ */
+ public JCheckBoxMenuItem (String text, Icon icon)
{
this(text, icon, false);
- } // JCheckBoxMenuItem()
+ }
- public JCheckBoxMenuItem(String text, boolean state)
+ /**
+ * Creates a new JCheckBoxMenuItem object.
+ *
+ * @param text DOCUMENT ME!
+ * @param state DOCUMENT ME!
+ */
+ public JCheckBoxMenuItem (String text, boolean state)
{
this(text, null, state);
- } // JCheckBoxMenuItem()
+ }
- public JCheckBoxMenuItem(String text, Icon icon, boolean state)
+ /**
+ * Creates a new JCheckBoxMenuItem object.
+ *
+ * @param text DOCUMENT ME!
+ * @param icon DOCUMENT ME!
+ * @param state DOCUMENT ME!
+ */
+ public JCheckBoxMenuItem (String text, Icon icon, boolean state)
{
super(text, icon);
- setModel(new JToggleButton.ToggleButtonModel());
+ setModel (new JToggleButton.ToggleButtonModel());
this.state = state;
- } // JCheckBoxMenuItem()
+ }
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
- private void writeObject(ObjectOutputStream stream) throws IOException
+ /**
+ * DOCUMENT ME!
+ *
+ * @param stream DOCUMENT ME!
+ *
+ * @throws IOException DOCUMENT ME!
+ */
+ private void writeObject (ObjectOutputStream stream)
+ throws IOException
{
// TODO
- } // writeObject()
+ }
- public String getUIClassID()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public String getUIClassID ()
{
return uiClassID;
- } // getUIClassID()
+ }
- public boolean getState()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public boolean getState ()
{
return state;
- } // getState()
+ }
- public synchronized void setState(boolean state)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param state DOCUMENT ME!
+ */
+ public synchronized void setState (boolean state)
{
this.state = state;
- } // setState()
+ }
- public Object[] getSelectedObjects()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public Object[] getSelectedObjects ()
{
return selectedObjects;
- } // getSelectedObjects()
+ }
- public void requestFocus()
+ /**
+ * DOCUMENT ME!
+ */
+ public void requestFocus ()
{
// TODO
- } // requestFocus()
+ }
- protected String paramString()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ protected String paramString ()
{
return "JCheckBoxMenuItem";
- } // paramString()
+ }
- public AccessibleContext getAccessibleContext()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public AccessibleContext getAccessibleContext ()
{
if (accessibleContext == null)
- {
- accessibleContext = new AccessibleJCheckBoxMenuItem(this);
- }
+ accessibleContext = new AccessibleJCheckBoxMenuItem(this);
return accessibleContext;
- } // getAccessibleContext()
+ }
- //-------------------------------------------------------------
- // Classes ----------------------------------------------------
- //-------------------------------------------------------------
+ /**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
protected class AccessibleJCheckBoxMenuItem extends AccessibleJMenuItem
{
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
- protected AccessibleJCheckBoxMenuItem(JCheckBoxMenuItem component)
+ /**
+ * Creates a new AccessibleJCheckBoxMenuItem object.
+ *
+ * @param component DOCUMENT ME!
+ */
+ protected AccessibleJCheckBoxMenuItem (JCheckBoxMenuItem component)
{
super(component);
// TODO
- } // AccessibleJCheckBoxMenuItem()
+ }
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
- public AccessibleRole getAccessibleRole()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public AccessibleRole getAccessibleRole ()
{
return AccessibleRole.CHECK_BOX;
- } // getAccessibleRole()
- } // AccessibleJCheckBoxMenuItem
-} // JCheckBoxMenuItem
+ }
+ }
+}
Index: javax/swing/JMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenuItem.java,v
retrieving revision 1.2.18.1
diff -c -p -u -r1.2.18.1 JMenuItem.java
--- javax/swing/JMenuItem.java 29 Mar 2004 17:19:42 -0000 1.2.18.1
+++ javax/swing/JMenuItem.java 26 Apr 2004 16:09:57 -0000
@@ -1,5 +1,5 @@
-/* JMenuItem.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+/* JMenuItem.java --
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,20 +35,23 @@ this exception to your version of the li
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
-
package javax.swing;
import java.awt.Component;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
+
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
+
import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -58,259 +61,456 @@ import javax.swing.event.MenuKeyEvent;
import javax.swing.event.MenuKeyListener;
import javax.swing.plaf.MenuItemUI;
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
public class JMenuItem extends AbstractButton implements Accessible,
MenuElement
{
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
private static final String uiClassID = "MenuItemUI";
private KeyStroke accelerator;
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
- public JMenuItem()
+ /**
+ * Creates a new JMenuItem object.
+ */
+ public JMenuItem ()
{
this(null, null);
- } // JMenuItem()
+ }
- public JMenuItem(Icon icon)
+ /**
+ * Creates a new JMenuItem object.
+ *
+ * @param icon DOCUMENT ME!
+ */
+ public JMenuItem (Icon icon)
{
this(null, icon);
- } // JMenuItem()
+ }
- public JMenuItem(String text)
+ /**
+ * Creates a new JMenuItem object.
+ *
+ * @param text DOCUMENT ME!
+ */
+ public JMenuItem (String text)
{
this(text, null);
- } // JMenuItem()
+ }
- public JMenuItem(Action action)
+ /**
+ * Creates a new JMenuItem object.
+ *
+ * @param action DOCUMENT ME!
+ */
+ public JMenuItem (Action action)
{
// TODO
- } // JMenuItem()
+ }
- public JMenuItem(String text, Icon icon)
+ /**
+ * Creates a new JMenuItem object.
+ *
+ * @param text DOCUMENT ME!
+ * @param icon DOCUMENT ME!
+ */
+ public JMenuItem (String text, Icon icon)
{
super(text, icon);
- } // JMenuItem()
+ }
- public JMenuItem(String text, int mnemonic)
+ /**
+ * Creates a new JMenuItem object.
+ *
+ * @param text DOCUMENT ME!
+ * @param mnemonic DOCUMENT ME!
+ */
+ public JMenuItem (String text, int mnemonic)
{
super(text, null);
- setMnemonic(mnemonic);
- } // JMenuItem()
+ setMnemonic (mnemonic);
+ }
//-------------------------------------------------------------
// Methods ----------------------------------------------------
//-------------------------------------------------------------
- private void readObject(ObjectInputStream stream)
- throws IOException, ClassNotFoundException
+ private void readObject (ObjectInputStream stream)
+ throws IOException, ClassNotFoundException
{
// TODO
- } // readObject()
-
- private void writeObject(ObjectOutputStream stream) throws IOException
- {
- // TODO
- } // writeObject()
-
- protected void init(String text, Icon icon)
- {
- // TODO
- } // init()
-
- public void setUI(MenuItemUI ui)
- {
- super.setUI(ui);
- } // setUI()
-
- public void updateUI()
- {
- MenuItemUI mi = ((MenuItemUI) UIManager.getUI(this));
- setUI(mi);
- invalidate();
- } // updateUI()
+ }
- public String getUIClassID()
+ /**
+ * DOCUMENT ME!
+ *
+ * @param stream DOCUMENT ME!
+ *
+ * @throws IOException DOCUMENT ME!
+ */
+ private void writeObject (ObjectOutputStream stream)
+ throws IOException
+ {
+ // TODO
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param text DOCUMENT ME!
+ * @param icon DOCUMENT ME!
+ */
+ protected void init (String text, Icon icon)
+ {
+ // TODO
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param ui DOCUMENT ME!
+ */
+ public void setUI (MenuItemUI ui)
+ {
+ super.setUI (ui);
+ }
+
+ /**
+ * DOCUMENT ME!
+ */
+ public void updateUI ()
+ {
+ MenuItemUI mi = ((MenuItemUI) UIManager.getUI (this));
+ setUI (mi);
+ invalidate ();
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public String getUIClassID ()
{
return uiClassID;
- } // getUIClassID()
-
- public boolean isArmed()
- {
- return getModel().isArmed();
- } // isArmed()
-
- public void setArmed(boolean armed)
- {
- getModel().setArmed(armed);
- } // setArmed()
+ }
- public void setEnabled(boolean enabled)
- {
- setEnabled(enabled);
- } // setEnabled()
-
- public KeyStroke getAccelerator()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public boolean isArmed ()
+ {
+ return getModel ().isArmed ();
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param armed DOCUMENT ME!
+ */
+ public void setArmed (boolean armed)
+ {
+ getModel ().setArmed (armed);
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param enabled DOCUMENT ME!
+ */
+ public void setEnabled (boolean enabled)
+ {
+ setEnabled (enabled);
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public KeyStroke getAccelerator ()
{
return accelerator;
- } // getAccelerator()
+ }
- public void setAccelerator(KeyStroke keystroke)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param keystroke DOCUMENT ME!
+ */
+ public void setAccelerator (KeyStroke keystroke)
{
this.accelerator = keystroke;
- } // setAccelerator()
+ }
- protected void configurePropertiesFromAction(Action action)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param action DOCUMENT ME!
+ */
+ protected void configurePropertiesFromAction (Action action)
{
- super.configurePropertiesFromAction(action);
+ super.configurePropertiesFromAction (action);
if (action == null)
- setAccelerator(null);
+ setAccelerator (null);
else
- setAccelerator((KeyStroke) (action.getValue(Action.ACCELERATOR_KEY)));
-
- } // configurePropertiesFromAction()
+ setAccelerator ((KeyStroke) (action.getValue (Action.ACCELERATOR_KEY)));
+ }
- protected PropertyChangeListener createActionPropertyChangeListener(Action action)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param action DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ protected PropertyChangeListener createActionPropertyChangeListener (Action action)
{
return null;
- } // createActionPropertyChangeListener()
+ }
- public void processMouseEvent(MouseEvent event, MenuElement[] path,
- MenuSelectionManager manager)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ * @param path DOCUMENT ME!
+ * @param manager DOCUMENT ME!
+ */
+ public void processMouseEvent (MouseEvent event, MenuElement[] path,
+ MenuSelectionManager manager)
{
// TODO
- } // processMouseEvent()
+ }
- public void processKeyEvent(KeyEvent event, MenuElement[] path,
- MenuSelectionManager manager)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ * @param path DOCUMENT ME!
+ * @param manager DOCUMENT ME!
+ */
+ public void processKeyEvent (KeyEvent event, MenuElement[] path,
+ MenuSelectionManager manager)
{
// TODO
- } // processKeyEvent()
+ }
- public void processMenuDragMouseEvent(MenuDragMouseEvent event)
- {
- } // processMenuDragMouseEvent()
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ */
+ public void processMenuDragMouseEvent (MenuDragMouseEvent event) {} // processMenuDragMouseEvent()
- public void processMenuKeyEvent(MenuKeyEvent event)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ */
+ public void processMenuKeyEvent (MenuKeyEvent event)
{
// TODO
- } // processMenuKeyEvent()
+ }
- protected void fireMenuDragMouseEntered(MenuDragMouseEvent event)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ */
+ protected void fireMenuDragMouseEntered (MenuDragMouseEvent event)
{
// TODO
- } // fireMenuDragMouseEntered()
+ }
- protected void fireMenuDragMouseExited(MenuDragMouseEvent event)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ */
+ protected void fireMenuDragMouseExited (MenuDragMouseEvent event)
{
// TODO
- } // fireMenuDragMouseExited()
+ }
- protected void fireMenuDragMouseDragged(MenuDragMouseEvent event)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ */
+ protected void fireMenuDragMouseDragged (MenuDragMouseEvent event)
{
// TODO
- } // fireMenuDragMouseDragged()
+ }
- protected void fireMenuDragMouseReleased(MenuDragMouseEvent event)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ */
+ protected void fireMenuDragMouseReleased (MenuDragMouseEvent event)
{
// TODO
- } // fireMenuDragMouseReleased()
+ }
- protected void fireMenuKeyPressed(MenuKeyEvent event)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ */
+ protected void fireMenuKeyPressed (MenuKeyEvent event)
{
// TODO
- } // fireMenuKeyPressed()
+ }
- protected void fireMenuKeyReleased(MenuKeyEvent event)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ */
+ protected void fireMenuKeyReleased (MenuKeyEvent event)
{
// TODO
- } // fireMenuKeyReleased()
+ }
- protected void fireMenuKeyTyped(MenuKeyEvent event)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ */
+ protected void fireMenuKeyTyped (MenuKeyEvent event)
{
// TODO
- } // fireMenuKeyTyped()
+ }
- public void menuSelectionChanged(boolean changed)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param changed DOCUMENT ME!
+ */
+ public void menuSelectionChanged (boolean changed)
{
// TODO
- } // menuSelectionChanged()
+ }
- public MenuElement[] getSubElements()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public MenuElement[] getSubElements ()
{
return null; // TODO
- } // getSubElements()
+ }
- public Component getComponent()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public Component getComponent ()
{
return null; // TODO
- } // getComponent()
+ }
- public void addMenuDragMouseListener(MenuDragMouseListener listener)
- {
- // TODO
- } // addMenuDragMouseListener()
-
- public void removeMenuDragMouseListener(MenuDragMouseListener listener)
- {
- } // removeMenuDragMouseListener()
-
- public void addMenuKeyListener(MenuKeyListener listener)
- {
- } // addMenuKeyListener()
-
- public void removeMenuKeyListener(MenuKeyListener listener)
- {
- } // removeMenuKeyListener()
-
- protected String paramString()
+ /**
+ * DOCUMENT ME!
+ *
+ * @param listener DOCUMENT ME!
+ */
+ public void addMenuDragMouseListener (MenuDragMouseListener listener)
+ {
+ // TODO
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param listener DOCUMENT ME!
+ */
+ public void removeMenuDragMouseListener (MenuDragMouseListener listener) {}
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param listener DOCUMENT ME!
+ */
+ public void addMenuKeyListener (MenuKeyListener listener) {}
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param listener DOCUMENT ME!
+ */
+ public void removeMenuKeyListener (MenuKeyListener listener) {}
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ protected String paramString ()
{
return "JMenuItem";
- } // paramString()
+ }
- public AccessibleContext getAccessibleContext()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public AccessibleContext getAccessibleContext ()
{
if (accessibleContext == null)
- {
- accessibleContext = new AccessibleJMenuItem(this);
- }
+ accessibleContext = new AccessibleJMenuItem(this);
return accessibleContext;
- } // getAccessibleContext()
+ }
- //-------------------------------------------------------------
- // Classes ----------------------------------------------------
- //-------------------------------------------------------------
+ /**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
protected class AccessibleJMenuItem extends AccessibleAbstractButton
implements ChangeListener
{
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
- AccessibleJMenuItem(JMenuItem component)
+ /**
+ * Creates a new AccessibleJMenuItem object.
+ *
+ * @param component DOCUMENT ME!
+ */
+ AccessibleJMenuItem (JMenuItem component)
{
super(component);
// TODO
- } // AccessibleJMenuItem()
+ }
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
- public void stateChanged(ChangeEvent event)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param event DOCUMENT ME!
+ */
+ public void stateChanged (ChangeEvent event)
{
// TODO
- } // stateChanged()
+ }
- public AccessibleRole getAccessibleRole()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public AccessibleRole getAccessibleRole ()
{
return AccessibleRole.MENU_ITEM;
- } // getAccessibleRole()
- } // AccessibleJMenuItem
-} // JMenuItem
+ }
+ }
+}
Index: javax/swing/JRadioButtonMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRadioButtonMenuItem.java,v
retrieving revision 1.3.8.2
diff -c -p -u -r1.3.8.2 JRadioButtonMenuItem.java
--- javax/swing/JRadioButtonMenuItem.java 2 Apr 2004 20:00:52 -0000 1.3.8.2
+++ javax/swing/JRadioButtonMenuItem.java 26 Apr 2004 16:09:57 -0000
@@ -1,4 +1,4 @@
-/* JRadioButtonMenuItem.java --
+/* JRadioButtonMenuItem.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -45,112 +45,184 @@ import javax.accessibility.AccessibleCon
import javax.accessibility.AccessibleRole;
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
public class JRadioButtonMenuItem extends JMenuItem implements Accessible
{
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
private static final String uiClassID = "RadioButtonMenuItemUI";
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
- public JRadioButtonMenuItem()
+ /**
+ * Creates a new JRadioButtonMenuItem object.
+ */
+ public JRadioButtonMenuItem ()
{
this(null, null);
- } // JRadioButtonMenuItem()
+ }
- public JRadioButtonMenuItem(Icon icon)
+ /**
+ * Creates a new JRadioButtonMenuItem object.
+ *
+ * @param icon DOCUMENT ME!
+ */
+ public JRadioButtonMenuItem (Icon icon)
{
this(null, icon);
- } // JRadioButtonMenuItem()
+ }
- public JRadioButtonMenuItem(String text)
+ /**
+ * Creates a new JRadioButtonMenuItem object.
+ *
+ * @param text DOCUMENT ME!
+ */
+ public JRadioButtonMenuItem (String text)
{
this(text, null);
- } // JRadioButtonMenuItem()
+ }
- public JRadioButtonMenuItem(Action action)
+ /**
+ * Creates a new JRadioButtonMenuItem object.
+ *
+ * @param action DOCUMENT ME!
+ */
+ public JRadioButtonMenuItem (Action action)
{
this();
- setAction(action);
- } // JRadioButtonMenuItem()
+ setAction (action);
+ }
- public JRadioButtonMenuItem(String text, Icon icon)
+ /**
+ * Creates a new JRadioButtonMenuItem object.
+ *
+ * @param text DOCUMENT ME!
+ * @param icon DOCUMENT ME!
+ */
+ public JRadioButtonMenuItem (String text, Icon icon)
{
this(text, icon, false);
- } // JRadioButtonMenuItem()
+ }
- public JRadioButtonMenuItem(String text, boolean selected)
+ /**
+ * Creates a new JRadioButtonMenuItem object.
+ *
+ * @param text DOCUMENT ME!
+ * @param selected DOCUMENT ME!
+ */
+ public JRadioButtonMenuItem (String text, boolean selected)
{
this(text, null, selected);
- } // JRadioButtonMenuItem()
+ }
- public JRadioButtonMenuItem(Icon icon, boolean selected)
+ /**
+ * Creates a new JRadioButtonMenuItem object.
+ *
+ * @param icon DOCUMENT ME!
+ * @param selected DOCUMENT ME!
+ */
+ public JRadioButtonMenuItem (Icon icon, boolean selected)
{
this(null, icon, selected);
- } // JRadioButtonMenuItem()
+ }
- public JRadioButtonMenuItem(String text, Icon icon, boolean selected)
- {
- super(text, icon);
- setModel(new JToggleButton.ToggleButtonModel());
- model.setSelected(selected);
- } // JRadioButtonMenuItem()
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
- private void writeObject(ObjectOutputStream stream) throws IOException
+ /**
+ * Creates a new JRadioButtonMenuItem object.
+ *
+ * @param text DOCUMENT ME!
+ * @param icon DOCUMENT ME!
+ * @param selected DOCUMENT ME!
+ */
+ public JRadioButtonMenuItem (String text, Icon icon, boolean selected)
+ {
+ super(text, icon);
+ setModel (new JToggleButton.ToggleButtonModel());
+ model.setSelected (selected);
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param stream DOCUMENT ME!
+ *
+ * @throws IOException DOCUMENT ME!
+ */
+ private void writeObject (ObjectOutputStream stream)
+ throws IOException
{
// TODO
- } // writeObject()
+ }
- public String getUIClassID()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public String getUIClassID ()
{
return uiClassID;
- } // getUIClassID()
+ }
- public void requestFocus()
+ /**
+ * DOCUMENT ME!
+ */
+ public void requestFocus ()
{
// TODO
- } // requestFocus()
+ }
- protected String paramString()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ protected String paramString ()
{
return "JRadioButtonMenuItem";
- } // paramString()
+ }
- public AccessibleContext getAccessibleContext()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public AccessibleContext getAccessibleContext ()
{
if (accessibleContext == null)
- {
- accessibleContext = new AccessibleJRadioButtonMenuItem(this);
- }
+ accessibleContext = new AccessibleJRadioButtonMenuItem(this);
+
return accessibleContext;
- } // getAccessibleContext()
+ }
- //-------------------------------------------------------------
- // Classes ----------------------------------------------------
- //-------------------------------------------------------------
+ /**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
protected class AccessibleJRadioButtonMenuItem extends AccessibleJMenuItem
{
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
- protected AccessibleJRadioButtonMenuItem(JRadioButtonMenuItem component)
+ /**
+ * Creates a new AccessibleJRadioButtonMenuItem object.
+ *
+ * @param component DOCUMENT ME!
+ */
+ protected AccessibleJRadioButtonMenuItem (JRadioButtonMenuItem component)
{
super(component);
// TODO
- } // AccessibleJRadioButtonMenuItem()
+ }
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
- public AccessibleRole getAccessibleRole()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public AccessibleRole getAccessibleRole ()
{
return AccessibleRole.RADIO_BUTTON;
- } // getAccessibleRole()
- } // AccessibleJRadioButtonMenuItem
-} // JRadioButtonMenuItem
+ }
+ }
+}
Index: javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java,v
retrieving revision 1.1.2.1
diff -c -p -u -r1.1.2.1 BasicCheckBoxMenuItemUI.java
--- javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java 2 Apr 2004 20:00:52 -0000 1.1.2.1
+++ javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java 26 Apr 2004 16:09:57 -0000
@@ -50,28 +50,55 @@ import javax.swing.UIManager;
import javax.swing.plaf.ComponentUI;
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
public class BasicCheckBoxMenuItemUI extends BasicMenuItemUI
{
- public static ComponentUI createUI(final JComponent c)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param c DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public static ComponentUI createUI (final JComponent c)
{
return new BasicCheckBoxMenuItemUI();
}
- protected String getPropertyPrefix()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ protected String getPropertyPrefix ()
{
return null; // TODO
}
- protected void installDefaults()
+ /**
+ * DOCUMENT ME!
+ */
+ protected void installDefaults ()
{
- super.installDefaults();
+ super.installDefaults ();
- UIDefaults defaults = UIManager.getLookAndFeelDefaults();
- checkIcon = defaults.getIcon("CheckBoxMenuItem.checkIcon");
+ UIDefaults defaults = UIManager.getLookAndFeelDefaults ();
+ checkIcon = defaults.getIcon ("CheckBoxMenuItem.checkIcon");
}
- void processMouseEvent(JMenuItem item, MouseEvent e, MenuElement[] path,
- MenuSelectionManager manager)
- {
- }
+ /**
+ * DOCUMENT ME!
+ *
+ * @param item DOCUMENT ME!
+ * @param e DOCUMENT ME!
+ * @param path DOCUMENT ME!
+ * @param manager DOCUMENT ME!
+ */
+ void processMouseEvent (JMenuItem item, MouseEvent e, MenuElement[] path,
+ MenuSelectionManager manager) {}
}
Index: javax/swing/plaf/basic/BasicMenuItemUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java,v
retrieving revision 1.1.2.4
diff -c -p -u -r1.1.2.4 BasicMenuItemUI.java
--- javax/swing/plaf/basic/BasicMenuItemUI.java 2 Apr 2004 20:00:52 -0000 1.1.2.4
+++ javax/swing/plaf/basic/BasicMenuItemUI.java 26 Apr 2004 16:09:57 -0000
@@ -62,8 +62,8 @@ import java.beans.PropertyChangeListener
import javax.swing.AbstractButton;
import javax.swing.ButtonModel;
import javax.swing.Icon;
-import javax.swing.JComponent;
import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComponent;
import javax.swing.JMenuItem;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.KeyStroke;
@@ -83,140 +83,234 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.MenuItemUI;
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
public class BasicMenuItemUI extends MenuItemUI
{
- /** Font to be used when displaying menu item's accelerator. */
+ /**
+ * Font to be used when displaying menu item's accelerator.
+ */
protected Font acceleratorFont;
- /** Color to be used when displaying menu item's accelerator. */
+ /**
+ * Color to be used when displaying menu item's accelerator.
+ */
protected Color acceleratorForeground;
- /** Color to be used when displaying menu item's accelerator
- * when menu item is selected.
- */
+ /**
+ * Color to be used when displaying menu item's accelerator when menu item is
+ * selected.
+ */
protected Color acceleratorSelectionForeground;
-
+
/**
- * Icon that is displayed after the text to indicated that this menu
- * contains submenu.
+ * Icon that is displayed after the text to indicated that this menu contains
+ * submenu.
*/
protected Icon arrowIcon;
-
+
/**
* Icon that is displayed before the text. This icon is only used in
* JCheckBoxMenuItem or JRadioBoxMenuItem.
*/
protected Icon checkIcon;
- /** Number of spaces between icon and text. */
+ /**
+ * Number of spaces between icon and text.
+ */
protected int defaultTextIconGap = 4;
-
- /** Color of the text when menu item is disabled*/
+
+ /**
+ * Color of the text when menu item is disabled
+ */
protected Color disabledForeground;
-
- /** The menu Drag mouse listener listening to the menu item. */
+
+ /**
+ * The menu Drag mouse listener listening to the menu item.
+ */
protected MenuDragMouseListener menuDragMouseListener;
-
- /** The menu item itself*/
+
+ /**
+ * The menu item itself
+ */
protected JMenuItem menuItem;
-
- /** Menu Key listener listening to the menu item. */
+
+ /**
+ * Menu Key listener listening to the menu item.
+ */
protected MenuKeyListener menuKeyListener;
-
- /** mouse input listener listening to menu item. */
+
+ /**
+ * mouse input listener listening to menu item.
+ */
protected MouseInputListener mouseInputListener;
-
- /** Indicates if border should be painted */
+
+ /**
+ * Indicates if border should be painted
+ */
protected boolean oldBorderPainted;
- /** Color of text that is used when menu item is selected */
+ /**
+ * Color of text that is used when menu item is selected
+ */
protected Color selectionBackground;
-
- /** Color of the background that is used when menu item is selected.*/
+
+ /**
+ * Color of the background that is used when menu item is selected.
+ */
protected Color selectionForeground;
- /** String that separates description of the modifiers and the key*/
+ /**
+ * String that separates description of the modifiers and the key
+ */
private String acceleratorDelimiter;
-
- /** Number of spaces between accelerator and menu item's label. */
+
+ /**
+ * Number of spaces between accelerator and menu item's label.
+ */
private int defaultAcceleratorLabelGap = 4;
- // Constructor Summary
- BasicMenuItemUI()
+
+ BasicMenuItemUI ()
{
- mouseInputListener = createMouseInputListener(menuItem);
- menuDragMouseListener = createMenuDragMouseListener(menuItem);
- menuKeyListener = createMenuKeyListener(menuItem);
+ mouseInputListener = createMouseInputListener (menuItem);
+ menuDragMouseListener = createMenuDragMouseListener (menuItem);
+ menuKeyListener = createMenuKeyListener (menuItem);
}
- // Method Summary
- protected MenuDragMouseListener createMenuDragMouseListener(JComponent c)
+ protected MenuDragMouseListener createMenuDragMouseListener (JComponent c)
{
return new MenuDragMouseHandler();
}
- protected MenuKeyListener createMenuKeyListener(JComponent c)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param c DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ protected MenuKeyListener createMenuKeyListener (JComponent c)
{
return new MenuKeyHandler();
}
- protected MouseInputListener createMouseInputListener(JComponent c)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param c DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ protected MouseInputListener createMouseInputListener (JComponent c)
{
return new MouseInputHandler();
}
- public static ComponentUI createUI(JComponent c)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param c DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public static ComponentUI createUI (JComponent c)
{
return new BasicMenuItemUI();
}
- protected void doClick(MenuSelectionManager msm)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param msm DOCUMENT ME!
+ */
+ protected void doClick (MenuSelectionManager msm)
{
// TODO
}
- public Dimension getMaximumSize(JComponent c)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param c DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public Dimension getMaximumSize (JComponent c)
{
// TODO
return null;
}
- public Dimension getMinimumSize(JComponent c)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param c DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public Dimension getMinimumSize (JComponent c)
{
// TODO
return null;
}
- public MenuElement[] getPath()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public MenuElement[] getPath ()
{
// TODO
return null;
}
- protected Dimension getPreferredMenuItemSize(JComponent c, Icon checkIcon,
- Icon arrowIcon,
- int defaultTextIconGap)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param c DOCUMENT ME!
+ * @param checkIcon DOCUMENT ME!
+ * @param arrowIcon DOCUMENT ME!
+ * @param defaultTextIconGap DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ protected Dimension getPreferredMenuItemSize (JComponent c, Icon checkIcon,
+ Icon arrowIcon,
+ int defaultTextIconGap)
{
// TODO
return null;
}
- public Dimension getPreferredSize(JComponent c)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param c DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public Dimension getPreferredSize (JComponent c)
{
AbstractButton b = (AbstractButton) c;
- Dimension d = BasicGraphicsUtils.getPreferredButtonSize(b,
- defaultTextIconGap);
-
+ Dimension d = BasicGraphicsUtils.getPreferredButtonSize (b,
+ defaultTextIconGap);
+
// if menu item has accelerator then take accelerator's size into account
// when calculating preferred size.
-
- KeyStroke accelerator = ((JMenuItem) c).getAccelerator();
+ KeyStroke accelerator = ((JMenuItem) c).getAccelerator ();
Rectangle rect;
+
if (accelerator != null)
{
- rect = getAcceleratorRect(accelerator,
- b.getToolkit().getFontMetrics(acceleratorFont));
-
+ rect = getAcceleratorRect (accelerator,
+ b.getToolkit ().getFontMetrics (acceleratorFont));
+
// add width of accelerator's text
d.width = d.width + rect.width + defaultAcceleratorLabelGap;
@@ -227,81 +321,130 @@ public class BasicMenuItemUI extends Men
if (checkIcon != null)
{
- d.width = d.width + checkIcon.getIconWidth() + defaultTextIconGap;
- if (checkIcon.getIconHeight() > d.height)
- d.height = checkIcon.getIconHeight();
+ d.width = d.width + checkIcon.getIconWidth () + defaultTextIconGap;
+
+ if (checkIcon.getIconHeight () > d.height)
+ d.height = checkIcon.getIconHeight ();
}
-
+
return d;
}
- protected String getPropertyPrefix()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ protected String getPropertyPrefix ()
{
// TODO
return null;
}
- protected void installComponents(JMenuItem menuItem)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param menuItem DOCUMENT ME!
+ */
+ protected void installComponents (JMenuItem menuItem)
{
// TODO
}
- protected void installDefaults()
+ /**
+ * DOCUMENT ME!
+ */
+ protected void installDefaults ()
{
- UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+ UIDefaults defaults = UIManager.getLookAndFeelDefaults ();
- menuItem.setBackground(defaults.getColor("MenuItem.background"));
- menuItem.setBorder(defaults.getBorder("MenuItem.border"));
- menuItem.setFont(defaults.getFont("MenuItem.font"));
- menuItem.setForeground(defaults.getColor("MenuItem.foreground"));
- menuItem.setMargin(defaults.getInsets("MenuItem.margin"));
- acceleratorFont = defaults.getFont("MenuItem.acceleratorFont");
- acceleratorForeground = defaults.getColor("MenuItem.acceleratorForeground");
- acceleratorSelectionForeground = defaults.getColor("MenuItem.acceleratorSelectionForeground");
- arrowIcon = defaults.getIcon("MenuItem.arrowIcon");
- selectionBackground = defaults.getColor("MenuItem.selectionBackground");
- selectionForeground = defaults.getColor("MenuItem.selectionForeground");
- acceleratorDelimiter = defaults.getString("MenuItem.acceleratorDelimiter");
+ menuItem.setBackground (defaults.getColor ("MenuItem.background"));
+ menuItem.setBorder (defaults.getBorder ("MenuItem.border"));
+ menuItem.setFont (defaults.getFont ("MenuItem.font"));
+ menuItem.setForeground (defaults.getColor ("MenuItem.foreground"));
+ menuItem.setMargin (defaults.getInsets ("MenuItem.margin"));
+ acceleratorFont = defaults.getFont ("MenuItem.acceleratorFont");
+ acceleratorForeground = defaults.getColor ("MenuItem.acceleratorForeground");
+ acceleratorSelectionForeground = defaults.getColor ("MenuItem.acceleratorSelectionForeground");
+ arrowIcon = defaults.getIcon ("MenuItem.arrowIcon");
+ selectionBackground = defaults.getColor ("MenuItem.selectionBackground");
+ selectionForeground = defaults.getColor ("MenuItem.selectionForeground");
+ acceleratorDelimiter = defaults.getString ("MenuItem.acceleratorDelimiter");
}
- protected void installKeyboardActions()
+ /**
+ * DOCUMENT ME!
+ */
+ protected void installKeyboardActions ()
{
// TODO
}
- protected void installListeners()
+ /**
+ * DOCUMENT ME!
+ */
+ protected void installListeners ()
{
- menuItem.addMouseListener(mouseInputListener);
- menuItem.addMenuDragMouseListener(menuDragMouseListener);
- menuItem.addMenuKeyListener(menuKeyListener);
+ menuItem.addMouseListener (mouseInputListener);
+ menuItem.addMenuDragMouseListener (menuDragMouseListener);
+ menuItem.addMenuKeyListener (menuKeyListener);
}
- public void installUI(JComponent c)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param c DOCUMENT ME!
+ */
+ public void installUI (JComponent c)
{
- super.installUI(c);
+ super.installUI (c);
menuItem = (JMenuItem) c;
- installDefaults();
- installListeners();
+ installDefaults ();
+ installListeners ();
}
- public void paint(Graphics g, JComponent c)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param g DOCUMENT ME!
+ * @param c DOCUMENT ME!
+ */
+ public void paint (Graphics g, JComponent c)
{
- paintMenuItem(g, c, checkIcon, arrowIcon, c.getBackground(),
- c.getForeground(), defaultTextIconGap);
+ paintMenuItem (g, c, checkIcon, arrowIcon, c.getBackground (),
+ c.getForeground (), defaultTextIconGap);
}
- protected void paintBackground(Graphics g, JMenuItem menuItem, Color bgColor)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param g DOCUMENT ME!
+ * @param menuItem DOCUMENT ME!
+ * @param bgColor DOCUMENT ME!
+ */
+ protected void paintBackground (Graphics g, JMenuItem menuItem, Color bgColor)
{
- Dimension size = getPreferredSize(menuItem);
- Color foreground = g.getColor();
- g.setColor(bgColor);
- g.drawRect(0, 0, size.width, size.height);
- g.setColor(foreground);
+ Dimension size = getPreferredSize (menuItem);
+ Color foreground = g.getColor ();
+ g.setColor (bgColor);
+ g.drawRect (0, 0, size.width, size.height);
+ g.setColor (foreground);
}
- protected void paintMenuItem(Graphics g, JComponent c, Icon checkIcon,
- Icon arrowIcon, Color background,
- Color foreground, int defaultTextIconGap)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param g DOCUMENT ME!
+ * @param c DOCUMENT ME!
+ * @param checkIcon DOCUMENT ME!
+ * @param arrowIcon DOCUMENT ME!
+ * @param background DOCUMENT ME!
+ * @param foreground DOCUMENT ME!
+ * @param defaultTextIconGap DOCUMENT ME!
+ */
+ protected void paintMenuItem (Graphics g, JComponent c, Icon checkIcon,
+ Icon arrowIcon, Color background,
+ Color foreground, int defaultTextIconGap)
{
AbstractButton b = (AbstractButton) c;
Rectangle tr = new Rectangle(); // text rectangle
@@ -310,50 +453,48 @@ public class BasicMenuItemUI extends Men
Rectangle br = new Rectangle(); // border rectangle
Rectangle ar = new Rectangle(); // accelerator rectangle
Rectangle cr = new Rectangle(); // checkIcon rectangle
-
- int vertAlign = b.getVerticalAlignment();
- int horAlign = b.getHorizontalAlignment();
- int vertTextPos = b.getVerticalTextPosition();
- int horTextPos = b.getHorizontalTextPosition();
-
- Font f = c.getFont();
- g.setFont(f);
- FontMetrics fm = g.getFontMetrics(f);
- SwingUtilities.calculateInnerArea(b, br);
- SwingUtilities.calculateInsetArea(br, b.getMargin(), vr);
- paintBackground(g, (JMenuItem) c, c.getBackground());
-
- if ((b.getModel().isArmed() && b.getModel().isPressed()))
+
+ int vertAlign = b.getVerticalAlignment ();
+ int horAlign = b.getHorizontalAlignment ();
+ int vertTextPos = b.getVerticalTextPosition ();
+ int horTextPos = b.getHorizontalTextPosition ();
+
+ Font f = c.getFont ();
+ g.setFont (f);
+ FontMetrics fm = g.getFontMetrics (f);
+ SwingUtilities.calculateInnerArea (b, br);
+ SwingUtilities.calculateInsetArea (br, b.getMargin (), vr);
+ paintBackground (g, (JMenuItem) c, c.getBackground ());
+
+ if ((b.getModel ().isArmed () && b.getModel ().isPressed ()))
{
- if (((AbstractButton) b).isContentAreaFilled())
+ if (((AbstractButton) b).isContentAreaFilled ())
{
- g.setColor(b.getBackground().darker());
- g.fillRect(br.x, br.y, br.width, br.height);
+ g.setColor (b.getBackground ().darker ());
+ g.fillRect (br.x, br.y, br.width, br.height);
}
}
else
{
- if (((AbstractButton) b).isContentAreaFilled())
+ if (((AbstractButton) b).isContentAreaFilled ())
{
- g.setColor(b.getBackground());
- g.fillRect(br.x, br.y, br.width, br.height);
+ g.setColor (b.getBackground ());
+ g.fillRect (br.x, br.y, br.width, br.height);
}
}
-
-
+
if (checkIcon != null)
{
- SwingUtilities.layoutCompoundLabel(c, fm, null, checkIcon, vertAlign,
- horAlign, vertTextPos, horTextPos,
- vr, cr, tr, defaultTextIconGap);
- checkIcon.paintIcon(c, g, cr.x, cr.y);
+ SwingUtilities.layoutCompoundLabel (c, fm, null, checkIcon, vertAlign,
+ horAlign, vertTextPos, horTextPos,
+ vr, cr, tr, defaultTextIconGap);
+ checkIcon.paintIcon (c, g, cr.x, cr.y);
// We need to calculate position of the menu text and position of
// user menu icon if there exists one relative to the check icon.
- // So we need to adjust view rectangle s.t. its starting point is at
- // checkIcon.width + defaultTextIconGap.
-
- vr.x = cr.x + cr.width + defaultTextIconGap;
+ // So we need to adjust view rectangle s.t. its starting point is at
+ // checkIcon.width + defaultTextIconGap.
+ vr.x = cr.x + cr.width + defaultTextIconGap;
}
if (arrowIcon != null)
@@ -362,20 +503,19 @@ public class BasicMenuItemUI extends Men
// here as well
}
-
// paint text and user menu icon if it exists
- SwingUtilities.layoutCompoundLabel(c, fm, b.getText(), b.getIcon(),
- vertAlign, horAlign, vertTextPos,
- horTextPos, vr, ir, tr,
- defaultTextIconGap);
+ SwingUtilities.layoutCompoundLabel (c, fm, b.getText (), b.getIcon (),
+ vertAlign, horAlign, vertTextPos,
+ horTextPos, vr, ir, tr,
+ defaultTextIconGap);
+
+ paintText (g, (JMenuItem) c, tr, b.getText ());
- paintText(g, (JMenuItem) c, tr, b.getText());
-
// paint icon
// FIXME: should paint different icon at different button state's.
// i.e disabled icon when button is disabled.. etc.
-
- /*
+
+ /*
Icon i = b.getIcon();
if (i != null)
{
@@ -384,56 +524,71 @@ public class BasicMenuItemUI extends Men
i.paintIcon(c, g, x, y);
}
*/
-
+
// paint accelerator
String acceleratorText = "";
- if (((JMenuItem) c).getAccelerator() != null)
+
+ if (((JMenuItem) c).getAccelerator () != null)
{
- acceleratorText = getAcceleratorText(((JMenuItem) c).getAccelerator());
- fm = g.getFontMetrics(acceleratorFont);
- ar.width = fm.stringWidth(acceleratorText);
- ar.x = br.width - ar.width;
+ acceleratorText = getAcceleratorText (((JMenuItem) c).getAccelerator ());
+ fm = g.getFontMetrics (acceleratorFont);
+ ar.width = fm.stringWidth (acceleratorText);
+ ar.x = br.width - ar.width;
vr.x = br.width - ar.width;
-
- SwingUtilities.layoutCompoundLabel(c, fm, acceleratorText, null,
- vertAlign, horAlign, vertTextPos,
- horTextPos, vr, ir, ar,
- defaultTextIconGap);
-
- paintAccelerator(g, (JMenuItem) c, ar, acceleratorText);
-
- }
+ SwingUtilities.layoutCompoundLabel (c, fm, acceleratorText, null,
+ vertAlign, horAlign, vertTextPos,
+ horTextPos, vr, ir, ar,
+ defaultTextIconGap);
+
+ paintAccelerator (g, (JMenuItem) c, ar, acceleratorText);
+ }
}
- protected void paintText(Graphics g, JMenuItem menuItem, Rectangle textRect,
- String text)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param g DOCUMENT ME!
+ * @param menuItem DOCUMENT ME!
+ * @param textRect DOCUMENT ME!
+ * @param text DOCUMENT ME!
+ */
+ protected void paintText (Graphics g, JMenuItem menuItem, Rectangle textRect,
+ String text)
{
- Font f = menuItem.getFont();
- g.setFont(f);
- FontMetrics fm = g.getFontMetrics(f);
- g.setColor(menuItem.getForeground());
+ Font f = menuItem.getFont ();
+ g.setFont (f);
+ FontMetrics fm = g.getFontMetrics (f);
+ g.setColor (menuItem.getForeground ());
- BasicGraphicsUtils.drawString(g, text, 0, textRect.x,
- textRect.y + fm.getAscent());
+ BasicGraphicsUtils.drawString (g, text, 0, textRect.x,
+ textRect.y + fm.getAscent ());
}
- protected void uninstallComponents(JMenuItem menuItem)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param menuItem DOCUMENT ME!
+ */
+ protected void uninstallComponents (JMenuItem menuItem)
{
// TODO
}
- protected void uninstallDefaults()
+ /**
+ * DOCUMENT ME!
+ */
+ protected void uninstallDefaults ()
{
- menuItem.setForeground(null);
- menuItem.setBackground(null);
- menuItem.setBorder(null);
- menuItem.setMargin(null);
- menuItem.setBackground(null);
- menuItem.setBorder(null);
- menuItem.setFont(null);
- menuItem.setForeground(null);
- menuItem.setMargin(null);
+ menuItem.setForeground (null);
+ menuItem.setBackground (null);
+ menuItem.setBorder (null);
+ menuItem.setMargin (null);
+ menuItem.setBackground (null);
+ menuItem.setBorder (null);
+ menuItem.setFont (null);
+ menuItem.setForeground (null);
+ menuItem.setMargin (null);
acceleratorFont = null;
acceleratorForeground = null;
acceleratorSelectionForeground = null;
@@ -443,203 +598,327 @@ public class BasicMenuItemUI extends Men
acceleratorDelimiter = null;
}
- protected void uninstallKeyboardActions()
+ /**
+ * DOCUMENT ME!
+ */
+ protected void uninstallKeyboardActions ()
{
// TODO
}
- protected void uninstallListeners()
+ /**
+ * DOCUMENT ME!
+ */
+ protected void uninstallListeners ()
{
- menuItem.removeMouseListener(mouseInputListener);
- menuItem.removeMenuDragMouseListener(menuDragMouseListener);
- menuItem.removeMenuKeyListener(menuKeyListener);
+ menuItem.removeMouseListener (mouseInputListener);
+ menuItem.removeMenuDragMouseListener (menuDragMouseListener);
+ menuItem.removeMenuKeyListener (menuKeyListener);
}
- public void uninstallUI(JComponent c)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param c DOCUMENT ME!
+ */
+ public void uninstallUI (JComponent c)
{
- uninstallListeners();
- uninstallDefaults();
+ uninstallListeners ();
+ uninstallDefaults ();
menuItem = null;
}
- public void update(Graphics g, JComponent c)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param g DOCUMENT ME!
+ * @param c DOCUMENT ME!
+ */
+ public void update (Graphics g, JComponent c)
{
// TODO
}
- private String getAcceleratorText(KeyStroke accelerator)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param accelerator DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ private String getAcceleratorText (KeyStroke accelerator)
{
-
// convert keystroke into string format
-
String modifiersText = "";
- int modifiers = accelerator.getModifiers();
- char keyChar = accelerator.getKeyChar();
- int keyCode = accelerator.getKeyCode();
+ int modifiers = accelerator.getModifiers ();
+ char keyChar = accelerator.getKeyChar ();
+ int keyCode = accelerator.getKeyCode ();
if (modifiers != 0)
- modifiersText = KeyEvent.getKeyModifiersText(modifiers) +
+ modifiersText = KeyEvent.getKeyModifiersText (modifiers) +
acceleratorDelimiter;
if (keyCode == KeyEvent.VK_UNDEFINED)
return modifiersText + keyChar;
else
- return modifiersText + KeyEvent.getKeyText(keyCode);
+ return modifiersText + KeyEvent.getKeyText (keyCode);
}
- private Rectangle getAcceleratorRect(KeyStroke accelerator, FontMetrics fm)
- {
- int width = fm.stringWidth(getAcceleratorText(accelerator));
- int height = fm.getHeight();
+ /**
+ * DOCUMENT ME!
+ *
+ * @param accelerator DOCUMENT ME!
+ * @param fm DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ private Rectangle getAcceleratorRect (KeyStroke accelerator, FontMetrics fm)
+ {
+ int width = fm.stringWidth (getAcceleratorText (accelerator));
+ int height = fm.getHeight ();
return new Rectangle(0, 0, width, height);
}
- private void paintAccelerator(Graphics g, JMenuItem menuItem, Rectangle acceleratorRect,
- String acceleratorText)
- {
- g.setFont(acceleratorFont);
- FontMetrics fm = g.getFontMetrics(acceleratorFont);
- g.setColor(acceleratorForeground);
- BasicGraphicsUtils.drawString(g, acceleratorText, 0, acceleratorRect.x,
- acceleratorRect.y + fm.getAscent());
+ /**
+ * DOCUMENT ME!
+ *
+ * @param g DOCUMENT ME!
+ * @param menuItem DOCUMENT ME!
+ * @param acceleratorRect DOCUMENT ME!
+ * @param acceleratorText DOCUMENT ME!
+ */
+ private void paintAccelerator (Graphics g, JMenuItem menuItem,
+ Rectangle acceleratorRect,
+ String acceleratorText)
+ {
+ g.setFont (acceleratorFont);
+ FontMetrics fm = g.getFontMetrics (acceleratorFont);
+ g.setColor (acceleratorForeground);
+ BasicGraphicsUtils.drawString (g, acceleratorText, 0, acceleratorRect.x,
+ acceleratorRect.y + fm.getAscent ());
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
protected class MouseInputHandler implements MouseInputListener
{
- protected MouseInputHandler()
- {
- }
-
- public void mouseClicked(MouseEvent e)
- {
- }
-
- public void mouseDragged(MouseEvent e)
+ /**
+ * Creates a new MouseInputHandler object.
+ */
+ protected MouseInputHandler () {}
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void mouseClicked (MouseEvent e) {}
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void mouseDragged (MouseEvent e) {}
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void mouseEntered (MouseEvent e)
{
- }
-
- public void mouseEntered(MouseEvent e)
- {
- if (e.getSource() instanceof AbstractButton)
+ if (e.getSource () instanceof AbstractButton)
{
- AbstractButton button = (AbstractButton) e.getSource();
- ButtonModel model = button.getModel();
+ AbstractButton button = (AbstractButton) e.getSource ();
+ ButtonModel model = button.getModel ();
- if (button.isRolloverEnabled())
- {
- model.setRollover(true);
- }
+ if (button.isRolloverEnabled ())
+ model.setRollover (true);
- if (model.isPressed() &&
- ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0))
- {
- model.setArmed(true);
- }
+ if (model.isPressed () &&
+ ((e.getModifiers () & InputEvent.BUTTON1_MASK) != 0))
+ model.setArmed (true);
else
- {
- model.setArmed(false);
- }
+ model.setArmed (false);
}
}
- public void mouseExited(MouseEvent e)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void mouseExited (MouseEvent e)
{
- if (e.getSource() instanceof AbstractButton)
+ if (e.getSource () instanceof AbstractButton)
{
- AbstractButton button = (AbstractButton) e.getSource();
- ButtonModel model = button.getModel();
+ AbstractButton button = (AbstractButton) e.getSource ();
+ ButtonModel model = button.getModel ();
- if (button.isRolloverEnabled())
- {
- model.setRollover(false);
- }
+ if (button.isRolloverEnabled ())
+ model.setRollover (false);
- model.setArmed(false);
+ model.setArmed (false);
}
}
- public void mouseMoved(MouseEvent e)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void mouseMoved (MouseEvent e) {}
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void mousePressed (MouseEvent e)
{
- }
-
- public void mousePressed(MouseEvent e)
- {
- if (e.getSource() instanceof AbstractButton)
+ if (e.getSource () instanceof AbstractButton)
{
- AbstractButton button = (AbstractButton) e.getSource();
- ButtonModel model = button.getModel();
+ AbstractButton button = (AbstractButton) e.getSource ();
+ ButtonModel model = button.getModel ();
- if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+ if ((e.getModifiers () & InputEvent.BUTTON1_MASK) != 0)
{
// It is important that these transitions happen in this order.
- model.setArmed(true);
- model.setPressed(true);
+ model.setArmed (true);
+ model.setPressed (true);
}
}
}
- public void mouseReleased(MouseEvent e)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void mouseReleased (MouseEvent e)
{
-
- if (e.getSource() instanceof AbstractButton)
+ if (e.getSource () instanceof AbstractButton)
{
- AbstractButton button = (AbstractButton) e.getSource();
- ButtonModel model = button.getModel();
+ AbstractButton button = (AbstractButton) e.getSource ();
+ ButtonModel model = button.getModel ();
- if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+ if ((e.getModifiers () & InputEvent.BUTTON1_MASK) != 0)
{
// It is important that these transitions happen in this order.
- model.setPressed(false);
- model.setArmed(false);
+ model.setPressed (false);
+ model.setArmed (false);
}
}
}
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
protected class MenuDragMouseHandler implements MenuDragMouseListener
{
- public void menuDragMouseDragged(MenuDragMouseEvent e)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void menuDragMouseDragged (MenuDragMouseEvent e)
{
// TODO
}
- public void menuDragMouseEntered(MenuDragMouseEvent e)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void menuDragMouseEntered (MenuDragMouseEvent e)
{
// TODO
}
- public void menuDragMouseExited(MenuDragMouseEvent e)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void menuDragMouseExited (MenuDragMouseEvent e)
{
// TODO
}
- public void menuDragMouseReleased(MenuDragMouseEvent e)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void menuDragMouseReleased (MenuDragMouseEvent e)
{
// TODO
}
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
protected class MenuKeyHandler implements MenuKeyListener
{
- public void menuKeyPressed(MenuKeyEvent e)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void menuKeyPressed (MenuKeyEvent e)
{
// TODO
}
- public void menuKeyReleased(MenuKeyEvent e)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void menuKeyReleased (MenuKeyEvent e)
{
// TODO
}
- public void menuKeyTyped(MenuKeyEvent e)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void menuKeyTyped (MenuKeyEvent e)
{
// TODO
}
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
protected class PropertyChangeHandler
{
- public void propertyChange(PropertyChangeEvent evt)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param evt DOCUMENT ME!
+ */
+ public void propertyChange (PropertyChangeEvent evt)
{
// TODO
}
Index: javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java,v
retrieving revision 1.1.2.1
diff -c -p -u -r1.1.2.1 BasicRadioButtonMenuItemUI.java
--- javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java 31 Mar 2004 18:31:48 -0000 1.1.2.1
+++ javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java 26 Apr 2004 16:09:57 -0000
@@ -38,41 +38,67 @@ exception statement from your version. *
package javax.swing.plaf.basic;
import java.awt.event.MouseEvent;
+
import javax.swing.AbstractButton;
import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JMenuItem;
-import javax.swing.UIDefaults;
-import javax.swing.UIManager;
import javax.swing.MenuElement;
import javax.swing.MenuSelectionManager;
-
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
import javax.swing.plaf.ComponentUI;
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
public class BasicRadioButtonMenuItemUI extends BasicMenuItemUI
{
-
- public BasicRadioButtonMenuItemUI()
- {
+ /**
+ * Creates a new BasicRadioButtonMenuItemUI object.
+ */
+ public BasicRadioButtonMenuItemUI ()
+ {
super();
- UIDefaults defaults = UIManager.getLookAndFeelDefaults();
- checkIcon = defaults.getIcon("RadioButtonMenuItem.checkIcon");
+ UIDefaults defaults = UIManager.getLookAndFeelDefaults ();
+ checkIcon = defaults.getIcon ("RadioButtonMenuItem.checkIcon");
}
- public static ComponentUI createUI(JComponent b)
+ /**
+ * DOCUMENT ME!
+ *
+ * @param b DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ public static ComponentUI createUI (JComponent b)
{
return new BasicRadioButtonMenuItemUI();
}
- protected String getPropertyPrefix()
+ /**
+ * DOCUMENT ME!
+ *
+ * @return $returnType$ DOCUMENT ME!
+ */
+ protected String getPropertyPrefix ()
{
return null;
// TODO
}
- void processMouseEvent(JMenuItem item, MouseEvent e, MenuElement[] path,
- MenuSelectionManager manager)
- {
- }
+ /**
+ * DOCUMENT ME!
+ *
+ * @param item DOCUMENT ME!
+ * @param e DOCUMENT ME!
+ * @param path DOCUMENT ME!
+ * @param manager DOCUMENT ME!
+ */
+ void processMouseEvent (JMenuItem item, MouseEvent e, MenuElement[] path,
+ MenuSelectionManager manager) {}
}
More information about the Java-patches
mailing list