ButtonPeer.java: Replace with Classpath version.
* java/awt/peer/ButtonPeer.java: Replace with Classpath version. * java/awt/peer/CanvasPeer.java: Replace with Classpath version. * java/awt/peer/CheckboxMenuItemPeer.java: Replace with Classpath version. * java/awt/peer/CheckboxPeer.java: Replace with Classpath version. * java/awt/peer/ChoicePeer.java: Replace with Classpath version. * java/awt/peer/ComponentPeer.java: Replace with Classpath version. * java/awt/peer/ContainerPeer.java: Replace with Classpath version. * java/awt/peer/DialogPeer.java: Replace with Classpath version. * java/awt/peer/FileDialogPeer.java: Replace with Classpath version. * java/awt/peer/FontPeer.java: Replace with Classpath version. * java/awt/peer/FramePeer.java: Replace with Classpath version. * java/awt/peer/LabelPeer.java: Replace with Classpath version. * java/awt/peer/LightweightPeer.java: Replace with Classpath version. * java/awt/peer/ListPeer.java: Replace with Classpath version. * java/awt/peer/MenuBarPeer.java: Replace with Classpath version. * java/awt/peer/MenuComponentPeer.java: Replace with Classpath version. * java/awt/peer/MenuItemPeer.java: Replace with Classpath version. * java/awt/peer/MenuPeer.java: Replace with Classpath version. * java/awt/peer/PanelPeer.java: Replace with Classpath version. * java/awt/peer/PopupMenuPeer.java: Replace with Classpath version. * java/awt/peer/ScrollPanePeer.java: Replace with Classpath version. * java/awt/peer/ScrollbarPeer.java: Replace with Classpath version. * java/awt/peer/TextAreaPeer.java: Replace with Classpath version. * java/awt/peer/TextComponentPeer.java: Replace with Classpath version. * java/awt/peer/TextFieldPeer.java: Replace with Classpath version. * java/awt/peer/WindowPeer.java: Replace with Classpath version. * gnu/awt/xlib/XPanelPeer.java (insets): New method. * gnu/awt/xlib/XCanvasPeer.java (show, hide): New methods. (minimumSize, preferredSize, reshape): Likewise. * gnu/awt/xlib/XFramePeer.java (insets, enable, disable, getColorModel): New methods. * java/awt/PopupMenu.java: Merged with Classpath. * java/awt/MenuBar.java: Merged with Classpath. * java/awt/SystemColor.java: Replace with Classpath version. * java/awt/Panel.java: Merged with Classpath. * java/awt/PaintContext.java: Updated copyright. * java/awt/MenuShortcut.java: Merged with Classpath. * java/awt/MenuContainer.java: Merged with Classpath. * java/awt/Menu.java: Merged with Classpath. * java/awt/MediaEntry.java: New file from Classpath. * java/awt/MediaTracker.java: New file from Classpath. * java/awt/List.java: Merged with Classpath version. * java/awt/Insets.java: Merged with Classpath version. * java/awt/ImageMediaEntry.java: New file from Classpath. * java/awt/Image.java: Replaced with Classpath version. * java/awt/FontMetrics.java: Merged with Classpath version. * java/awt/Cursor.java (getDefaultCursor): Use DEFAULT_CURSOR constant. * java/awt/Font.java: Merged with Classpath version. * java/awt/Dialog.java: Merged with Classpath version. * java/awt/Color.java: Merged with Classpath version. * java/awt/Choice.java: Merged with Classpath version. * java/awt/CheckboxMenuItem.java: Merged with Classpath version. * java/awt/Adjustable.java: Replace with Classpath version. * java/awt/MenuItem.java (paramString): Don't include class name or brackets. Call superclass paramString. * java/awt/MenuComponent.java (toString): Call paramString. (paramString): Compute string; don't call toString. * java/awt/Label.java (paramString): Don't include class name or brackets. Call superclass paramString. * java/awt/Checkbox.java (paramString): Don't include class name or brackets. Call superclass paramString. * java/awt/Button.java (paramString): Don't include class name or brackets. Call superclass paramString. * java/awt/MenuComponent.java (getTreeLock): Now protected. From-SVN: r49099
This commit is contained in:
Tom Tromey
Tom Tromey
parent
e3b0efd1ee
commit
bda1450543
58 changed files with 6837 additions and 2479 deletions
|
|
@ -1,75 +1,196 @@
|
|||
/* Copyright (C) 2000 Free Software Foundation
|
||||
/* MenuShortcut.java -- A class for menu accelerators
|
||||
Copyright (C) 1999, 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;
|
||||
|
||||
import java.awt.event.KeyEvent;
|
||||
|
||||
/* Status: Complete, except for hashCode(). Untested. */
|
||||
|
||||
/**
|
||||
* This class implements a keyboard accelerator for a menu item.
|
||||
*
|
||||
* @author Aaron M. Renn (arenn@urbanophile.com)
|
||||
*/
|
||||
public class MenuShortcut implements java.io.Serializable
|
||||
{
|
||||
// Fields from the serialization spec. Decalare others "transient".
|
||||
int key;
|
||||
boolean usesShift;
|
||||
|
||||
public MenuShortcut(int key)
|
||||
{
|
||||
this.key = key;
|
||||
}
|
||||
/*
|
||||
* Static Variables
|
||||
*/
|
||||
|
||||
public MenuShortcut(int key, boolean useShiftModifier)
|
||||
{
|
||||
this.key = key;
|
||||
this.usesShift = useShiftModifier;
|
||||
}
|
||||
// Serialization Constant
|
||||
private static final long serialVersionUID = 143448358473180225L;
|
||||
|
||||
public int getKey()
|
||||
{
|
||||
return key;
|
||||
}
|
||||
/*************************************************************************/
|
||||
|
||||
public boolean usesShiftModifier()
|
||||
{
|
||||
return usesShift;
|
||||
}
|
||||
/*
|
||||
* Instance Variables
|
||||
*/
|
||||
|
||||
public boolean equals(MenuShortcut ms)
|
||||
{
|
||||
return (ms.key == key && ms.usesShift == usesShift);
|
||||
}
|
||||
/**
|
||||
* @serial The virtual keycode for the shortcut.
|
||||
*/
|
||||
private int key;
|
||||
|
||||
public boolean equals(Object obj)
|
||||
{
|
||||
if (obj instanceof MenuShortcut)
|
||||
{
|
||||
MenuShortcut ms = (MenuShortcut) obj;
|
||||
return (ms.key == key && ms.usesShift == usesShift);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
/**
|
||||
* @serial <code>true</code> if the shift key was used with this shortcut,
|
||||
* or <code>false</code> otherwise.
|
||||
*/
|
||||
private boolean usesShift;
|
||||
|
||||
public int hashCode()
|
||||
{
|
||||
// FIXME: find/implement the correct algorithm for this
|
||||
if (usesShift)
|
||||
return (2 * key);
|
||||
else
|
||||
return key;
|
||||
}
|
||||
/*************************************************************************/
|
||||
|
||||
public String toString()
|
||||
{
|
||||
return paramString(); // ?
|
||||
}
|
||||
|
||||
protected String paramString()
|
||||
{
|
||||
return KeyEvent.getKeyText(key);
|
||||
}
|
||||
/**
|
||||
* Initializes a new instance of <code>MenuShortcut</code> with the
|
||||
* specified virtual key value.
|
||||
*
|
||||
* @param key The virtual keycode for the shortcut.
|
||||
*/
|
||||
public
|
||||
MenuShortcut(int key)
|
||||
{
|
||||
this(key, false);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Initializes a new instance of <code>MenuShortcut</code> with the
|
||||
* specified virtual key value and shift setting.
|
||||
*
|
||||
* @param key The virtual keycode for the shortcut.
|
||||
* @param usesShift <code>true</code> if the shift key was pressed,
|
||||
* <code>false</code> otherwise.
|
||||
*/
|
||||
public
|
||||
MenuShortcut(int key, boolean usesShift)
|
||||
{
|
||||
this.key = key;
|
||||
this.usesShift = usesShift;
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/*
|
||||
* Instance Methods
|
||||
*/
|
||||
|
||||
/**
|
||||
* Returns the virtual keycode for this shortcut.
|
||||
*
|
||||
* @return The virtual keycode for this shortcut.
|
||||
*/
|
||||
public int
|
||||
getKey()
|
||||
{
|
||||
return(key);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Returns the shift setting for this shortcut.
|
||||
*
|
||||
* @return <code>true</code> if the shift key was pressed, <code>false</code>
|
||||
* otherwise.
|
||||
*/
|
||||
public boolean
|
||||
usesShiftModifier()
|
||||
{
|
||||
return(usesShift);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Tests this object for equality against the specified object. The two
|
||||
* objects will be considered equal if and only if the specified object
|
||||
* is an instance of <code>MenuShortcut</code> and has the same key value
|
||||
* and shift setting as this object.
|
||||
*
|
||||
* @param obj The object to test for equality against.
|
||||
*
|
||||
* @return <code>true</code> if the two objects are equal, <code>false</code>
|
||||
* otherwise.
|
||||
*/
|
||||
public boolean
|
||||
equals(MenuShortcut obj)
|
||||
{
|
||||
if (obj == null)
|
||||
return(false);
|
||||
|
||||
if (obj.key != this.key)
|
||||
return(false);
|
||||
|
||||
if (obj.usesShift != this.usesShift)
|
||||
return(false);
|
||||
|
||||
return(true);
|
||||
}
|
||||
|
||||
public boolean
|
||||
equals(Object obj)
|
||||
{
|
||||
if (obj instanceof MenuShortcut)
|
||||
{
|
||||
MenuShortcut ms = (MenuShortcut) obj;
|
||||
return (ms.key == key && ms.usesShift == usesShift);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Returns a string representation of this shortcut.
|
||||
*
|
||||
* @return A string representation of this shortcut.
|
||||
*/
|
||||
public String
|
||||
toString()
|
||||
{
|
||||
return(getClass().getName() + "[" + paramString () + "]");
|
||||
}
|
||||
|
||||
public int
|
||||
hashCode()
|
||||
{
|
||||
// Arbitrary.
|
||||
return key + (usesShift ? 23 : 57);
|
||||
}
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/**
|
||||
* Returns a debugging string for this object.
|
||||
*
|
||||
* @return A debugging string for this object.
|
||||
*/
|
||||
protected String
|
||||
paramString()
|
||||
{
|
||||
return "key=" + key + ",usesShift=" + usesShift;
|
||||
}
|
||||
|
||||
} // class MenuShortcut
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue