Canvas.java (serialVersionUID): New constant.

* java/awt/Canvas.java (serialVersionUID): New constant.
	Updated copyright.  Added javadoc from Classpath.
	* java/awt/ItemSelectable.java: Replaced with Classpath version.

From-SVN: r48934
This commit is contained in:
Tom Tromey 2002-01-16 23:56:25 +00:00 committed by Tom Tromey
parent d8d27d73b0
commit 4cd533411e
3 changed files with 109 additions and 40 deletions

View File

@ -1,5 +1,9 @@
2002-01-16 Tom Tromey <tromey@redhat.com>
* java/awt/Canvas.java (serialVersionUID): New constant.
Updated copyright. Added javadoc from Classpath.
* java/awt/ItemSelectable.java: Replaced with Classpath version.
* java/awt/CheckboxGroup.java: Merged with Classpath.
* java/awt/Checkbox.java: Merged with Classpath.

View File

@ -1,21 +1,42 @@
/* Copyright (C) 2000 Free Software Foundation
/* Copyright (C) 1999, 2000, 2002 Free Software Foundation
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;
import java.awt.peer.ComponentPeer;
public class Canvas extends Component
public class Canvas extends Component implements java.io.Serializable
{
transient GraphicsConfiguration graphicsConfiguration;
/**
* Initializes a new instance of <code>Canvas</code>.
*/
public Canvas() { }
public Canvas(GraphicsConfiguration graphicsConfiguration)
{
this.graphicsConfiguration = graphicsConfiguration;
@ -28,17 +49,21 @@ public class Canvas extends Component
return super.getGraphicsConfigurationImpl();
}
/**
* Creates the native peer for this object.
*/
public void addNotify()
{
if (peer == null)
{
peer = (ComponentPeer) getToolkit().createCanvas(this);
}
peer = (ComponentPeer) getToolkit().createCanvas(this);
super.addNotify();
}
/** Override this to create components with custom painting.
Defaults to filling the component with the background color. */
/**
* Repaints the canvas window. This method should be overriden by
* a subclass to do something useful, as this method simply paints
* the window with the background color.
*/
public void paint(Graphics gfx)
{
/* This implementation doesn't make much sense since the filling
@ -49,4 +74,7 @@ public class Canvas extends Component
Dimension size = getSize();
gfx.fillRect(0, 0, size.width, size.height);
}
// Serialization constant
private static final long serialVersionUID = -2284879212465893870L;
}

View File

@ -1,36 +1,73 @@
/* Copyright (C) 2000 Free Software Foundation
/* ItemSelectable.java -- Items that can be selected
Copyright (C) 1999 Free Software Foundation, Inc.
This file is part of libjava.
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
Libjava License. Please consult the file "LIBJAVA_LICENSE" for
details. */
package java.awt;
import java.awt.event.*;
/** This interface is implemented by components that support the
* select of items. For instance, Checkbox implements this
* interface.
* @author Tom Tromey <tromey@cygnus.com>
* @date April 8, 2000
*/
import java.awt.event.ItemListener;
/**
* This interface is for objects that can have one or more items
* selected. For example, radio buttons.
*
* @author Aaron M. Renn (arenn@urbanophile.com)
*/
public interface ItemSelectable
{
/** This method adds a listener to receive item events fired by the
* component.
* @param l The item listener to add.
*/
public void addItemListener (ItemListener l);
/** This method returns the items in this component which are
* currently selected.
* @returns A non-null array containing the items.
*/
public Object[] getSelectedObjects ();
/**
* Returns the list of objects that are selected in this component.
*
* @return The list of objects that are selected, or <code>null</code> if
* no objects are selected.
*/
public abstract Object[]
getSelectedObjects();
/*************************************************************************/
/**
* Adds an item listener to this object. It will receive
* selection events for this object.
*
* @param listener The item listener to add.
*/
public abstract void
addItemListener(ItemListener listener);
/*************************************************************************/
/**
* Removes an item listener from this object. It will no longer receive
* selection change events.
*
* @param listener The item listener to remove.
*/
public abstract void
removeItemListener(ItemListener listener);
} // interface ItemSelectable
/** This method removes an item listener.
* @param l The item listener to remove.
*/
public void removeItemListener (ItemListener l);
}