1 files changed, 303 insertions, 111 deletions
diff --git a/libjava/java/awt/MenuComponent.java b/libjava/java/awt/MenuComponent.java
index a6905ed..41a085f 100644
--- a/libjava/java/awt/MenuComponent.java
+++ b/libjava/java/awt/MenuComponent.java
@@ -1,120 +1,312 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
+/* MenuComponent.java -- Superclass of all AWT menu components
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
-   This file is part of libgcj.
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
 
 package java.awt;
 
-/* Status: partially complete, untested. */
+import java.awt.peer.MenuComponentPeer;
+
+// FIXME: Java 1.0 event model unimplemented
 
+/**
+  * This is the superclass of all non-menu AWT widgets. 
+  *
+  * @author Aaron M. Renn (arenn@urbanophile.com)
+  */
 public abstract class MenuComponent implements java.io.Serializable
 {
-  // Fields from the serialization spec. Decalare others "transient".
-  Font font;
-  String name;
-  boolean nameExplicitlySet;
-  boolean newEventsOnly;
-  //AccessibleContext accessibleContext;
-  
-  transient MenuContainer parent;
-  transient java.awt.peer.MenuComponentPeer peer;
-
-  public MenuComponent()
-  {
-  }
-
-  public String getName()
-  {
-    if (name == null && !nameExplicitlySet)
-      name = generateName();
-    return name;
-  }
-  
-  /** Subclasses should override this to generate unique names like 
-    * "menuitem0".
-    */
-  String generateName()
-  {
-    // MenuComponent is abstract.
-    return null;
-  }
-
-  public void setName(String name)
-  {
-    nameExplicitlySet = true;
-    this.name = name;
-  }
-
-  public MenuContainer getParent()
-  {
-    return parent;
-  }
-
-  /** @deprecated Don't use this. */
-  public java.awt.peer.MenuComponentPeer getPeer()
-  {
-    return peer;
-  }
-
-  public Font getFont()
-  {
-    return font;
-  }
-
-  public void setFont(Font f)
-  {
-    this.font = f;
-  }
-
-  public void removeNotify()
-  {
-    if (peer != null)
-      peer.dispose ();
-    peer = null;
-  }
-
-  /** @deprecated Replaced by dispatchEvent(AWTEvent) */
-  public boolean postEvent(Event evt)
-  {
-    return false;
-  }
-
-  public final void dispatchEvent(AWTEvent e)
-  {
-    // FIXME
-    dispatchEventImpl(e);
-  }
-  
-  void dispatchEventImpl(AWTEvent e)
-  {
-    // This is overridden by subclasses that support events.
-  }
-
-  protected void processEvent(AWTEvent e)
-  {
-    // Nothing to do here? This is be overridden by subclasses that 
-    // support events.
-  }
-
-  protected String paramString()
-  {
-    return name;
-  }
-
-  public String toString()
-  {
-    return this.getClass().getName() + "[" + paramString() + "]";
-  }
-
-  protected final Object getTreeLock()
-  {
-    // FIXME: figure out how the tree lock works.
-    return null;
-  }
-
-  // Accessibility API not yet implemented.
-  // public AccessibleContext getAccessibleContext()
+
+/*
+ * Static Variables
+ */
+
+// Serialization Constant
+private static final long serialVersionUID = -4536902356223894379L;
+
+/*************************************************************************/
+
+/*
+ * Instance Variables
+ */
+
+  // FIXME: missing serialized fields `nameExplicitlySet',
+  // `newEventsOnly', and `accessibleContext'.
+
+// The font for this component
+private Font font;
+
+// The name of the component
+private String name;
+
+// The parent of this component
+transient MenuContainer parent;
+
+// The native peer for this componet
+transient MenuComponentPeer peer;
+
+// The synchronization locking object for this component
+private transient Object tree_lock = this;
+
+// The toolkit for this object
+private static transient Toolkit toolkit = Toolkit.getDefaultToolkit();
+
+/*************************************************************************/
+
+/*
+ * Constructors
+ */
+
+/**
+  * Default constructor for subclasses.
+  */
+protected
+MenuComponent()
+{
 }
+
+/*************************************************************************/
+
+/*
+ * Instance Methods
+ */
+
+/**
+  * Returns the font in use for this component.
+  *
+  * @return The font for this component.
+  */
+public Font
+getFont()
+{
+  return(font);
+}
+
+/*************************************************************************/
+
+/**
+  * Sets the font for this component to the specified font.
+  *
+  * @param font The new font for this component.
+  */
+public void
+setFont(Font font)
+{
+  this.font = font;
+}
+
+/*************************************************************************/
+
+/**
+  * Returns the name of this component.
+  *
+  * @return The name of this component.
+  */
+public String
+getName()
+{
+  return(name);
+}
+
+/*************************************************************************/
+
+/**
+  * Sets the name of this component to the specified name.
+  *
+  * @param name The new name of this component.
+  */
+public void
+setName(String name)
+{
+  this.name = name;
+}
+
+/*************************************************************************/
+
+/**
+  * Returns the parent of this component.
+  * 
+  * @return The parent of this component.
+  */
+public MenuContainer
+getParent()
+{
+  return(parent);
+} 
+
+/*************************************************************************/
+
+// Sets the parent of this component.
+final void
+setParent(MenuContainer parent)
+{
+  this.parent = parent;
+}
+
+/*************************************************************************/
+
+/**
+  * Returns the native windowing system peer for this component.
+  *
+  * @return The peer for this component.
+  */
+public MenuComponentPeer
+getPeer()
+{
+  return(peer);
+}
+
+/*************************************************************************/
+
+// Sets the peer for this component.
+final void
+setPeer(MenuComponentPeer peer)
+{
+  this.peer = peer;
+}
+
+/*************************************************************************/
+
+/**
+  * Destroys this component's native peer
+  */
+public void
+removeNotify()
+{
+  if (peer != null)
+    peer.dispose();
+  peer = null;
+}
+
+/*************************************************************************/
+
+/**
+  * Returns the toolkit in use for this component.
+  *
+  * @return The toolkit for this component.
+  */
+final Toolkit
+getToolkit()
+{
+  return(toolkit);
+}
+
+/*************************************************************************/
+
+/**
+  * Returns the object used for synchronization locks on this component
+  * when performing tree and layout functions.
+  *
+  * @return The synchronization lock for this component.
+  */
+public final Object
+getTreeLock()
+{
+  return(tree_lock);
+}
+
+/*************************************************************************/
+
+// The sync lock object for this component.
+final void
+setTreeLock(Object tree_lock)
+{
+  this.tree_lock = tree_lock;
+}
+
+/*************************************************************************/
+
+/**
+  * AWT 1.0 event dispatcher.
+  *
+  * @deprecated Deprecated in favor of <code>dispatchEvent()</code>.
+  */
+public boolean
+postEvent(Event event)
+{
+  return(false);
+}
+
+/*************************************************************************/
+
+/**
+  * Sends this event to this component or a subcomponent for processing.
+  *
+  * @param event The event to dispatch
+  */
+public final void
+dispatchEvent(AWTEvent event)
+{
+  // See comment in Component.dispatchEvent().
+  dispatchEventImpl(event);
+}
+
+void
+dispatchEventImpl(AWTEvent e)
+{
+  // This is overridden by subclasses that support events.
+}
+
+/*************************************************************************/
+
+/**
+  * Processes the specified event.  In this class, this method simply
+  * calls one of the more specific event handlers.
+  * 
+  * @param event The event to process.
+  */
+protected void
+processEvent(AWTEvent event)
+{
+}
+
+/*************************************************************************/
+
+/**
+  * Returns a string representation of this component.
+  *
+  * @return A string representation of this component
+  */
+public String
+toString()
+{
+  return(getClass().getName() + "(" + getName() + ")");
+}
+
+/*************************************************************************/
+
+/**
+  * Returns a debugging string for this component
+  */
+protected String
+paramString()
+{
+  return(toString());
+}
+
+// Accessibility API not yet implemented.
+// public AccessibleContext getAccessibleContext()
+
+} // class Component