gcc/libjava/javax/swing/JLabel.java
Graydon Hoare 9288d11204 ToggleButtonModel.java: Remove dead class.
2004-02-09  Graydon Hoare  <graydon@redhat.com>

	* javax/swing/ToggleButtonModel.java: Remove dead class.
	* javax/swing/plaf/basic/BasicDefaults.java: Remove dead class.
	* javax/swing/plaf/basic/BasicButtonListener.java: New class.
	* javax/swing/plaf/basic/BasicRootPaneUI.java: New class.
	* Makefile.am: Update for new and removed files.
	* Makefile.in: Regenerate.

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java: Initialize default hints.
	* javax/swing/AbstractButton.java
	(AbstractButton): Initialize fields correctly in ctor.
	* javax/swing/JCheckbox.java
	(JCheckBox): Override painting flags.
	* javax/swing/DefaultButtonModel.java: Conform to sun.
	* javax/swing/JComponent.java (paint): Fill with background color
	if available.
	(processComponentKeyEvent)
	(processFocusEvent)
	(processKeyEvent)
	(processMouseMotionEvent): Remove event-consuming empty methods.
	(getUIClassID): Return "ComponentUI" not "JComponent"
	* javax/swing/JFrame.java: Remove some debugging chatter.
	(JFrame): Subscribe to window events.
	* javax/swing/JRadioButton.java
	(JRadioButton): Override painting flags.
	* javax/swing/JRootPane.java
	(JRootPane): Set background from UIDefaults.
	* javax/swing/JToggleButton.java
	(ToggleButtonModel): New inner class.
	(JToggleButton): Override layout alighment.
	* javax/swing/SwingUtilities.java:
	(getLocalBounds): Return width and height, not x and y.
	(calculateInnerArea): Use local bounds, not bounds.
	(layoutCompoundLabel): Provide overridden form.
	(layoutCompoundLabel): Correct bugs.
	* javax/swing/UIDefaults.java: Correct comment.
	* javax/swing/plaf/basic/BasicButtonUI.java:
	Move most logic into defaults, external listener.
	(paintIcon): Implement icon painting.
	(paint): Fix state painting to conform to changes in model.
	* javax/swing/plaf/basic/BasicCheckBoxUI.java:
	Remove most dead/wrong methods.
	(getDefaultIcon): Return defaults.getIcon("CheckBox.icon").
	* javax/swing/plaf/basic/BasicIconFactory.java:
	(DummyIcon): New class.
	(getMenuItemCheckIcon)
	(getMenuItemArrowIcon)
	(getMenuArrowIcon)
	(getCheckBoxMenuItemIcon)
	(getRadioButtonMenuItemIcon)
	(createEmptyFrameIcon): Return DummyIcons, not null.
	(getCheckBoxIcon): Implement an icon that looks like sun's.
	(getRadioButtonIcon): Implement an icon that looks like sun's.
	* javax/swing/plaf/basic/BasicLookAndFeel.java
	(initComponentDefaults): Fix impossible values, add some missing.
	* javax/swing/plaf/basic/BasicPanelUI.java (gap): Remove field.
	* javax/swing/plaf/basic/BasicRadioButtonUI.java:
	Remove most dead/wrong methods.
	(icon): New field.
	(getDefaultIcon): New method.
	* javax/swing/plaf/basic/BasicToggleButtonUI.java:
	Remove most dead/wrong methods.
	* javax/swing/plaf/metal/MetalLookAndFeel.java
	(getDefaults): Return super.getDefaults(), not BasicDefaults.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
	(Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect):
	Implement "clearing" as drawing, when on pixmap drawables.

	* javax/swing/JButton.java (getUIClassID):
	* javax/swing/JCheckBox.java (getUIClassID):
	* javax/swing/JEditorPane.java (getUIClassID):
	* javax/swing/JLabel.java (getUIClassID):
	* javax/swing/JList.java (getUIClassID):
	* javax/swing/JOptionPane.java (getUIClassID):
	* javax/swing/JPanel.java (getUIClassID):
	* javax/swing/JPasswordField.java (uiClassID):
	* javax/swing/JRadioButton.java (getUIClassID):
	* javax/swing/JRootPane.java (getUIClassID):
	* javax/swing/JScrollPane.java (getUIClassID):
	* javax/swing/JTabbedPane.java (getUIClassID):
	* javax/swing/JToggleButton.java (getUIClassID):
	* javax/swing/JTree.java (getUIClassID):
	* javax/swing/JViewport.java (getUIClassID):
	* javax/swing/text/JTextComponent.java (getUIClassID):
	Return "fooUI" not "Jfoo"

