[gui][PATCH] Menu Items: fixed style and comments
Olga Rodimina
rodimina@redhat.com
Mon Apr 26 20:03:00 GMT 2004
On Mon, 2004-04-26 at 13:25, David Daney wrote:
> Michael Koch wrote:
>
> >What jalopy config file have you used ? The coding style jalopy produced
> >looks not right for us. E.g. we use no whitspaces in method
> >declarations between method name and (. I have attached my jalopy
> >config file which should be relatively complete (I got it from tromey
> >once and edited it slightly).
> >
>
> I see no attachment here.
>
> > Before we do any more jalopying we should
> >have a common jalopy config file and a jalopy versions that supports
> >all our features. Currently I use a patched jalopy 1.0.4 to get near to
> >our standard but there are still bugs with superlong lines.
> >
> >
> >
> Maybe a pointer to a good jalopy config should be put in the HACKING file.
>
> David Daney.
>
>
I just got new configuration file from
http://www.gnu.org/software/classpath/downloads/tools.html#jalopy
and reran the files through Jalopy using this configuration file.
I've attached the patch for it. Please let me know if it is ok to
commit?
Thanks,
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.76
diff -c -p -u -r1.2660.2.76 ChangeLog
--- ChangeLog 26 Apr 2004 16:24:49 -0000 1.2660.2.76
+++ ChangeLog 26 Apr 2004 17:42:53 -0000
@@ -1,4 +1,8 @@
2004-04-26 Olga Rodimina <rodimina@redhat.com>
+ * Used correct version of jalopy configuration
+ file to fix style in the files below.
+
+2004-04-26 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JCheckBoxMenuItem.java:
Fixed style and removed unnecessary comments.
Index: javax/swing/JCheckBoxMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JCheckBoxMenuItem.java,v
retrieving revision 1.3.8.2
diff -c -p -u -r1.3.8.2 JCheckBoxMenuItem.java
--- javax/swing/JCheckBoxMenuItem.java 26 Apr 2004 16:24:50 -0000 1.3.8.2
+++ javax/swing/JCheckBoxMenuItem.java 26 Apr 2004 17:42:54 -0000
@@ -1,4 +1,4 @@
-/* JCheckBoxMenuItem.java --
+/* JCheckBoxMenuItem.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,7 +39,6 @@ package javax.swing;
import java.io.IOException;
import java.io.ObjectOutputStream;
-
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
@@ -61,7 +60,7 @@ public class JCheckBoxMenuItem extends J
/**
* Creates a new JCheckBoxMenuItem object.
*/
- public JCheckBoxMenuItem ()
+ public JCheckBoxMenuItem()
{
this(null, null);
}
@@ -71,7 +70,7 @@ public class JCheckBoxMenuItem extends J
*
* @param icon DOCUMENT ME!
*/
- public JCheckBoxMenuItem (Icon icon)
+ public JCheckBoxMenuItem(Icon icon)
{
this(null, icon);
}
@@ -81,7 +80,7 @@ public class JCheckBoxMenuItem extends J
*
* @param text DOCUMENT ME!
*/
- public JCheckBoxMenuItem (String text)
+ public JCheckBoxMenuItem(String text)
{
this(text, null);
}
@@ -91,10 +90,10 @@ public class JCheckBoxMenuItem extends J
*
* @param action DOCUMENT ME!
*/
- public JCheckBoxMenuItem (Action action)
+ public JCheckBoxMenuItem(Action action)
{
this();
- setAction (action);
+ setAction(action);
}
/**
@@ -103,7 +102,7 @@ public class JCheckBoxMenuItem extends J
* @param text DOCUMENT ME!
* @param icon DOCUMENT ME!
*/
- public JCheckBoxMenuItem (String text, Icon icon)
+ public JCheckBoxMenuItem(String text, Icon icon)
{
this(text, icon, false);
}
@@ -114,7 +113,7 @@ public class JCheckBoxMenuItem extends J
* @param text DOCUMENT ME!
* @param state DOCUMENT ME!
*/
- public JCheckBoxMenuItem (String text, boolean state)
+ public JCheckBoxMenuItem(String text, boolean state)
{
this(text, null, state);
}
@@ -126,10 +125,10 @@ public class JCheckBoxMenuItem extends J
* @param icon DOCUMENT ME!
* @param state DOCUMENT ME!
*/
- public JCheckBoxMenuItem (String text, Icon icon, boolean state)
+ public JCheckBoxMenuItem(String text, Icon icon, boolean state)
{
super(text, icon);
- setModel (new JToggleButton.ToggleButtonModel());
+ setModel(new JToggleButton.ToggleButtonModel());
this.state = state;
}
@@ -140,8 +139,7 @@ public class JCheckBoxMenuItem extends J
*
* @throws IOException DOCUMENT ME!
*/
- private void writeObject (ObjectOutputStream stream)
- throws IOException
+ private void writeObject(ObjectOutputStream stream) throws IOException
{
// TODO
}
@@ -151,7 +149,7 @@ public class JCheckBoxMenuItem extends J
*
* @return $returnType$ DOCUMENT ME!
*/
- public String getUIClassID ()
+ public String getUIClassID()
{
return uiClassID;
}
@@ -161,7 +159,7 @@ public class JCheckBoxMenuItem extends J
*
* @return $returnType$ DOCUMENT ME!
*/
- public boolean getState ()
+ public boolean getState()
{
return state;
}
@@ -171,7 +169,7 @@ public class JCheckBoxMenuItem extends J
*
* @param state DOCUMENT ME!
*/
- public synchronized void setState (boolean state)
+ public synchronized void setState(boolean state)
{
this.state = state;
}
@@ -181,7 +179,7 @@ public class JCheckBoxMenuItem extends J
*
* @return $returnType$ DOCUMENT ME!
*/
- public Object[] getSelectedObjects ()
+ public Object[] getSelectedObjects()
{
return selectedObjects;
}
@@ -189,7 +187,7 @@ public class JCheckBoxMenuItem extends J
/**
* DOCUMENT ME!
*/
- public void requestFocus ()
+ public void requestFocus()
{
// TODO
}
@@ -199,7 +197,7 @@ public class JCheckBoxMenuItem extends J
*
* @return $returnType$ DOCUMENT ME!
*/
- protected String paramString ()
+ protected String paramString()
{
return "JCheckBoxMenuItem";
}
@@ -209,7 +207,7 @@ public class JCheckBoxMenuItem extends J
*
* @return $returnType$ DOCUMENT ME!
*/
- public AccessibleContext getAccessibleContext ()
+ public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
accessibleContext = new AccessibleJCheckBoxMenuItem(this);
@@ -230,7 +228,7 @@ public class JCheckBoxMenuItem extends J
*
* @param component DOCUMENT ME!
*/
- protected AccessibleJCheckBoxMenuItem (JCheckBoxMenuItem component)
+ protected AccessibleJCheckBoxMenuItem(JCheckBoxMenuItem component)
{
super(component);
@@ -242,7 +240,7 @@ public class JCheckBoxMenuItem extends J
*
* @return $returnType$ DOCUMENT ME!
*/
- public AccessibleRole getAccessibleRole ()
+ public AccessibleRole getAccessibleRole()
{
return AccessibleRole.CHECK_BOX;
}
Index: javax/swing/JMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenuItem.java,v
retrieving revision 1.2.18.2
diff -c -p -u -r1.2.18.2 JMenuItem.java
--- javax/swing/JMenuItem.java 26 Apr 2004 16:24:50 -0000 1.2.18.2
+++ javax/swing/JMenuItem.java 26 Apr 2004 17:42:54 -0000
@@ -1,4 +1,4 @@
-/* JMenuItem.java --
+/* JMenuItem.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -40,18 +40,14 @@ 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;
@@ -77,7 +73,7 @@ public class JMenuItem extends AbstractB
/**
* Creates a new JMenuItem object.
*/
- public JMenuItem ()
+ public JMenuItem()
{
this(null, null);
}
@@ -87,7 +83,7 @@ public class JMenuItem extends AbstractB
*
* @param icon DOCUMENT ME!
*/
- public JMenuItem (Icon icon)
+ public JMenuItem(Icon icon)
{
this(null, icon);
}
@@ -97,7 +93,7 @@ public class JMenuItem extends AbstractB
*
* @param text DOCUMENT ME!
*/
- public JMenuItem (String text)
+ public JMenuItem(String text)
{
this(text, null);
}
@@ -107,7 +103,7 @@ public class JMenuItem extends AbstractB
*
* @param action DOCUMENT ME!
*/
- public JMenuItem (Action action)
+ public JMenuItem(Action action)
{
// TODO
}
@@ -118,7 +114,7 @@ public class JMenuItem extends AbstractB
* @param text DOCUMENT ME!
* @param icon DOCUMENT ME!
*/
- public JMenuItem (String text, Icon icon)
+ public JMenuItem(String text, Icon icon)
{
super(text, icon);
}
@@ -129,17 +125,17 @@ public class JMenuItem extends AbstractB
* @param text DOCUMENT ME!
* @param mnemonic DOCUMENT ME!
*/
- public JMenuItem (String text, int mnemonic)
+ public JMenuItem(String text, int mnemonic)
{
super(text, null);
- setMnemonic (mnemonic);
+ setMnemonic(mnemonic);
}
//-------------------------------------------------------------
// Methods ----------------------------------------------------
//-------------------------------------------------------------
- private void readObject (ObjectInputStream stream)
- throws IOException, ClassNotFoundException
+ private void readObject(ObjectInputStream stream)
+ throws IOException, ClassNotFoundException
{
// TODO
}
@@ -151,8 +147,7 @@ public class JMenuItem extends AbstractB
*
* @throws IOException DOCUMENT ME!
*/
- private void writeObject (ObjectOutputStream stream)
- throws IOException
+ private void writeObject(ObjectOutputStream stream) throws IOException
{
// TODO
}
@@ -163,7 +158,7 @@ public class JMenuItem extends AbstractB
* @param text DOCUMENT ME!
* @param icon DOCUMENT ME!
*/
- protected void init (String text, Icon icon)
+ protected void init(String text, Icon icon)
{
// TODO
}
@@ -173,19 +168,19 @@ public class JMenuItem extends AbstractB
*
* @param ui DOCUMENT ME!
*/
- public void setUI (MenuItemUI ui)
+ public void setUI(MenuItemUI ui)
{
- super.setUI (ui);
+ super.setUI(ui);
}
/**
* DOCUMENT ME!
*/
- public void updateUI ()
+ public void updateUI()
{
- MenuItemUI mi = ((MenuItemUI) UIManager.getUI (this));
- setUI (mi);
- invalidate ();
+ MenuItemUI mi = ((MenuItemUI) UIManager.getUI(this));
+ setUI(mi);
+ invalidate();
}
/**
@@ -193,7 +188,7 @@ public class JMenuItem extends AbstractB
*
* @return $returnType$ DOCUMENT ME!
*/
- public String getUIClassID ()
+ public String getUIClassID()
{
return uiClassID;
}
@@ -203,9 +198,9 @@ public class JMenuItem extends AbstractB
*
* @return $returnType$ DOCUMENT ME!
*/
- public boolean isArmed ()
+ public boolean isArmed()
{
- return getModel ().isArmed ();
+ return getModel().isArmed();
}
/**
@@ -213,9 +208,9 @@ public class JMenuItem extends AbstractB
*
* @param armed DOCUMENT ME!
*/
- public void setArmed (boolean armed)
+ public void setArmed(boolean armed)
{
- getModel ().setArmed (armed);
+ getModel().setArmed(armed);
}
/**
@@ -223,9 +218,9 @@ public class JMenuItem extends AbstractB
*
* @param enabled DOCUMENT ME!
*/
- public void setEnabled (boolean enabled)
+ public void setEnabled(boolean enabled)
{
- setEnabled (enabled);
+ setEnabled(enabled);
}
/**
@@ -233,7 +228,7 @@ public class JMenuItem extends AbstractB
*
* @return $returnType$ DOCUMENT ME!
*/
- public KeyStroke getAccelerator ()
+ public KeyStroke getAccelerator()
{
return accelerator;
}
@@ -243,7 +238,7 @@ public class JMenuItem extends AbstractB
*
* @param keystroke DOCUMENT ME!
*/
- public void setAccelerator (KeyStroke keystroke)
+ public void setAccelerator(KeyStroke keystroke)
{
this.accelerator = keystroke;
}
@@ -253,14 +248,14 @@ public class JMenuItem extends AbstractB
*
* @param action DOCUMENT ME!
*/
- protected void configurePropertiesFromAction (Action action)
+ 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)));
+ setAccelerator((KeyStroke) (action.getValue(Action.ACCELERATOR_KEY)));
}
/**
@@ -270,7 +265,7 @@ public class JMenuItem extends AbstractB
*
* @return $returnType$ DOCUMENT ME!
*/
- protected PropertyChangeListener createActionPropertyChangeListener (Action action)
+ protected PropertyChangeListener createActionPropertyChangeListener(Action action)
{
return null;
}
@@ -282,8 +277,8 @@ public class JMenuItem extends AbstractB
* @param path DOCUMENT ME!
* @param manager DOCUMENT ME!
*/
- public void processMouseEvent (MouseEvent event, MenuElement[] path,
- MenuSelectionManager manager)
+ public void processMouseEvent(MouseEvent event, MenuElement[] path,
+ MenuSelectionManager manager)
{
// TODO
}
@@ -295,8 +290,8 @@ public class JMenuItem extends AbstractB
* @param path DOCUMENT ME!
* @param manager DOCUMENT ME!
*/
- public void processKeyEvent (KeyEvent event, MenuElement[] path,
- MenuSelectionManager manager)
+ public void processKeyEvent(KeyEvent event, MenuElement[] path,
+ MenuSelectionManager manager)
{
// TODO
}
@@ -306,14 +301,16 @@ public class JMenuItem extends AbstractB
*
* @param event DOCUMENT ME!
*/
- public void processMenuDragMouseEvent (MenuDragMouseEvent event) {} // processMenuDragMouseEvent()
+ public void processMenuDragMouseEvent(MenuDragMouseEvent event)
+ {
+ } // processMenuDragMouseEvent()
/**
* DOCUMENT ME!
*
* @param event DOCUMENT ME!
*/
- public void processMenuKeyEvent (MenuKeyEvent event)
+ public void processMenuKeyEvent(MenuKeyEvent event)
{
// TODO
}
@@ -323,7 +320,7 @@ public class JMenuItem extends AbstractB
*
* @param event DOCUMENT ME!
*/
- protected void fireMenuDragMouseEntered (MenuDragMouseEvent event)
+ protected void fireMenuDragMouseEntered(MenuDragMouseEvent event)
{
// TODO
}
@@ -333,7 +330,7 @@ public class JMenuItem extends AbstractB
*
* @param event DOCUMENT ME!
*/
- protected void fireMenuDragMouseExited (MenuDragMouseEvent event)
+ protected void fireMenuDragMouseExited(MenuDragMouseEvent event)
{
// TODO
}
@@ -343,7 +340,7 @@ public class JMenuItem extends AbstractB
*
* @param event DOCUMENT ME!
*/
- protected void fireMenuDragMouseDragged (MenuDragMouseEvent event)
+ protected void fireMenuDragMouseDragged(MenuDragMouseEvent event)
{
// TODO
}
@@ -353,7 +350,7 @@ public class JMenuItem extends AbstractB
*
* @param event DOCUMENT ME!
*/
- protected void fireMenuDragMouseReleased (MenuDragMouseEvent event)
+ protected void fireMenuDragMouseReleased(MenuDragMouseEvent event)
{
// TODO
}
@@ -363,7 +360,7 @@ public class JMenuItem extends AbstractB
*
* @param event DOCUMENT ME!
*/
- protected void fireMenuKeyPressed (MenuKeyEvent event)
+ protected void fireMenuKeyPressed(MenuKeyEvent event)
{
// TODO
}
@@ -373,7 +370,7 @@ public class JMenuItem extends AbstractB
*
* @param event DOCUMENT ME!
*/
- protected void fireMenuKeyReleased (MenuKeyEvent event)
+ protected void fireMenuKeyReleased(MenuKeyEvent event)
{
// TODO
}
@@ -383,7 +380,7 @@ public class JMenuItem extends AbstractB
*
* @param event DOCUMENT ME!
*/
- protected void fireMenuKeyTyped (MenuKeyEvent event)
+ protected void fireMenuKeyTyped(MenuKeyEvent event)
{
// TODO
}
@@ -393,7 +390,7 @@ public class JMenuItem extends AbstractB
*
* @param changed DOCUMENT ME!
*/
- public void menuSelectionChanged (boolean changed)
+ public void menuSelectionChanged(boolean changed)
{
// TODO
}
@@ -403,7 +400,7 @@ public class JMenuItem extends AbstractB
*
* @return $returnType$ DOCUMENT ME!
*/
- public MenuElement[] getSubElements ()
+ public MenuElement[] getSubElements()
{
return null; // TODO
}
@@ -413,7 +410,7 @@ public class JMenuItem extends AbstractB
*
* @return $returnType$ DOCUMENT ME!
*/
- public Component getComponent ()
+ public Component getComponent()
{
return null; // TODO
}
@@ -423,7 +420,7 @@ public class JMenuItem extends AbstractB
*
* @param listener DOCUMENT ME!
*/
- public void addMenuDragMouseListener (MenuDragMouseListener listener)
+ public void addMenuDragMouseListener(MenuDragMouseListener listener)
{
// TODO
}
@@ -433,28 +430,34 @@ public class JMenuItem extends AbstractB
*
* @param listener DOCUMENT ME!
*/
- public void removeMenuDragMouseListener (MenuDragMouseListener listener) {}
+ public void removeMenuDragMouseListener(MenuDragMouseListener listener)
+ {
+ }
/**
* DOCUMENT ME!
*
* @param listener DOCUMENT ME!
*/
- public void addMenuKeyListener (MenuKeyListener listener) {}
+ public void addMenuKeyListener(MenuKeyListener listener)
+ {
+ }
/**
* DOCUMENT ME!
*
* @param listener DOCUMENT ME!
*/
- public void removeMenuKeyListener (MenuKeyListener listener) {}
+ public void removeMenuKeyListener(MenuKeyListener listener)
+ {
+ }
/**
* DOCUMENT ME!
*
* @return $returnType$ DOCUMENT ME!
*/
- protected String paramString ()
+ protected String paramString()
{
return "JMenuItem";
}
@@ -464,7 +467,7 @@ public class JMenuItem extends AbstractB
*
* @return $returnType$ DOCUMENT ME!
*/
- public AccessibleContext getAccessibleContext ()
+ public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
accessibleContext = new AccessibleJMenuItem(this);
@@ -486,7 +489,7 @@ public class JMenuItem extends AbstractB
*
* @param component DOCUMENT ME!
*/
- AccessibleJMenuItem (JMenuItem component)
+ AccessibleJMenuItem(JMenuItem component)
{
super(component);
@@ -498,7 +501,7 @@ public class JMenuItem extends AbstractB
*
* @param event DOCUMENT ME!
*/
- public void stateChanged (ChangeEvent event)
+ public void stateChanged(ChangeEvent event)
{
// TODO
}
@@ -508,7 +511,7 @@ public class JMenuItem extends AbstractB
*
* @return $returnType$ DOCUMENT ME!
*/
- public AccessibleRole getAccessibleRole ()
+ public AccessibleRole getAccessibleRole()
{
return AccessibleRole.MENU_ITEM;
}
Index: javax/swing/JRadioButtonMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRadioButtonMenuItem.java,v
retrieving revision 1.3.8.3
diff -c -p -u -r1.3.8.3 JRadioButtonMenuItem.java
--- javax/swing/JRadioButtonMenuItem.java 26 Apr 2004 16:24:50 -0000 1.3.8.3
+++ javax/swing/JRadioButtonMenuItem.java 26 Apr 2004 17:42:54 -0000
@@ -1,4 +1,4 @@
-/* JRadioButtonMenuItem.java --
+/* JRadioButtonMenuItem.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,7 +39,6 @@ package javax.swing;
import java.io.IOException;
import java.io.ObjectOutputStream;
-
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
@@ -58,7 +57,7 @@ public class JRadioButtonMenuItem extend
/**
* Creates a new JRadioButtonMenuItem object.
*/
- public JRadioButtonMenuItem ()
+ public JRadioButtonMenuItem()
{
this(null, null);
}
@@ -68,7 +67,7 @@ public class JRadioButtonMenuItem extend
*
* @param icon DOCUMENT ME!
*/
- public JRadioButtonMenuItem (Icon icon)
+ public JRadioButtonMenuItem(Icon icon)
{
this(null, icon);
}
@@ -78,7 +77,7 @@ public class JRadioButtonMenuItem extend
*
* @param text DOCUMENT ME!
*/
- public JRadioButtonMenuItem (String text)
+ public JRadioButtonMenuItem(String text)
{
this(text, null);
}
@@ -88,10 +87,10 @@ public class JRadioButtonMenuItem extend
*
* @param action DOCUMENT ME!
*/
- public JRadioButtonMenuItem (Action action)
+ public JRadioButtonMenuItem(Action action)
{
this();
- setAction (action);
+ setAction(action);
}
/**
@@ -100,7 +99,7 @@ public class JRadioButtonMenuItem extend
* @param text DOCUMENT ME!
* @param icon DOCUMENT ME!
*/
- public JRadioButtonMenuItem (String text, Icon icon)
+ public JRadioButtonMenuItem(String text, Icon icon)
{
this(text, icon, false);
}
@@ -111,7 +110,7 @@ public class JRadioButtonMenuItem extend
* @param text DOCUMENT ME!
* @param selected DOCUMENT ME!
*/
- public JRadioButtonMenuItem (String text, boolean selected)
+ public JRadioButtonMenuItem(String text, boolean selected)
{
this(text, null, selected);
}
@@ -122,7 +121,7 @@ public class JRadioButtonMenuItem extend
* @param icon DOCUMENT ME!
* @param selected DOCUMENT ME!
*/
- public JRadioButtonMenuItem (Icon icon, boolean selected)
+ public JRadioButtonMenuItem(Icon icon, boolean selected)
{
this(null, icon, selected);
}
@@ -134,11 +133,11 @@ public class JRadioButtonMenuItem extend
* @param icon DOCUMENT ME!
* @param selected DOCUMENT ME!
*/
- public JRadioButtonMenuItem (String text, Icon icon, boolean selected)
+ public JRadioButtonMenuItem(String text, Icon icon, boolean selected)
{
super(text, icon);
- setModel (new JToggleButton.ToggleButtonModel());
- model.setSelected (selected);
+ setModel(new JToggleButton.ToggleButtonModel());
+ model.setSelected(selected);
}
/**
@@ -148,8 +147,7 @@ public class JRadioButtonMenuItem extend
*
* @throws IOException DOCUMENT ME!
*/
- private void writeObject (ObjectOutputStream stream)
- throws IOException
+ private void writeObject(ObjectOutputStream stream) throws IOException
{
// TODO
}
@@ -159,7 +157,7 @@ public class JRadioButtonMenuItem extend
*
* @return $returnType$ DOCUMENT ME!
*/
- public String getUIClassID ()
+ public String getUIClassID()
{
return uiClassID;
}
@@ -167,7 +165,7 @@ public class JRadioButtonMenuItem extend
/**
* DOCUMENT ME!
*/
- public void requestFocus ()
+ public void requestFocus()
{
// TODO
}
@@ -177,7 +175,7 @@ public class JRadioButtonMenuItem extend
*
* @return $returnType$ DOCUMENT ME!
*/
- protected String paramString ()
+ protected String paramString()
{
return "JRadioButtonMenuItem";
}
@@ -187,7 +185,7 @@ public class JRadioButtonMenuItem extend
*
* @return $returnType$ DOCUMENT ME!
*/
- public AccessibleContext getAccessibleContext ()
+ public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
accessibleContext = new AccessibleJRadioButtonMenuItem(this);
@@ -208,7 +206,7 @@ public class JRadioButtonMenuItem extend
*
* @param component DOCUMENT ME!
*/
- protected AccessibleJRadioButtonMenuItem (JRadioButtonMenuItem component)
+ protected AccessibleJRadioButtonMenuItem(JRadioButtonMenuItem component)
{
super(component);
@@ -220,7 +218,7 @@ public class JRadioButtonMenuItem extend
*
* @return $returnType$ DOCUMENT ME!
*/
- public AccessibleRole getAccessibleRole ()
+ public AccessibleRole getAccessibleRole()
{
return AccessibleRole.RADIO_BUTTON;
}
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.2
diff -c -p -u -r1.1.2.2 BasicCheckBoxMenuItemUI.java
--- javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java 26 Apr 2004 16:24:50 -0000 1.1.2.2
+++ javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java 26 Apr 2004 17:42:54 -0000
@@ -38,7 +38,6 @@ 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;
@@ -65,7 +64,7 @@ public class BasicCheckBoxMenuItemUI ext
*
* @return $returnType$ DOCUMENT ME!
*/
- public static ComponentUI createUI (final JComponent c)
+ public static ComponentUI createUI(final JComponent c)
{
return new BasicCheckBoxMenuItemUI();
}
@@ -75,7 +74,7 @@ public class BasicCheckBoxMenuItemUI ext
*
* @return $returnType$ DOCUMENT ME!
*/
- protected String getPropertyPrefix ()
+ protected String getPropertyPrefix()
{
return null; // TODO
}
@@ -83,12 +82,12 @@ public class BasicCheckBoxMenuItemUI ext
/**
* DOCUMENT ME!
*/
- protected void installDefaults ()
+ 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");
}
/**
@@ -99,6 +98,8 @@ public class BasicCheckBoxMenuItemUI ext
* @param path DOCUMENT ME!
* @param manager DOCUMENT ME!
*/
- void processMouseEvent (JMenuItem item, MouseEvent e, MenuElement[] path,
- MenuSelectionManager manager) {}
+ 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.5
diff -c -p -u -r1.1.2.5 BasicMenuItemUI.java
--- javax/swing/plaf/basic/BasicMenuItemUI.java 26 Apr 2004 16:24:50 -0000 1.1.2.5
+++ javax/swing/plaf/basic/BasicMenuItemUI.java 26 Apr 2004 17:42:54 -0000
@@ -55,10 +55,8 @@ import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-
import javax.swing.AbstractButton;
import javax.swing.ButtonModel;
import javax.swing.Icon;
@@ -174,15 +172,14 @@ public class BasicMenuItemUI extends Men
*/
private int defaultAcceleratorLabelGap = 4;
-
- BasicMenuItemUI ()
+ BasicMenuItemUI()
{
- mouseInputListener = createMouseInputListener (menuItem);
- menuDragMouseListener = createMenuDragMouseListener (menuItem);
- menuKeyListener = createMenuKeyListener (menuItem);
+ mouseInputListener = createMouseInputListener(menuItem);
+ menuDragMouseListener = createMenuDragMouseListener(menuItem);
+ menuKeyListener = createMenuKeyListener(menuItem);
}
- protected MenuDragMouseListener createMenuDragMouseListener (JComponent c)
+ protected MenuDragMouseListener createMenuDragMouseListener(JComponent c)
{
return new MenuDragMouseHandler();
}
@@ -194,7 +191,7 @@ public class BasicMenuItemUI extends Men
*
* @return $returnType$ DOCUMENT ME!
*/
- protected MenuKeyListener createMenuKeyListener (JComponent c)
+ protected MenuKeyListener createMenuKeyListener(JComponent c)
{
return new MenuKeyHandler();
}
@@ -206,7 +203,7 @@ public class BasicMenuItemUI extends Men
*
* @return $returnType$ DOCUMENT ME!
*/
- protected MouseInputListener createMouseInputListener (JComponent c)
+ protected MouseInputListener createMouseInputListener(JComponent c)
{
return new MouseInputHandler();
}
@@ -218,7 +215,7 @@ public class BasicMenuItemUI extends Men
*
* @return $returnType$ DOCUMENT ME!
*/
- public static ComponentUI createUI (JComponent c)
+ public static ComponentUI createUI(JComponent c)
{
return new BasicMenuItemUI();
}
@@ -228,7 +225,7 @@ public class BasicMenuItemUI extends Men
*
* @param msm DOCUMENT ME!
*/
- protected void doClick (MenuSelectionManager msm)
+ protected void doClick(MenuSelectionManager msm)
{
// TODO
}
@@ -240,7 +237,7 @@ public class BasicMenuItemUI extends Men
*
* @return $returnType$ DOCUMENT ME!
*/
- public Dimension getMaximumSize (JComponent c)
+ public Dimension getMaximumSize(JComponent c)
{
// TODO
return null;
@@ -253,7 +250,7 @@ public class BasicMenuItemUI extends Men
*
* @return $returnType$ DOCUMENT ME!
*/
- public Dimension getMinimumSize (JComponent c)
+ public Dimension getMinimumSize(JComponent c)
{
// TODO
return null;
@@ -264,7 +261,7 @@ public class BasicMenuItemUI extends Men
*
* @return $returnType$ DOCUMENT ME!
*/
- public MenuElement[] getPath ()
+ public MenuElement[] getPath()
{
// TODO
return null;
@@ -280,9 +277,9 @@ public class BasicMenuItemUI extends Men
*
* @return $returnType$ DOCUMENT ME!
*/
- protected Dimension getPreferredMenuItemSize (JComponent c, Icon checkIcon,
- Icon arrowIcon,
- int defaultTextIconGap)
+ protected Dimension getPreferredMenuItemSize(JComponent c, Icon checkIcon,
+ Icon arrowIcon,
+ int defaultTextIconGap)
{
// TODO
return null;
@@ -295,36 +292,36 @@ public class BasicMenuItemUI extends Men
*
* @return $returnType$ DOCUMENT ME!
*/
- public Dimension getPreferredSize (JComponent c)
+ 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;
+ // add width of accelerator's text
+ d.width = d.width + rect.width + defaultAcceleratorLabelGap;
- // adjust the heigth of the preferred size if necessary
- if (d.height < rect.height)
- d.height = rect.height;
+ // adjust the heigth of the preferred size if necessary
+ if (d.height < rect.height)
+ d.height = rect.height;
}
if (checkIcon != null)
{
- d.width = d.width + checkIcon.getIconWidth () + defaultTextIconGap;
+ d.width = d.width + checkIcon.getIconWidth() + defaultTextIconGap;
- if (checkIcon.getIconHeight () > d.height)
- d.height = checkIcon.getIconHeight ();
+ if (checkIcon.getIconHeight() > d.height)
+ d.height = checkIcon.getIconHeight();
}
return d;
@@ -335,7 +332,7 @@ public class BasicMenuItemUI extends Men
*
* @return $returnType$ DOCUMENT ME!
*/
- protected String getPropertyPrefix ()
+ protected String getPropertyPrefix()
{
// TODO
return null;
@@ -346,7 +343,7 @@ public class BasicMenuItemUI extends Men
*
* @param menuItem DOCUMENT ME!
*/
- protected void installComponents (JMenuItem menuItem)
+ protected void installComponents(JMenuItem menuItem)
{
// TODO
}
@@ -354,28 +351,28 @@ public class BasicMenuItemUI extends Men
/**
* DOCUMENT ME!
*/
- protected void installDefaults ()
+ 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");
}
/**
* DOCUMENT ME!
*/
- protected void installKeyboardActions ()
+ protected void installKeyboardActions()
{
// TODO
}
@@ -383,11 +380,11 @@ public class BasicMenuItemUI extends Men
/**
* DOCUMENT ME!
*/
- protected void installListeners ()
+ protected void installListeners()
{
- menuItem.addMouseListener (mouseInputListener);
- menuItem.addMenuDragMouseListener (menuDragMouseListener);
- menuItem.addMenuKeyListener (menuKeyListener);
+ menuItem.addMouseListener(mouseInputListener);
+ menuItem.addMenuDragMouseListener(menuDragMouseListener);
+ menuItem.addMenuKeyListener(menuKeyListener);
}
/**
@@ -395,12 +392,12 @@ public class BasicMenuItemUI extends Men
*
* @param c DOCUMENT ME!
*/
- public void installUI (JComponent c)
+ public void installUI(JComponent c)
{
- super.installUI (c);
+ super.installUI(c);
menuItem = (JMenuItem) c;
- installDefaults ();
- installListeners ();
+ installDefaults();
+ installListeners();
}
/**
@@ -409,10 +406,10 @@ public class BasicMenuItemUI extends Men
* @param g DOCUMENT ME!
* @param c DOCUMENT ME!
*/
- public void paint (Graphics g, JComponent c)
+ 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);
}
/**
@@ -422,13 +419,13 @@ public class BasicMenuItemUI extends Men
* @param menuItem DOCUMENT ME!
* @param bgColor DOCUMENT ME!
*/
- protected void paintBackground (Graphics g, JMenuItem menuItem, Color bgColor)
+ 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);
}
/**
@@ -442,9 +439,9 @@ public class BasicMenuItemUI extends Men
* @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)
+ 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
@@ -454,62 +451,62 @@ public class BasicMenuItemUI extends Men
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 ());
+ 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 ((b.getModel().isArmed() && b.getModel().isPressed()))
{
- if (((AbstractButton) b).isContentAreaFilled ())
- {
- g.setColor (b.getBackground ().darker ());
- g.fillRect (br.x, br.y, br.width, br.height);
- }
+ if (((AbstractButton) b).isContentAreaFilled())
+ {
+ g.setColor(b.getBackground().darker());
+ g.fillRect(br.x, br.y, br.width, br.height);
+ }
}
else
{
- if (((AbstractButton) b).isContentAreaFilled ())
- {
- g.setColor (b.getBackground ());
- g.fillRect (br.x, br.y, br.width, br.height);
- }
+ if (((AbstractButton) b).isContentAreaFilled())
+ {
+ 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);
-
- // 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;
+ 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;
}
if (arrowIcon != null)
{
- // FIXME: if this menu contains a submenu, we need to draw arrow icon
- // here as well
+ // FIXME: if this menu contains a submenu, we need to draw arrow icon
+ // 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.
@@ -528,20 +525,20 @@ public class BasicMenuItemUI extends Men
// 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;
- vr.x = br.width - ar.width;
-
- SwingUtilities.layoutCompoundLabel (c, fm, acceleratorText, null,
- vertAlign, horAlign, vertTextPos,
- horTextPos, vr, ir, ar,
- defaultTextIconGap);
+ 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);
+ paintAccelerator(g, (JMenuItem) c, ar, acceleratorText);
}
}
@@ -553,16 +550,16 @@ public class BasicMenuItemUI extends Men
* @param textRect DOCUMENT ME!
* @param text DOCUMENT ME!
*/
- protected void paintText (Graphics g, JMenuItem menuItem, Rectangle textRect,
- String text)
+ 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());
}
/**
@@ -570,7 +567,7 @@ public class BasicMenuItemUI extends Men
*
* @param menuItem DOCUMENT ME!
*/
- protected void uninstallComponents (JMenuItem menuItem)
+ protected void uninstallComponents(JMenuItem menuItem)
{
// TODO
}
@@ -578,17 +575,17 @@ public class BasicMenuItemUI extends Men
/**
* DOCUMENT ME!
*/
- protected void uninstallDefaults ()
+ 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;
@@ -601,7 +598,7 @@ public class BasicMenuItemUI extends Men
/**
* DOCUMENT ME!
*/
- protected void uninstallKeyboardActions ()
+ protected void uninstallKeyboardActions()
{
// TODO
}
@@ -609,11 +606,11 @@ public class BasicMenuItemUI extends Men
/**
* DOCUMENT ME!
*/
- protected void uninstallListeners ()
+ protected void uninstallListeners()
{
- menuItem.removeMouseListener (mouseInputListener);
- menuItem.removeMenuDragMouseListener (menuDragMouseListener);
- menuItem.removeMenuKeyListener (menuKeyListener);
+ menuItem.removeMouseListener(mouseInputListener);
+ menuItem.removeMenuDragMouseListener(menuDragMouseListener);
+ menuItem.removeMenuKeyListener(menuKeyListener);
}
/**
@@ -621,10 +618,10 @@ public class BasicMenuItemUI extends Men
*
* @param c DOCUMENT ME!
*/
- public void uninstallUI (JComponent c)
+ public void uninstallUI(JComponent c)
{
- uninstallListeners ();
- uninstallDefaults ();
+ uninstallListeners();
+ uninstallDefaults();
menuItem = null;
}
@@ -634,7 +631,7 @@ public class BasicMenuItemUI extends Men
* @param g DOCUMENT ME!
* @param c DOCUMENT ME!
*/
- public void update (Graphics g, JComponent c)
+ public void update(Graphics g, JComponent c)
{
// TODO
}
@@ -646,22 +643,22 @@ public class BasicMenuItemUI extends Men
*
* @return $returnType$ DOCUMENT ME!
*/
- private String getAcceleratorText (KeyStroke accelerator)
+ 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) +
- acceleratorDelimiter;
+ modifiersText = KeyEvent.getKeyModifiersText(modifiers)
+ + acceleratorDelimiter;
if (keyCode == KeyEvent.VK_UNDEFINED)
return modifiersText + keyChar;
else
- return modifiersText + KeyEvent.getKeyText (keyCode);
+ return modifiersText + KeyEvent.getKeyText(keyCode);
}
/**
@@ -672,10 +669,10 @@ public class BasicMenuItemUI extends Men
*
* @return $returnType$ DOCUMENT ME!
*/
- private Rectangle getAcceleratorRect (KeyStroke accelerator, FontMetrics fm)
+ private Rectangle getAcceleratorRect(KeyStroke accelerator, FontMetrics fm)
{
- int width = fm.stringWidth (getAcceleratorText (accelerator));
- int height = fm.getHeight ();
+ int width = fm.stringWidth(getAcceleratorText(accelerator));
+ int height = fm.getHeight();
return new Rectangle(0, 0, width, height);
}
@@ -687,15 +684,15 @@ public class BasicMenuItemUI extends Men
* @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 ());
+ 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());
}
/**
@@ -709,42 +706,48 @@ public class BasicMenuItemUI extends Men
/**
* Creates a new MouseInputHandler object.
*/
- protected MouseInputHandler () {}
+ protected MouseInputHandler()
+ {
+ }
/**
* DOCUMENT ME!
*
* @param e DOCUMENT ME!
*/
- public void mouseClicked (MouseEvent e) {}
+ public void mouseClicked(MouseEvent e)
+ {
+ }
/**
* DOCUMENT ME!
*
* @param e DOCUMENT ME!
*/
- public void mouseDragged (MouseEvent e) {}
+ 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);
- else
- model.setArmed (false);
+ if (model.isPressed()
+ && ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0))
+ model.setArmed(true);
+ else
+ model.setArmed(false);
}
}
@@ -753,17 +756,17 @@ public class BasicMenuItemUI extends Men
*
* @param e DOCUMENT ME!
*/
- public void mouseExited (MouseEvent e)
+ 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);
}
}
@@ -772,26 +775,28 @@ public class BasicMenuItemUI extends Men
*
* @param e DOCUMENT ME!
*/
- public void mouseMoved (MouseEvent e) {}
+ 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)
- {
- // It is important that these transitions happen in this order.
- model.setArmed (true);
- model.setPressed (true);
- }
+ if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+ {
+ // It is important that these transitions happen in this order.
+ model.setArmed(true);
+ model.setPressed(true);
+ }
}
}
@@ -800,19 +805,19 @@ public class BasicMenuItemUI extends Men
*
* @param e DOCUMENT ME!
*/
- public void mouseReleased (MouseEvent e)
+ 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)
- {
- // It is important that these transitions happen in this order.
- model.setPressed (false);
- model.setArmed (false);
- }
+ if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+ {
+ // It is important that these transitions happen in this order.
+ model.setPressed(false);
+ model.setArmed(false);
+ }
}
}
}
@@ -830,7 +835,7 @@ public class BasicMenuItemUI extends Men
*
* @param e DOCUMENT ME!
*/
- public void menuDragMouseDragged (MenuDragMouseEvent e)
+ public void menuDragMouseDragged(MenuDragMouseEvent e)
{
// TODO
}
@@ -840,7 +845,7 @@ public class BasicMenuItemUI extends Men
*
* @param e DOCUMENT ME!
*/
- public void menuDragMouseEntered (MenuDragMouseEvent e)
+ public void menuDragMouseEntered(MenuDragMouseEvent e)
{
// TODO
}
@@ -850,7 +855,7 @@ public class BasicMenuItemUI extends Men
*
* @param e DOCUMENT ME!
*/
- public void menuDragMouseExited (MenuDragMouseEvent e)
+ public void menuDragMouseExited(MenuDragMouseEvent e)
{
// TODO
}
@@ -860,7 +865,7 @@ public class BasicMenuItemUI extends Men
*
* @param e DOCUMENT ME!
*/
- public void menuDragMouseReleased (MenuDragMouseEvent e)
+ public void menuDragMouseReleased(MenuDragMouseEvent e)
{
// TODO
}
@@ -879,7 +884,7 @@ public class BasicMenuItemUI extends Men
*
* @param e DOCUMENT ME!
*/
- public void menuKeyPressed (MenuKeyEvent e)
+ public void menuKeyPressed(MenuKeyEvent e)
{
// TODO
}
@@ -889,7 +894,7 @@ public class BasicMenuItemUI extends Men
*
* @param e DOCUMENT ME!
*/
- public void menuKeyReleased (MenuKeyEvent e)
+ public void menuKeyReleased(MenuKeyEvent e)
{
// TODO
}
@@ -899,7 +904,7 @@ public class BasicMenuItemUI extends Men
*
* @param e DOCUMENT ME!
*/
- public void menuKeyTyped (MenuKeyEvent e)
+ public void menuKeyTyped(MenuKeyEvent e)
{
// TODO
}
@@ -918,7 +923,7 @@ public class BasicMenuItemUI extends Men
*
* @param evt DOCUMENT ME!
*/
- public void propertyChange (PropertyChangeEvent evt)
+ 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.2
diff -c -p -u -r1.1.2.2 BasicRadioButtonMenuItemUI.java
--- javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java 26 Apr 2004 16:24:50 -0000 1.1.2.2
+++ javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java 26 Apr 2004 17:42:54 -0000
@@ -38,7 +38,6 @@ 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;
@@ -61,11 +60,11 @@ public class BasicRadioButtonMenuItemUI
/**
* Creates a new BasicRadioButtonMenuItemUI object.
*/
- public BasicRadioButtonMenuItemUI ()
+ public BasicRadioButtonMenuItemUI()
{
super();
- UIDefaults defaults = UIManager.getLookAndFeelDefaults ();
- checkIcon = defaults.getIcon ("RadioButtonMenuItem.checkIcon");
+ UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+ checkIcon = defaults.getIcon("RadioButtonMenuItem.checkIcon");
}
/**
@@ -75,7 +74,7 @@ public class BasicRadioButtonMenuItemUI
*
* @return $returnType$ DOCUMENT ME!
*/
- public static ComponentUI createUI (JComponent b)
+ public static ComponentUI createUI(JComponent b)
{
return new BasicRadioButtonMenuItemUI();
}
@@ -85,7 +84,7 @@ public class BasicRadioButtonMenuItemUI
*
* @return $returnType$ DOCUMENT ME!
*/
- protected String getPropertyPrefix ()
+ protected String getPropertyPrefix()
{
return null;
// TODO
@@ -99,6 +98,8 @@ public class BasicRadioButtonMenuItemUI
* @param path DOCUMENT ME!
* @param manager DOCUMENT ME!
*/
- void processMouseEvent (JMenuItem item, MouseEvent e, MenuElement[] path,
- MenuSelectionManager manager) {}
+ void processMouseEvent(JMenuItem item, MouseEvent e, MenuElement[] path,
+ MenuSelectionManager manager)
+ {
+ }
}
More information about the Java-patches
mailing list