From-SVN: r77686
2004-02-12 00:17:26 +00:00

240 lines
6.7 KiB
Java

/* JLabel.java --
Copyright (C) 2002 Free Software Foundation, Inc.
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.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
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.Image;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.swing.plaf.LabelUI;
public class JLabel extends JComponent implements Accessible, SwingConstants
{
private static final long serialVersionUID = 5496508283662221534L;
String text;
Icon icon;
int gap;
int align;
int hor_align;
int hor_text_pos;
int vert_align;
int vert_text_pos;
public JLabel()
{
this("", null, 0);
}
public JLabel(Icon image)
{
this("", image, 0);
}
public JLabel(Icon image, int horizontalAlignment)
{
this("", image, horizontalAlignment);
}
public JLabel(String text)
{
this(text, null, 0);
}
public JLabel(String text, int horizontalAlignment)
{
this(text, null, horizontalAlignment);
}
public JLabel(String text, Icon icon, int horizontalAlignment)
{
// do the work.....
this.text = text;
setIcon(icon);
this.align = horizontalAlignment;
updateUI(); // get a proper ui
}
protected int checkHorizontalKey(int key, String message)
{
// Verify that key is a legal value for the horizontalAlignment properties.
return 0;
}
protected int checkVerticalKey(int key, String message)
{
// Verify that key is a legal value for the verticalAlignment or verticalTextPosition properties.
return 0;
}
public AccessibleContext getAccessibleContext()
{
// Get the AccessibleContext of this object
return null;
}
public Icon getDisabledIcon()
{
// Returns the value of the disabledIcon property if it's been set, If it hasn't been set and the value of the icon property is an ImageIcon, we compute a "grayed out" version of the icon and update the disabledIcon property with that.
return null;
}
public int getDisplayedMnemonic()
{
// Return the keycode that indicates a mnemonic key.
return 0;
}
public int getHorizontalAlignment()
{
// Returns the alignment of the label's contents along the X axis.
return hor_align;
}
public int getHorizontalTextPosition()
{
// Returns the horizontal position of the label's text, relative to its image.
return hor_text_pos;
}
public Icon getIcon()
{ return icon; }
public int getIconTextGap()
{
// Returns the amount of space between the text and the icon displayed in this label.
return 0;
}
public Component getLabelFor()
{
// Get the component this is labelling.
return null;
}
public String getText()
{ return text; }
public String getUIClassID()
{ return "LabelUI"; }
public int getVerticalAlignment()
{
// Returns the alignment of the label's contents along the Y axis.
return vert_align;
}
public int getVerticalTextPosition()
{
// Returns the vertical position of the label's text, relative to its image.
return vert_text_pos;
}
public boolean imageUpdate(Image img, int infoflags, int x, int y, int w, int h)
{
// This is overriden to return false if the current Icon's Image is not equal to the passed in Image img.
return (img == icon);
}
protected String paramString()
{
// Returns a string representation of this JLabel.
return "JLabel";
}
public void setDisabledIcon(Icon disabledIcon)
{
// Set the icon to be displayed if this JLabel is "disabled" (JLabel.setEnabled(false)).
}
public void setDisplayedMnemonic(char aChar)
{
// Specifies the displayedMnemonic as a char value.
}
public void setDisplayedMnemonic(int key)
{
// Specify a keycode that indicates a mnemonic key.
}
public void setHorizontalAlignment(int alignment)
{
// Sets the alignment of the label's contents along the X axis.
hor_align = alignment;
}
public void setHorizontalTextPosition(int textPosition)
{
// Sets the horizontal position of the label's text, relative to its image.
hor_text_pos = textPosition;
}
public void setIcon(Icon icon)
{
this.icon = icon;
if (icon != null)
{
// XXX FIXME - icons do not know their parent
// icon.setParent(this);
}
revalidate();
repaint();
}
public void setIconTextGap(int iconTextGap)
{
gap = iconTextGap;
}
public void setLabelFor(Component c)
{
// Set the component this is labelling.
}
public void setText(String text)
{
this.text = text;
revalidate();
repaint();
}
public void setVerticalAlignment(int alignment)
{
// Sets the alignment of the label's contents along the Y axis.
vert_align = alignment;
}
public void setVerticalTextPosition(int textPosition)
{
// Sets the vertical position of the label's text, relative to its image.
vert_text_pos = textPosition;
}
public void updateUI()
{
LabelUI b = (LabelUI)UIManager.getUI(this);
setUI(b);
}
}